From jbosstools-commits at lists.jboss.org Sat May 1 11:10:04 2010 Content-Type: multipart/mixed; boundary="===============3327365028791577196==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21845 - in branches/modular_build: site and 1 other directories. Date: Sat, 01 May 2010 11:10:04 -0400 Message-ID: <201005011510.o41FA4aG006676@svn01.web.mwc.hst.phx2.redhat.com> --===============3327365028791577196== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-01 11:10:04 -0400 (Sat, 01 May 2010) New Revision: 21845 Added: branches/modular_build/site/ branches/modular_build/site/index.html branches/modular_build/site/pom.xml branches/modular_build/site/site.xml branches/modular_build/site/site.xml.jbds.template branches/modular_build/site/site.xml.jbosstools.template branches/modular_build/site/web/ branches/modular_build/site/web/site.css Log: prelim update site dir w/ pom.xml Added: branches/modular_build/site/index.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/index.html (rev 0) +++ branches/modular_build/site/index.html 2010-05-01 15:10:04 UTC (rev 218= 45) @@ -0,0 +1,135 @@ + + +JBoss Tools ${update.site.description} Update Site: ${product.versi= onTag} + + + + + + + + + + + + + + + + + + +
  
   +

JBoss Tools ${update.site.description} Update Site + + + + + + + + + + + + + + + + + + + + + + + + +
Latest Build: + ${product.versionTag}
+

This is the ${update.site.description} + Update Site for JBoss Tools. See Installation + Instructions.

+
+

NOTE= : Some + features (such as BIRT and Maven) require additional third-party + prerequisites not available from Eclipse.org or JBoss.org. These can + be installed from the following update sites, which may already be + listed - but not enabled - in your Eclipse's list of Available + Software Sites:

+ +
+

You can also download JBoss Tools as + individual zips for offline installation. See JBoss Tools + Downloads.

+
+

For more information, see Installation + methods.

+

+
+
+

+ + + + + + + + + + + + + + + + + + + +
Installation + Types
+

Depending on how close to the bleeding edge + you like to be, there are several types of releases available.

+
+ +
+

Stable Releases

+ +

Stable + releases are - as indicated by their name - stable.


+ +
+

Development Milestones

+ +

Developme= nt + builds, released once per milestone and only a few times a year, a= re + fairly stable, but there may be some things which do not yet work. + If you would like to try one of these milestones, we'd greatly + appreciate the assistance in testing and reporting of + issues in our issue tracker.


+ +
+

Nightly Builds

+ +

The bleeding + edge contains the latest and greatest new features, but nothing is + stable or guaranteed - yet. If you're using a Milestone and need a + fix, you can update to the latest Nightly, or wait for the next + Milestone.


+
+
+ Property changes on: branches/modular_build/site/index.html ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/site/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/pom.xml (rev 0) +++ branches/modular_build/site/pom.xml 2010-05-01 15:10:04 UTC (rev 21845) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../site/../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + site = + 0.0.1-SNAPSHOT + eclipse-update-site + Property changes on: branches/modular_build/site/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/site/site.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/site.xml (rev 0) +++ branches/modular_build/site/site.xml 2010-05-01 15:10:04 UTC (rev 21845) @@ -0,0 +1,168 @@ + + + + This is the 0.0.0 Update Site for JBoss Tools. + + + + + + + + + + + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + = + + + + + + = + + + JBoss Tools SDK contains plugins where an SDK package e= xists. These contain both source and runtimes. Use these if you want to deb= ug and/or provide patches to JBoss Tools plugins. + + + + + + Contains ALL the plugins that are available from JBoss Tools exce= pt those related to integration with 3rd party plugins. Selecting this cate= gory will give you all tools needed for both Web, Seam and SOA Development. + + + + + + Tools to help create SOA applications. Use these if you work with= jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. + + + + + + Tools to help create web and enterprise applications, using JSF, Facelets= , Seam, Hibernate/JPA, CSS, Webservices and more. + + + + + Tools for general application development. + + + + Tools related to data services such as persistence and = transformation. + + + + Plugins related to Maven and m2eclipse support. Use the= se to enable use of Maven. + + + + Business Intelligence, Reporting and Charting. Use these= if you plan to integrate Hibernate or Seam with Eclipse BIRT. + + + + Tools used to improve testing and performance. + + + Property changes on: branches/modular_build/site/site.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/site/site.xml.jbds.template =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/site.xml.jbds.template = (rev 0) +++ branches/modular_build/site/site.xml.jbds.template 2010-05-01 15:10:04 = UTC (rev 21845) @@ -0,0 +1,181 @@ + + + + + This is the ${update.site.description} Update Site for JBoss Develop= er Studio. = + + + + + + + + + + = + + + + + + + + + + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + + + + + + + = + + + + + + = + + + JBoss Developer Studio SDK contains plugins where an SD= K package exists. These contain both source and runtimes. Use these if you = want to debug and/or provide patches to JBoss Developer Studio plugins. + + + + + + Contains ALL the plugins that are available from JBoss Developer = Studio except those related to integration with 3rd party plugins. Selectin= g this category will give you all tools needed for both Web, Seam and SOA D= evelopment. + + + + + + Tools to help create SOA applications. Use these if you work with= jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. + + + + + + Tools to help create web and enterprise applications, using JSF, Facelets= , Seam, Hibernate/JPA, CSS, Webservices and more. + + + + + Tools for general application development. + + + + Tools related to data services such as persistence and = transformation. + + + + + + + + Tools used to improve testing and performance. + + + Added: branches/modular_build/site/site.xml.jbosstools.template =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/site.xml.jbosstools.template = (rev 0) +++ branches/modular_build/site/site.xml.jbosstools.template 2010-05-01 15:= 10:04 UTC (rev 21845) @@ -0,0 +1,166 @@ + + + + This is the ${update.site.description} Update Site for JBoss Tools. + + + + + + + + + + + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + + + + + + + + + = + + + + + + = + + + JBoss Tools SDK contains plugins where an SDK package e= xists. These contain both source and runtimes. Use these if you want to deb= ug and/or provide patches to JBoss Tools plugins. + + + + + + Contains ALL the plugins that are available from JBoss Tools exce= pt those related to integration with 3rd party plugins. Selecting this cate= gory will give you all tools needed for both Web, Seam and SOA Development. + + + + + + Tools to help create SOA applications. Use these if you work with= jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. + + + + + + Tools to help create web and enterprise applications, using JSF, Facelets= , Seam, Hibernate/JPA, CSS, Webservices and more. + + + + + Tools for general application development. + + + + Tools related to data services such as persistence and = transformation. + + + + Plugins related to Maven and m2eclipse support. Use the= se to enable use of Maven. + + + + Business Intelligence, Reporting and Charting. Use these= if you plan to integrate Hibernate or Seam with Eclipse BIRT. + + + + Tools used to improve testing and performance. + + + Added: branches/modular_build/site/web/site.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/web/site.css (rev 0) +++ branches/modular_build/site/web/site.css 2010-05-01 15:10:04 UTC (rev 2= 1845) @@ -0,0 +1,66 @@ +< +STYLE type =3D"text/css">td.spacer { + padding-bottom: 10px; + padding-top: 10px; +} + +.title { + font-family: sans-serif; + color: #1778be; +} + +.bodyText { + font-family: sans-serif; + font-size: 9pt; + color: #000000; +} + +.sub-header { + font-family: sans-serif; + font-style: normal; + font-weight: bold; + font-size: 9pt; + color: white; +} + +.log-text { + font-family: sans-serif; + font-style: normal; + font-weight: lighter; + font-size: 8pt; + color: black; +} + +.big-header { + font-family: sans-serif; + font-style: normal; + font-weight: bold; + font-size: 9pt; + color: white; + border-top: 10px solid white; +} + +.light-row { + background: #FFFFFF +} + +.dark-row { + background: #EEEEEE +} + +.header { + background: #445562 +} + +#indent { + word-wrap: break-word; + width: 300px; + text-indent: 10px; +} + +.link { + color: #187dc6; +} + \ No newline at end of file --===============3327365028791577196==-- From jbosstools-commits at lists.jboss.org Sat May 1 11:11:29 2010 Content-Type: multipart/mixed; boundary="===============5192312620784601232==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21846 - in branches/modular_build: build and 1 other directory. Date: Sat, 01 May 2010 11:11:29 -0400 Message-ID: <201005011511.o41FBTYK007029@svn01.web.mwc.hst.phx2.redhat.com> --===============5192312620784601232== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-01 11:11:28 -0400 (Sat, 01 May 2010) New Revision: 21846 Modified: branches/modular_build/build/build.xml branches/modular_build/genpom.xml Log: prelim update site : fix support for genpom for update site; include update= site generation at end of build process Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-01 15:10:04 UTC (rev 218= 45) +++ branches/modular_build/build/build.xml 2010-05-01 15:11:28 UTC (rev 218= 46) @@ -59,6 +59,7 @@ = + @@ -342,7 +343,7 @@ = - + @@ -531,11 +532,40 @@ = + + + = - - - + + + = + + + + + + + + + + + + = + + + + + + + + + = + + = - + + + + + writeModulePom dir=3D"@{subdir}" parentpom= =3D"${pathToParentPom}@{parentpom}" + + + @@ -753,17 +771,17 @@ = - - - + + + - - - - - + + + + + = --===============5192312620784601232==-- From jbosstools-commits at lists.jboss.org Sat May 1 11:13:35 2010 Content-Type: multipart/mixed; boundary="===============3500738016817592149==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21847 - branches/modular_build/build. Date: Sat, 01 May 2010 11:13:35 -0400 Message-ID: <201005011513.o41FDZK6007072@svn01.web.mwc.hst.phx2.redhat.com> --===============3500738016817592149== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-01 11:13:35 -0400 (Sat, 01 May 2010) New Revision: 21847 Modified: branches/modular_build/build/build.xml Log: rename update site zip Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-01 15:11:28 UTC (rev 218= 46) +++ branches/modular_build/build/build.xml 2010-05-01 15:13:35 UTC (rev 218= 47) @@ -565,7 +565,7 @@ = - + = = --===============7803370589291891042==-- From jbosstools-commits at lists.jboss.org Mon May 3 03:42:31 2010 Content-Type: multipart/mixed; boundary="===============0329943247556358707==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21849 - in trunk: drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test and 2 other directories. Date: Mon, 03 May 2010 03:42:31 -0400 Message-ID: <201005030742.o437gVOP014484@svn01.web.mwc.hst.phx2.redhat.com> --===============0329943247556358707== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vpakan(a)redhat.com Date: 2010-05-03 03:42:31 -0400 (Mon, 03 May 2010) New Revision: 21849 Added: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/DecisionTableTest.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/RuleFlowTest.java Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.= MF trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/DroolsAllBotTests.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTUtilExt.java Log: Added DecisionTableTest and RuleFlowTest to SWTBot Drools Test Suite. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MA= NIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST= .MF 2010-05-01 15:16:44 UTC (rev 21848) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST= .MF 2010-05-03 07:42:31 UTC (rev 21849) @@ -12,7 +12,8 @@ org.eclipse.swtbot.swt.finder;bundle-version=3D"2.0.0", org.junit4;bundle-version=3D"4.5.0", org.jboss.tools.ui.bot.ext;bundle-version=3D"1.0.0", - org.drools.eclipse;bundle-version=3D"5.1.0" + org.drools.eclipse;bundle-version=3D"5.1.0", + org.eclipse.swtbot.eclipse.gef.finder;bundle-version=3D"0.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: JBoss by Red Hat Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/DroolsAllBotTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-01 15:16:44 UTC (rev 2= 1848) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-03 07:42:31 UTC (rev 2= 1849) @@ -14,12 +14,14 @@ = import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.jboss.tools.drools.ui.bot.test.smoke.DecisionTableTest; import org.jboss.tools.drools.ui.bot.test.smoke.DomainSpecificLanguageEdit= orTest; import org.jboss.tools.drools.ui.bot.test.smoke.GuidedDroolsRulesEditorTes= t; import org.jboss.tools.drools.ui.bot.test.smoke.ManageDroolsRuntime; import org.jboss.tools.drools.ui.bot.test.smoke.ManageDroolsProject; import org.jboss.tools.drools.ui.bot.test.smoke.ManageDroolsRules; import org.jboss.tools.drools.ui.bot.test.smoke.DroolsRulesEditorTest; +import org.jboss.tools.drools.ui.bot.test.smoke.RuleFlowTest; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.types.IDELabel; @@ -43,7 +45,9 @@ ManageDroolsRules.class, DroolsRulesEditorTest.class, GuidedDroolsRulesEditorTest.class, - DomainSpecificLanguageEditorTest.class}) = + DomainSpecificLanguageEditorTest.class, + RuleFlowTest.class, + DecisionTableTest.class}) = public class DroolsAllBotTests extends SWTTestExt { public static final String DROOLS_PROJECT_NAME =3D "droolsTest"; public static final String DROOLS_RUNTIME_NAME =3D "Drools Test Runtime"; @@ -57,6 +61,9 @@ public static final String SAMPLE_DROOLS_RULE_NAME =3D "Sample.drl"; public static final String GUIDED_DROOLS_RULE_NAME =3D "GuidedRule.brl"; public static final String DOMAIN_SPECIFIC_LANGUAGE_FILE_NAME =3D "DslTe= st.dsl"; + public static final String RULE_FLOW_JAVA_TEST_FILE_NAME =3D "ProcessTes= t.java"; + public static final String RULE_FLOW_RF_FILE_NAME =3D "ruleflow.rf"; + public static final String DECISION_TABLE_JAVA_TEST_FILE_NAME =3D "Decis= ionTableTest.java"; private static String testDroolsRuntimeName =3D null; public static String getTestDroolsRuntimeName() { return testDroolsRuntimeName; Added: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/= tools/drools/ui/bot/test/smoke/DecisionTableTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/DecisionTableTest.java = (rev 0) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/DecisionTableTest.java 2010-05-03 07:42:31 UTC = (rev 21849) @@ -0,0 +1,53 @@ + /************************************************************************= ******* + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ + +package org.jboss.tools.drools.ui.bot.test.smoke; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.junit.Test; +/** + * Tests Decision Table + * @author Vladimir Pakan + * + */ +public class DecisionTableTest extends SWTTestExt{ + /** + * Tests Decision Table + */ + @Test + public void testRuleFlow() { + runDecisionTable(DroolsAllBotTests.DECISION_TABLE_JAVA_TEST_FILE_NAME); + } + /** + * Runs newly created Drools project and check result + * @param decisionTableFileName + */ + private void runDecisionTable(String decisionTableFileName){ + console.clearConsole(); + bot.sleep(5000L); + + SWTBotTreeItem tiTestFile =3D packageExplorer.selectTreeItem(decisionT= ableFileName, = + new String[] {DroolsAllBotTests.DROOLS_PROJECT_NAME, + DroolsAllBotTests.SRC_MAIN_JAVA_TREE_NODE, + DroolsAllBotTests.COM_SAMPLE_TREE_NODE}); + = + eclipse.runTreeItemAsJavaApplication(tiTestFile); + = + String consoleText =3D console.getConsoleText(3*1000L,60*1000L,true); + = + assertTrue(decisionTableFileName + " didn't run properly.\n" + + "Console Text was: " + consoleText + "\n" + + "Expected console text is: Hello World\nGoodbye cruel world\n", + "Hello World\nGoodbye cruel world\n".equals(consoleText)); + } +} \ No newline at end of file Property changes on: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/= src/org/jboss/tools/drools/ui/bot/test/smoke/DecisionTableTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/= tools/drools/ui/bot/test/smoke/RuleFlowTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/RuleFlowTest.java (rev = 0) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-03 07:42:31 UTC (rev = 21849) @@ -0,0 +1,402 @@ + /************************************************************************= ******* + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ + +package org.jboss.tools.drools.ui.bot.test.smoke; + +import java.io.File; +import java.io.IOException; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swtbot.eclipse.gef.finder.SWTGefBot; +import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor; +import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; +import org.eclipse.swtbot.swt.finder.results.Result; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests; +import org.jboss.tools.ui.bot.ext.SWTEclipseExt; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; +import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; +import org.junit.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.SAXException; +/** + * Tests Rule Flow + * @author Vladimir Pakan + * + */ +public class RuleFlowTest extends SWTTestExt{ + private static final String RULE_FLOW_FILE_DIRECTORY =3D "src" + File.se= parator + + "main" + File.separator + + "rules"; + private static final String ROOT_NODE_NAME =3D "process"; + private static final String HEADER_NODE_NAME =3D "header"; + private static final String NODES_NODE_NAME =3D "nodes"; + private static final String CONNECTIONS_NODE_NAME =3D "connections"; + private static final String CONNECTION_NODE_NAME =3D "connection"; + private static final int NODES_NODE_CHILDREN_COUNT =3D 14; + private static final int CONNECTIONS_NODE_CHILDREN_COUNT =3D 1; + private static final int ROOT_NODE_CHILDREN_COUNT =3D 3; + /** + * Tests Rule Flow + */ + @Test + public void testRuleFlow() { + runRuleFlowCheck(DroolsAllBotTests.RULE_FLOW_JAVA_TEST_FILE_NAME); + ruleFlowEditorCheck(DroolsAllBotTests.RULE_FLOW_RF_FILE_NAME); + } + /** + * Runs newly created Drools project and check result + * @param droolsProjectName + */ + private void runRuleFlowCheck(String droolsRuleTestFileName){ + console.clearConsole(); + bot.sleep(5000L); + + SWTBotTreeItem tiTestFile =3D packageExplorer.selectTreeItem(droolsRul= eTestFileName, = + new String[] {DroolsAllBotTests.DROOLS_PROJECT_NAME, + DroolsAllBotTests.SRC_MAIN_JAVA_TREE_NODE, + DroolsAllBotTests.COM_SAMPLE_TREE_NODE}); + = + eclipse.runTreeItemAsJavaApplication(tiTestFile); + = + String consoleText =3D console.getConsoleText(3*1000L,60*1000L,true); + = + assertTrue(droolsRuleTestFileName + " didn't run properly.\n" + + "Console Text was: " + consoleText + "\n" + + "Expected console text is: " + "Hello World\n", + "Hello World\n".equals(consoleText)); + } + /** + * Add all possible object to RF diagram and then remove them + * @param ruleFlowRfFileName + */ + private void ruleFlowEditorCheck (String ruleFlowFileName){ + packageExplorer.show(); + packageExplorer.openFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , + DroolsAllBotTests.SRC_MAIN_RULES_TREE_NODE, + DroolsAllBotTests.RULE_FLOW_RF_FILE_NAME); + // Test if Rule Flow RF File is opened in editor + assertTrue("Rule Flow RF File is not opened properly. File " + ruleFlo= wFileName + " is not opened in editor", + SWTEclipseExt.existEditorWithLabel(bot,ruleFlowFileName)); + = + SWTGefBot gefBot =3D new SWTGefBot(); + SWTBotGefEditor gefEditor =3D gefBot.gefEditor(ruleFlowFileName); + final Control editorControl =3D (Control)gefEditor.getWidget(); + Rectangle editorBounds =3D UIThreadRunnable.syncExec(new Result() { + public Rectangle run() { + return editorControl.getBounds(); + } + }); + // Clear Editor + gefEditor.activateTool("Marquee"); + gefEditor.mouseDrag(0,0,editorBounds.width - editorBounds.x, editorBou= nds.height - editorBounds.y); + KeyboardHelper.pressKeyCode(bot.getDisplay(),(int)SWT.DEL); + // Draw each component + String[] tools =3D new String[]{"Start Event","End Event","Rule Task", + "Gateway [diverge]","Gateway [converge]","Reusable Sub-Process", + "Script Task","Timer Event","Error Event","Message Event","User Task= ", + "Embedded Sub-Process","Log","Email"}; + int xspacing =3D 100; + int xoffset =3D 10; + int yspacing =3D 100; + int yoffset =3D 10; + for (int toolIndex =3D 0;toolIndex < tools.length;toolIndex++){ + gefEditor.activateTool(tools[toolIndex]); + gefEditor.mouseMoveLeftClick(xspacing * (toolIndex % 3) + xoffset, = + yspacing * (toolIndex / 3) + yoffset); + } + // Add Sequence Flow between Start and End Node + gefEditor.activateTool("Sequence Flow"); + // Click on Start Node + gefEditor.mouseMoveLeftClick(xoffset + 5, yoffset + 5); + // Click on End Node + gefEditor.mouseMoveLeftClick(xspacing + xoffset + 5, yoffset + 5); + gefEditor.save(); + checkFullRFFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , ruleFlowFileNa= me); + // Delete each component + gefEditor.activateTool("Select"); + for (int toolIndex =3D 0;toolIndex < tools.length;toolIndex++){ + gefEditor.mouseMoveLeftClick(xspacing * (toolIndex % 3) + xoffset + = 5, = + yspacing * (toolIndex / 3) + yoffset + 5); + KeyboardHelper.pressKeyCode(bot.getDisplay(),(int)SWT.DEL); + } + gefEditor.save(); + checkEmptyRFFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , ruleFlowFileN= ame); + } = + /** + * Check content of Rule Flow file containing all possible objects + * = + * @param projectName + * @param ruleFlowFileName + */ + private void checkFullRFFile(String projectName, String ruleFlowFileName= ) { + + Document doc =3D loadXmlFile(SWTUtilExt.getPathToProject(projectName) + + File.separator + RuleFlowTest.RULE_FLOW_FILE_DIRECTORY + + File.separator + ruleFlowFileName); + + String errorDescription =3D null; + Element rootNode =3D doc.getDocumentElement(); + doc.normalizeDocument(); + if (rootNode.getNodeName().equals(ROOT_NODE_NAME)) { + NodeList rootNodeList =3D rootNode.getChildNodes(); + List rootNodes =3D removeTextNodes(rootNodeList); + if (rootNodes.size() =3D=3D ROOT_NODE_CHILDREN_COUNT) { + Node header =3D rootNodes.get(0); + errorDescription =3D checkEmptyFileNode(header, HEADER_NODE_NAME); + if (errorDescription =3D=3D null) { + Node nodesNode =3D rootNodes.get(1); + errorDescription =3D checkNodeName(nodesNode, NODES_NODE_NAME); + if (errorDescription =3D=3D null) { + errorDescription =3D checkNodesFileNodes(removeTextNodes(nodes= Node + .getChildNodes())); + if (errorDescription =3D=3D null) { + Node connectionsNode =3D rootNodes.get(2); + errorDescription =3D checkNodeName(connectionsNode, + CONNECTIONS_NODE_NAME); + if (errorDescription =3D=3D null) { + errorDescription =3D checkConnectionsFileNodes(removeTextN= odes(connectionsNode + .getChildNodes())); + } + } + } + } + } else { + errorDescription =3D "Root node has to have " + ROOT_NODE_CHILDREN= _COUNT + + " child nodes but it has " + rootNodeList.getLength(); + } + } else { + errorDescription =3D "Root node has to have name '" + ROOT_NODE_NAME + + "' but it has name '" + rootNode.getNodeName() + "'"; + } + assertNull(errorDescription,errorDescription); + } + /** + * Check content of empty Rule Flow file + * @param projectName + * @param ruleFlowRfFileName + */ + private void checkEmptyRFFile(String projectName, String ruleFlowFileNam= e){ + = + Document doc =3D loadXmlFile(SWTUtilExt.getPathToProject(projectName) + + File.separator + RuleFlowTest.RULE_FLOW_FILE_DIRECTORY + File.separa= tor + = + ruleFlowFileName); + + String errorDescription =3D null; + + Element rootNode =3D doc.getDocumentElement(); + doc.normalizeDocument(); + if (rootNode.getNodeName().equals(ROOT_NODE_NAME)) { + NodeList rootNodeList =3D rootNode.getChildNodes(); + List nodes =3D removeTextNodes(rootNodeList); + if (nodes.size() =3D=3D ROOT_NODE_CHILDREN_COUNT) { + Node header =3D nodes.get(0); + errorDescription =3D checkEmptyFileNode(header, HEADER_NODE_NAME); + if (errorDescription =3D=3D null) { + Node nodesNode =3D nodes.get(1); + errorDescription =3D checkEmptyFileNode(nodesNode, NODES_NODE_NA= ME); + if (errorDescription =3D=3D null) { + Node connnections =3D nodes.get(2); + errorDescription =3D checkEmptyFileNode(connnections, CONNECTI= ONS_NODE_NAME); + } + } + } else { + errorDescription =3D "Root node has to have " + + ROOT_NODE_CHILDREN_COUNT + + " child nodes but it has " + = + rootNodeList.getLength(); + } + } else { + errorDescription =3D "Root node has to have name '" + ROOT_NODE_NAME + + "' but it has name '" + rootNode.getNodeName() + "'"; + } + assertNull(errorDescription,errorDescription); + = + } + /** + * Loads and parse XML file with fileName from file system = + * @param fileName - full path to XML file + * @return + */ + private Document loadXmlFile (String fileName){ + File file =3D new File(fileName); + DocumentBuilderFactory dbf =3D DocumentBuilderFactory.newInstance(); + DocumentBuilder db; + Document doc =3D null; + try { + db =3D dbf.newDocumentBuilder(); + doc =3D db.parse(file); + } catch (ParserConfigurationException pce) { + throw new RuntimeException(pce); + } catch (SAXException saxe) { + throw new RuntimeException(saxe); + } catch (IOException ioe) { + throw new RuntimeException(ioe); + } + return doc; + } + private static List removeTextNodes(NodeList rootNodeList){ + LinkedList nodes =3D new LinkedList(); + for (int index =3D 0 ; index < rootNodeList.getLength(); index++){ + Node node =3D rootNodeList.item(index); + if (!node.getNodeName().equals("#text")){ + nodes.add(node); + } = + } + return nodes; + } + /** + * Check if node is correct for empty file + * @param node + * @param expectedNodeName + * @return + */ + private static String checkEmptyFileNode (Node node,String expectedNodeN= ame){ + String errorDescription =3D null; + if (node.getNodeName().equals(expectedNodeName)){ + if (removeTextNodes(node.getChildNodes()).size() =3D=3D 0){ + if(node.getTextContent().trim().length() !=3D 0){ + errorDescription =3D expectedNodeName + " node has to have no te= xt value but it has " + + node.getTextContent(); + } + } + else{ + errorDescription =3D expectedNodeName + " node has to have no chil= dren but is has " + + removeTextNodes(node.getChildNodes()).size(); + = + } + } = + else{ + errorDescription =3D checkNodeName(node, expectedNodeName); + } + = + return errorDescription; + = + } + /** + * Check nodes of Nodes children. + * @param nodes - list of nodes of nodes node stripped from text nodes + * @return + */ + private static String checkNodesFileNodes(List nodes){ + String errorDescription =3D null; + = + if (nodes.size() =3D=3D NODES_NODE_CHILDREN_COUNT){ + List mandatoryNodes =3D getMandatoryNodesOfNodesNode(); = + int index =3D 0; + Iterator iterator =3D nodes.iterator(); + while (index < nodes.size() && errorDescription =3D=3D null){ + String nodeName =3D iterator.next().getNodeName(); + if (mandatoryNodes.contains(nodeName)){ + mandatoryNodes.remove(nodeName); + } + else{ + errorDescription =3D "Nodes node cannot contain node " + nodeNam= e; + } + index++; + } + if (errorDescription =3D=3D null && mandatoryNodes.size() > 0) { + StringBuilder sb =3D new StringBuilder(""); + for (String nodeName : mandatoryNodes){ + if (sb.length() !=3D 0){ + sb.append(", "); + } + sb.append(nodeName); + } + errorDescription =3D "Nodes node doesn't contain all necesarry nod= es.\n" + + "These node(s) are missing within nodes node: " + + sb.toString(); + } + } + else{ + errorDescription =3D "Nodes node has to have " + + NODES_NODE_CHILDREN_COUNT + + " child nodes but it has " + + nodes.size(); + } + = + return errorDescription; + } + /** + * Returns list of mandatory nodes of nodes node + * @return + */ + private static List getMandatoryNodesOfNodesNode(){ + LinkedList allowedNodes =3D new LinkedList(); + allowedNodes.add("split"); + allowedNodes.add("timerNode"); + allowedNodes.add("humanTask"); + allowedNodes.add("ruleSet"); + allowedNodes.add("actionNode"); + allowedNodes.add("composite"); + allowedNodes.add("end"); + allowedNodes.add("workItem"); + allowedNodes.add("fault"); + allowedNodes.add("subProcess"); + allowedNodes.add("start"); + allowedNodes.add("workItem"); + allowedNodes.add("eventNode"); + allowedNodes.add("join"); + return allowedNodes; + } + + /** + * Check nodes of connections children. + * @param nodes - list of nodes of connections node stripped from text n= odes + * @return + */ + private static String checkConnectionsFileNodes(List nodes){ + String errorDescription =3D null; + = + if (nodes.size() =3D=3D CONNECTIONS_NODE_CHILDREN_COUNT){ + Node connectioNode =3D nodes.get(0); + errorDescription =3D checkEmptyFileNode(connectioNode, CONNECTION_NO= DE_NAME); + } + else{ + errorDescription =3D "Conections node has to have " + + CONNECTIONS_NODE_CHILDREN_COUNT + + " child nodes but it has " + + nodes.size(); + } + = + return errorDescription; + } + /** + * Check if node has expected name + * @param node + * @param expectedNodeName + * @return + */ + private static String checkNodeName (Node node, String expectedNodeName){ + String errorDescription =3D null; + = + if (!node.getNodeName().equals(expectedNodeName)){ + errorDescription =3D "Node has to have name '" + + expectedNodeName + "' but it has name '" + + node.getNodeName() + "'"; + } + = + return errorDescription; + } +} \ No newline at end of file Property changes on: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/= src/org/jboss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTUtilExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTUtilExt.java 2010-05-01 15:16:44 UTC (rev 21848) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTUtilExt.java 2010-05-03 07:42:31 UTC (rev 21849) @@ -23,6 +23,7 @@ import java.util.Properties; = import org.apache.log4j.Logger; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.jobs.Job; @@ -692,5 +693,36 @@ = return result; } - = + /** + * Returns location of file within plugin = + * @param pluginId + * @param fileName + * @return + */ + public static String getPathToFileWithinPlugin(String pluginId, + String fileName) { + + String filePath =3D null; + try { + filePath =3D FileLocator.toFileURL( + Platform.getBundle(pluginId).getEntry("/")).getFile() + + fileName; + } catch (IOException e) { + // do nothing filePath is null + e.printStackTrace(); + } + + return filePath; + } + /** + * Returns path to project with projectName + * @param projectName + * @return + */ + public static String getPathToProject(String projectName) { + return ResourcesPlugin.getWorkspace().getRoot().getLocation().toString= () + + File.separator + + projectName; + } + } \ No newline at end of file --===============0329943247556358707==-- From jbosstools-commits at lists.jboss.org Mon May 3 04:37:12 2010 Content-Type: multipart/mixed; boundary="===============3659250743561989182==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21850 - in trunk/jsf/plugins/org.jboss.tools.jsf: src/org/jboss/tools/jsf/web/validation/jsf2 and 3 other directories. Date: Mon, 03 May 2010 04:37:12 -0400 Message-ID: <201005030837.o438bCim027459@svn01.web.mwc.hst.phx2.redhat.com> --===============3659250743561989182== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yzhishko Date: 2010-05-03 04:37:11 -0400 (Mon, 03 May 2010) New Revision: 21850 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/JSF2SourceValidator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/JSF2XMLValidator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/CreateJSF2ResourcesFolder.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/JSF2ComponentResolutionGenerator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/components/JSF2AttrTempComponent.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/components/JSF2ComponentFactory.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/components/JSF2CompositeTempComponent.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/util/JSF2ComponentModelManager.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/util/JSF2ComponentRecognizer.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/util/JSF2ComponentUtil.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/util/JSF2ResourceUtil.java Log: https://jira.jboss.org/jira/browse/JBIDE-5930 main functionality was added = only tests and demos remain. Modified: trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2010-05-03 0= 7:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/META-INF/MANIFEST.MF 2010-05-03 0= 8:37:11 UTC (rev 21850) @@ -45,7 +45,8 @@ org.eclipse.wst.validation, org.eclipse.jdt.core.manipulation, org.eclipse.jst.j2ee, - org.eclipse.ui.ide + org.eclipse.ui.ide, + org.eclipse.wst.html.core;bundle-version=3D"1.1.300" Bundle-Version: 3.1.0.qualifier Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/JSF2SourceValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2SourceValidator.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2SourceValidator.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -17,9 +17,6 @@ import org.eclipse.core.resources.IResource; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocum= ent; import org.eclipse.wst.sse.ui.internal.reconcile.validator.ISourceValidato= r; import org.eclipse.wst.sse.ui.internal.reconcile.validator.IncrementalHelp= er; import org.eclipse.wst.validation.internal.core.Message; @@ -30,8 +27,8 @@ import org.eclipse.wst.validation.internal.provisional.core.IValidator; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; +import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentModelMana= ger; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -76,19 +73,8 @@ } = public void connect(IDocument document) { - if (document instanceof IStructuredDocument) { - IStructuredModel model =3D StructuredModelManager.getModelManager() - .getExistingModelForRead(document); - try { - if (model instanceof IDOMModel) { - this.document =3D ((IDOMModel) model).getDocument(); - } - } finally { - if(model!=3Dnull) { - model.releaseFromRead(); - } - } - } + this.document =3D JSF2ComponentModelManager + .getReadableDOMDocument(document); } = public void disconnect(IDocument document) { @@ -208,4 +194,4 @@ return element.getStartOffset() =3D=3D offSet; } = -} +} \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/JSF2XMLValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2XMLValidator.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2XMLValidator.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -25,6 +25,7 @@ import org.jboss.tools.common.el.core.resolver.ELContext; import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; +import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentModelMana= ger; import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentRecognize= r; import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentUtil; import org.jboss.tools.jst.web.kb.IPageContext; @@ -75,8 +76,8 @@ } = private void validateAsDOM(IFile file) { - IDOMDocument document =3D JSF2ComponentUtil - .getReadableDocumentForFile(file); + IDOMDocument document =3D JSF2ComponentModelManager + .getReadableDOMDocument(file); IJSF2ValidationComponent[] components =3D getValidationComponents( document, file); if (components !=3D null) { @@ -98,7 +99,6 @@ IFile file) { List components =3D new ArrayList( 0); - Set tagNameSet =3D new HashSet(0); Map> compositeComponentsMap =3D JSF2ComponentUtil .findCompositeComponents(node); Set>> entries =3D compositeComponentsMap @@ -106,14 +106,11 @@ for (Entry> entry : entries) { List elements =3D entry.getValue(); for (Element element : elements) { - if (!(tagNameSet.contains(element.getNodeName()))) { - tagNameSet.add(element.getNodeName()); - IJSF2ValidationComponent[] validationComponents =3D JSF2ComponentReco= gnizer - .recognizeCompositeValidationComponents(file, - (IDOMElement) element); - for (int i =3D 0; i < validationComponents.length; i++) { - components.add(validationComponents[i]); - } + IJSF2ValidationComponent[] validationComponents =3D JSF2ComponentRecog= nizer + .recognizeCompositeValidationComponents(file, + (IDOMElement) element); + for (int i =3D 0; i < validationComponents.length; i++) { + components.add(validationComponents[i]); } } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/action/CreateJSF2ResourcesFolder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/CreateJSF2ResourcesFolder.java 2010-05-03 07:42:31 UTC (r= ev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/CreateJSF2ResourcesFolder.java 2010-05-03 08:37:11 UTC (r= ev 21850) @@ -31,7 +31,7 @@ /** * = * @author yzhishko - * + * = */ = public class CreateJSF2ResourcesFolder implements IMarkerResolution { Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/action/JSF2ComponentResolutionGenerator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2ComponentResolutionGenerator.java 2010-05-03 07:42:31= UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2ComponentResolutionGenerator.java 2010-05-03 08:37:11= UTC (rev 21850) @@ -53,7 +53,7 @@ } catch (CoreException e) { JSFModelPlugin.getPluginLog().logError(e); } - return new CreateJSF2CompositeComponent[] { new CreateJSF2CompositeCompo= nent() }; + return new IMarkerResolution[0]; } = } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/components/JSF2AttrTempComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2AttrTempComponent.java 2010-05-03 07:42:31 UTC (r= ev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2AttrTempComponent.java 2010-05-03 08:37:11 UTC (r= ev 21850) @@ -68,10 +68,7 @@ } = void createValidationMessage() { - String nodeName =3D parentEl.getNodeName(); - if (nodeName.indexOf(':') > -1) { - nodeName =3D nodeName.substring(nodeName.lastIndexOf(':') + 1); - } + String nodeName =3D parentEl.getLocalName(); this.validationMessage =3D MessageFormat.format( JSFUIMessages.Missing_JSF_2_Component_Attr, attr.getName(), nodeName); @@ -106,10 +103,7 @@ String uriString =3D parentEl.getNamespaceURI(); String relativeLocation =3D uriString.replaceFirst( JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ - String nodeName =3D parentEl.getNodeName(); - if (nodeName.indexOf(':') > -1) { - nodeName =3D nodeName.substring(nodeName.lastIndexOf(':') + 1); - } + String nodeName =3D parentEl.getLocalName(); componentResLocation =3D relativeLocation + "/" + nodeName + ".xhtml"; = //$NON-NLS-1$ //$NON-NLS-2$ } return componentResLocation; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/components/JSF2ComponentFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2ComponentFactory.java 2010-05-03 07:42:31 UTC (re= v 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2ComponentFactory.java 2010-05-03 08:37:11 UTC (re= v 21850) @@ -12,15 +12,17 @@ package org.jboss.tools.jsf.web.validation.jsf2.components; = import java.util.ArrayList; +import java.util.HashSet; import java.util.List; -import java.util.zip.ZipEntry; +import java.util.Set; + import org.eclipse.core.resources.IFile; +import org.eclipse.jdt.internal.core.JarEntryFile; import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentModelMana= ger; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentUtil; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -34,6 +36,12 @@ @SuppressWarnings("restriction") public class JSF2ComponentFactory { = + private static Set uncheckedAttrs =3D new HashSet(0); + + static { + uncheckedAttrs.add("id"); //$NON-NLS-1$ + } + public static IJSF2ValidationComponent createCompositeTempComponent( IDOMElement element) { JSF2CompositeTempComponent component =3D new JSF2CompositeTempComponent( @@ -49,19 +57,45 @@ } = public static IJSF2ValidationComponent[] createUnfixableAttrTempComponent= s( - ZipEntry zipContainer, IDOMElement elementWithAttrs) { - return null; + JarEntryFile container, IDOMElement elementWithAttrs) { + List validationComponents =3D new ArrayList( + 0); + IDOMDocument containerDocument =3D JSF2ComponentModelManager + .getReadableDOMDocument(container); + IDOMElement interfaceElement =3D JSF2ComponentModelManager.getManager() + .checkCompositeInterface(containerDocument); + Set interfaceAttrs =3D getInterfaceAttrs(interfaceElement); + interfaceAttrs.addAll(uncheckedAttrs); + IDOMAttr[] existingAttrs =3D getExistingAttrs(elementWithAttrs); + for (int i =3D 0; i < existingAttrs.length; i++) { + if (!interfaceAttrs.contains(existingAttrs[i].getName())) { + IDOMAttr attr =3D existingAttrs[i]; + JSF2AttrTempComponent component =3D new JSF2AttrTempComponent( + attr, (ElementImpl) elementWithAttrs); + component + .setType(IJSF2ValidationComponent.JSF2_UNFIXABLE_ATTR_TYPE); + component.setStartOffSet(attr.getStartOffset()); + component.setLine(attr.getStructuredDocument().getLineOfOffset( + component.getStartOffSet()) + 1); + component.setLength(attr.getName().length()); + component.createValidationMessage(); + component.createMessageParams(); + validationComponents.add(component); + } + } + return validationComponents.toArray(new IJSF2ValidationComponent[0]); } = public static IJSF2ValidationComponent[] createFixableAttrTempComponents( IFile compContainerFile, IDOMElement elementWithAttrs) { List components =3D new ArrayList( 0); - IDOMDocument document =3D JSF2ComponentUtil - .getReadableDocumentForFile(compContainerFile); + IDOMDocument document =3D JSF2ComponentModelManager + .getReadableDOMDocument(compContainerFile); IDOMElement interfaceElement =3D JSF2ComponentModelManager.getManager() .checkCompositeInterface(document); - List interfaceAttrs =3D getInterfaceAttrs(interfaceElement); + Set interfaceAttrs =3D getInterfaceAttrs(interfaceElement); + interfaceAttrs.addAll(uncheckedAttrs); IDOMAttr[] existingAttrs =3D getExistingAttrs(elementWithAttrs); for (int i =3D 0; i < existingAttrs.length; i++) { if (!interfaceAttrs.contains(existingAttrs[i].getName())) { @@ -97,8 +131,8 @@ return component; } = - private static List getInterfaceAttrs(IDOMElement interfaceElemen= t) { - List interfaceAttrs =3D new ArrayList(0); + private static Set getInterfaceAttrs(IDOMElement interfaceElement= ) { + Set interfaceAttrs =3D new HashSet(0); if (interfaceElement !=3D null) { String prefix =3D interfaceElement.getPrefix(); String nodeName =3D "attribute"; //$NON-NLS-1$ Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/components/JSF2CompositeTempComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2CompositeTempComponent.java 2010-05-03 07:42:31 U= TC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2CompositeTempComponent.java 2010-05-03 08:37:11 U= TC (rev 21850) @@ -1,3 +1,14 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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.jsf.web.validation.jsf2.components; = import java.text.MessageFormat; @@ -10,6 +21,12 @@ import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; import org.w3c.dom.NamedNodeMap; = +/** + * = + * @author yzhishko + * + */ + @SuppressWarnings("restriction") public class JSF2CompositeTempComponent implements IJSF2ValidationComponen= t { private int length; @@ -50,10 +67,7 @@ } = void createValidationMessage() { - String nodeName =3D element.getNodeName(); - if (nodeName.indexOf(':') > -1) { - nodeName =3D nodeName.substring(nodeName.lastIndexOf(':') + 1); - } + String nodeName =3D element.getLocalName(); this.validationMessage =3D MessageFormat.format( JSFUIMessages.Missing_JSF_2_Composite_Component, nodeName); } @@ -90,10 +104,7 @@ String uriString =3D element.getNamespaceURI(); String relativeLocation =3D uriString.replaceFirst( JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ - String nodeName =3D element.getNodeName(); - if (nodeName.indexOf(':') > -1) { - nodeName =3D nodeName.substring(nodeName.lastIndexOf(':') + 1); - } + String nodeName =3D element.getLocalName(); componentResLoc =3D relativeLocation + "/" + nodeName + ".xhtml"; //$NO= N-NLS-1$ //$NON-NLS-2$ } return componentResLoc; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/util/JSF2ComponentModelManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ComponentModelManager.java 2010-05-03 07:42:31 UTC (rev= 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ComponentModelManager.java 2010-05-03 08:37:11 UTC (rev= 21850) @@ -13,14 +13,21 @@ = import java.io.ByteArrayInputStream; import java.io.IOException; - +import java.io.InputStream; +import java.util.Scanner; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.internal.core.JarEntryFile; +import org.eclipse.jface.text.IDocument; +import org.eclipse.wst.html.core.internal.encoding.HTMLModelLoader; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IModelManager; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocum= ent; +import org.eclipse.wst.sse.core.internal.text.JobSafeStructuredDocument; import org.eclipse.wst.xml.core.internal.document.ElementImpl; +import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; @@ -65,15 +72,9 @@ model.reload(componentFileContatiner.getContents()); document =3D domModel.getDocument(); updateJSF2CompositeComponent(document, attrNames); - try { - componentFileContatiner.setContents( - new ByteArrayInputStream(document - .getStructuredDocument().getText() - .getBytes()), true, false, - new NullProgressMonitor()); - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - } + componentFileContatiner.setContents(new ByteArrayInputStream( + document.getStructuredDocument().getText().getBytes()), + true, false, new NullProgressMonitor()); } } catch (CoreException e) { JSFModelPlugin.getPluginLog().logError(e); @@ -105,10 +106,8 @@ ElementImpl impl =3D (ElementImpl) node; String nameSpace =3D impl.getNamespaceURI(); if (JSF2ResourceUtil.JSF2_URI_PREFIX.equals(nameSpace)) { - String nodeName =3D impl.getNodeName(); - String compName =3D nodeName.substring( - nodeName.lastIndexOf(':') + 1).trim(); - if ("interface".equals(compName)) { //$NON-NLS-1$ + String nodeName =3D impl.getLocalName(); + if ("interface".equals(nodeName)) { //$NON-NLS-1$ interfaceElement[0] =3D impl; return; } @@ -149,8 +148,7 @@ } = public IFile revalidateCompositeComponentFile(IFile file) { - IDOMDocument document =3D JSF2ComponentUtil - .getReadableDocumentForFile(file); + IDOMDocument document =3D getReadableDOMDocument(file); if (document =3D=3D null) { return null; } @@ -176,27 +174,86 @@ if (!"http://www.w3.org/1999/xhtml".equals(elementImpl.getNamespaceURI()= )) { //$NON-NLS-1$ return null; } - NodeList children =3D element.getChildNodes(); - if (children =3D=3D null) { - return null; + IDOMElement[] interfaceElement =3D new IDOMElement[1]; + findInterfaceComponent(document, interfaceElement); + return interfaceElement[0]; + } + + public static IDOMDocument getReadableDOMDocument(IFile file) { + IDOMDocument document =3D null; + IModelManager manager =3D StructuredModelManager.getModelManager(); + if (manager =3D=3D null) { + return document; } - for (int i =3D 0; i < children.getLength(); i++) { - if (children.item(i) instanceof Element) { - Element el =3D (Element) children.item(i); - String nodeName =3D el.getNodeName(); - if (nodeName.indexOf(':') > -1) { - nodeName =3D nodeName - .substring(nodeName.lastIndexOf(":") + 1); //$NON-NLS-1$ + IStructuredModel model =3D null; + try { + model =3D manager.getModelForRead(file); + if (model instanceof IDOMModel) { + IDOMModel domModel =3D (IDOMModel) model; + document =3D domModel.getDocument(); + } + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } catch (IOException e) { + JSFModelPlugin.getPluginLog().logError(e); + } finally { + if (model !=3D null) { + model.releaseFromRead(); + } + } + return document; + } + + public static IDOMDocument getReadableDOMDocument(JarEntryFile file) { + IDOMDocument document =3D null; + IStructuredModel model =3D null; + InputStream inputStream; + try { + inputStream =3D file.getContents(); + if (inputStream !=3D null) { + StringBuffer buffer =3D new StringBuffer(""); //$NON-NLS-1$ + Scanner in =3D new Scanner(inputStream); + while (in.hasNextLine()) { + buffer.append(in.nextLine()); } - if ("interface".equals(nodeName)) { //$NON-NLS-1$ - if (JSF2ResourceUtil.JSF2_URI_PREFIX - .equals(((ElementImpl) el).getNamespaceURI())) { - return (IDOMElement) el; - } + model =3D new HTMLModelLoader().newModel(); + model.setStructuredDocument(new JobSafeStructuredDocument( + new XMLSourceParser())); + model.getStructuredDocument().set(buffer.toString()); + if (model instanceof IDOMModel) { + document =3D ((IDOMModel) model).getDocument(); } } + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } finally { + model =3D null; } - return null; + return document; } = + public static IDOMDocument getReadableDOMDocument(IDocument textDocument)= { + IDOMDocument document =3D null; + if (!(textDocument instanceof IStructuredDocument)) { + return document; + } + IModelManager manager =3D StructuredModelManager.getModelManager(); + if (manager =3D=3D null) { + return document; + } + IStructuredModel model =3D null; + try { + model =3D manager.getModelForRead((IStructuredDocument) textDocument); + if (model instanceof IDOMModel) { + IDOMModel domModel =3D (IDOMModel) model; + document =3D domModel.getDocument(); + } + } finally { + if (model !=3D null) { + model.releaseFromRead(); + } + } + return document; + } + } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/util/JSF2ComponentRecognizer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ComponentRecognizer.java 2010-05-03 07:42:31 UTC (rev 2= 1849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ComponentRecognizer.java 2010-05-03 08:37:11 UTC (rev 2= 1850) @@ -12,9 +12,9 @@ = import java.util.ArrayList; import java.util.List; -import java.util.zip.ZipEntry; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.eclipse.jdt.internal.core.JarEntryFile; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; @@ -45,10 +45,10 @@ for (int i =3D 0; i < components.length; i++) { validationComponents.add(components[i]); } - } else if (container instanceof ZipEntry) { + } else if (container instanceof JarEntryFile) { IJSF2ValidationComponent[] components =3D JSF2ComponentFactory - .createUnfixableAttrTempComponents((ZipEntry) container, - element); + .createUnfixableAttrTempComponents( + (JarEntryFile) container, element); for (int i =3D 0; i < components.length; i++) { validationComponents.add(components[i]); } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/util/JSF2ComponentUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ComponentUtil.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ComponentUtil.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -11,23 +11,14 @@ = package org.jboss.tools.jsf.web.validation.jsf2.util; = -import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.jboss.tools.jsf.JSFModelPlugin; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; @@ -77,31 +68,6 @@ } } = - public static IDOMDocument getReadableDocumentForFile(IFile file) { - IDOMDocument document =3D null; - IModelManager manager =3D StructuredModelManager.getModelManager(); - if (manager =3D=3D null) { - return document; - } - IStructuredModel model =3D null; - try { - model =3D manager.getModelForRead(file); - if (model instanceof IDOMModel) { - IDOMModel domModel =3D (IDOMModel) model; - document =3D domModel.getDocument(); - } - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - } catch (IOException e) { - JSFModelPlugin.getPluginLog().logError(e); - } finally { - if (model !=3D null) { - model.releaseFromRead(); - } - } - return document; - } - public static IDOMAttr[] findURIContainers(Node scanNode) { List attrs =3D new ArrayList(0); findChildURIContainers(scanNode, attrs); Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/util/JSF2ResourceUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ResourceUtil.java 2010-05-03 07:42:31 UTC (rev 21849) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ResourceUtil.java 2010-05-03 08:37:11 UTC (rev 21850) @@ -25,6 +25,9 @@ import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.internal.core.JarEntryDirectory; +import org.eclipse.jdt.internal.core.JarEntryFile; +import org.eclipse.jdt.internal.core.JarEntryResource; import org.eclipse.jdt.internal.core.JarPackageFragmentRoot; import org.eclipse.wst.common.componentcore.ComponentCore; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; @@ -46,6 +49,10 @@ = public static final String COMPONENT_RESOURCE_PATH_KEY =3D "component_res= ource_path_key"; //$NON-NLS-1$ = + public static final int JAR_FILE_RESOURCE_TYPE =3D 1; + + public static final int JAR_DIRECTORY_RESOURCE_TYPE =3D JAR_FILE_RESOURCE= _TYPE << 1; + public static Object findCompositeComponentContainer(IProject project, IDOMElement jsf2Element) { ElementImpl elementImpl =3D (ElementImpl) jsf2Element; @@ -53,10 +60,7 @@ if (nameSpaceURI =3D=3D null || nameSpaceURI.indexOf(JSF2_URI_PREFIX) = =3D=3D -1) { return null; } - String nodeName =3D jsf2Element.getNodeName(); - if (nodeName.lastIndexOf(':') !=3D -1) { - nodeName =3D nodeName.substring(nodeName.lastIndexOf(':') + 1); - } + String nodeName =3D jsf2Element.getLocalName(); String relativeLocation =3D "/resources" + nameSpaceURI.replaceFirst( //= $NON-NLS-1$ JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ IVirtualComponent component =3D ComponentCore.createComponent(project); @@ -67,16 +71,16 @@ IPath path =3D folder.getFullPath().append(relativeLocation).append( "/" + nodeName + ".xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ IFile file =3D ResourcesPlugin.getWorkspace().getRoot().getFile(path); - if (file.exists()) { + if (file.isAccessible()) { return file; } } return searchInClassPath(project, "META-INF" + relativeLocation //$NON-N= LS-1$ - + "/" + nodeName + ".xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ + + "/" + nodeName + ".xhtml", JAR_FILE_RESOURCE_TYPE); //$NON-NLS-1$ //= $NON-NLS-2$ } = - private static ZipEntry searchInClassPath(IProject project, - String classPathResource) { + private static JarEntryResource searchInClassPath(IProject project, + String classPathResource, int jarResourceType) { IJavaProject javaProject =3D JavaCore.create(project); try { for (IPackageFragmentRoot fragmentRoot : javaProject @@ -86,7 +90,18 @@ ZipEntry zipEntry =3D jarPackageFragmentRoot.getJar() .getEntry(classPathResource); if (zipEntry !=3D null) { - return zipEntry; + if (jarResourceType =3D=3D JAR_FILE_RESOURCE_TYPE) { + JarEntryFile fileInJar =3D new JarEntryFile( + classPathResource); + fileInJar.setParent(jarPackageFragmentRoot); + return fileInJar; + } + if (jarResourceType =3D=3D JAR_DIRECTORY_RESOURCE_TYPE) { + JarEntryDirectory directoryInJar =3D new JarEntryDirectory( + classPathResource); + directoryInJar.setParent(jarPackageFragmentRoot); + return directoryInJar; + } } } } @@ -98,8 +113,8 @@ return null; } = - public static IPath findResourcesFolderByNameSpace(IProject project, - String nameSpaceURI) { + public static Object findResourcesFolderContainerByNameSpace( + IProject project, String nameSpaceURI) { if (nameSpaceURI =3D=3D null || nameSpaceURI.indexOf(JSF2_URI_PREFIX) = =3D=3D -1) { return null; } @@ -113,16 +128,17 @@ IPath path =3D folder.getFullPath().append(relativeLocation); IFolder resFolder =3D ResourcesPlugin.getWorkspace().getRoot() .getFolder(path); - if (resFolder.exists()) { - return resFolder.getFullPath(); + if (resFolder.isAccessible()) { + return resFolder; } } - return null; + return searchInClassPath(project, + "META-INF" + relativeLocation, JAR_DIRECTORY_RESOURCE_TYPE); //$NON-NL= S-1$ } = public static boolean isResourcesFolderExists(IProject project, String nameSpaceURI) { - return findResourcesFolderByNameSpace(project, nameSpaceURI) =3D=3D null= ? false + return findResourcesFolderContainerByNameSpace(project, nameSpaceURI) = =3D=3D null ? false : true; } = --===============3659250743561989182==-- From jbosstools-commits at lists.jboss.org Mon May 3 05:58:56 2010 Content-Type: multipart/mixed; boundary="===============3720540848906415165==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21851 - trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test. Date: Mon, 03 May 2010 05:58:56 -0400 Message-ID: <201005030958.o439wuBM010230@svn01.web.mwc.hst.phx2.redhat.com> --===============3720540848906415165== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yzhishko Date: 2010-05-03 05:58:56 -0400 (Mon, 03 May 2010) New Revision: 21851 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/t= est/VpeTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6197 - changes were reverted due t= o test failing on hudson Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/v= pe/ui/test/VpeTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/= test/VpeTest.java 2010-05-03 08:37:11 UTC (rev 21850) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/= test/VpeTest.java 2010-05-03 09:58:56 UTC (rev 21851) @@ -9,10 +9,8 @@ * Red Hat, Inc. - initial API and implementation *************************************************************************= *****/ = - package org.jboss.tools.vpe.ui.test; = - import java.io.IOException; import java.util.Collection; import java.util.Map; @@ -51,143 +49,151 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; = - /** * The Class VpeTest. * = * @author Max Areshkau * = - * Base Class for VPE tests + * Base Class for VPE tests */ public class VpeTest extends TestCase implements ILogListener { = - /** Editor in which we open visual page. */ - protected final static String EDITOR_ID =3D "org.jboss.tools.jst.jsp.j= speditor.JSPTextEditor"; //$NON-NLS-1$ + /** Editor in which we open visual page. */ + protected final static String EDITOR_ID =3D "org.jboss.tools.jst.jsp.jspe= ditor.JSPTextEditor"; //$NON-NLS-1$ = - /** Collects exceptions. */ - private Throwable exception; + /** Collects exceptions. */ + private Throwable exception; = - /** check warning log. */ - private boolean checkWarning =3D false; - = - // FIX for JBIDE-1628 - static { - ClassLoaderUtil.init(); - // wait for initialization - TestUtil.delay(3000); - JspEditorPlugin.getDefault().getPreferenceStore().setValue(IVpePre= ferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, = false); - } + /** check warning log. */ + private boolean checkWarning =3D false; = - /** - * The Constructor. - * = - * @param importProjectName * @param name the name - */ + // FIX for JBIDE-1628 + static { + ClassLoaderUtil.init(); + // wait for initialization + TestUtil.delay(3000); + JspEditorPlugin + .getDefault() + .getPreferenceStore() + .setValue( + IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROP= ERLY_FOR_VPE, + false); + } = - public VpeTest(String name) { - super(name); + /** + * The Constructor. + * = + * @param importProjectName + * * @param name the name + */ = - } + public VpeTest(String name) { + super(name); = - /** - * Perform pre-test initialization. - * = - * @throws Exception the exception - * = - * @see TestCase#setUp() - */ - @Override + } + + /** + * Perform pre-test initialization. + * = + * @throws Exception + * the exception + * = + * @see TestCase#setUp() + */ + @Override protected void setUp() throws Exception { - super.setUp(); - Platform.addLogListener(this); - // String jbossPath =3D System.getProperty( - // "jbosstools.test.jboss.home.4.2", "C:\\java\\jboss-4.2.2.GA"); - // JBossASAdapterInitializer.initJBossAS(jbossPath, new - // NullProgressMonitor()); - closeEditors(); - } + super.setUp(); + Platform.addLogListener(this); + // String jbossPath =3D System.getProperty( + // "jbosstools.test.jboss.home.4.2", "C:\\java\\jboss-4.2.2.GA"); + // JBossASAdapterInitializer.initJBossAS(jbossPath, new + // NullProgressMonitor()); + closeEditors(); + } = - /** - * Perform post-test cleanup. - * = - * @throws Exception the exception - * = - * @see TestCase#tearDown() - */ - @Override + /** + * Perform post-test cleanup. + * = + * @throws Exception + * the exception + * = + * @see TestCase#tearDown() + */ + @Override protected void tearDown() throws Exception { - = - boolean isJobsCheck =3D true; - while (isJobsCheck){ + + boolean isJobsCheck =3D true; + while (isJobsCheck) { isJobsCheck =3D false; - Job[] jobs =3D Job.getJobManager().find(null); + Job[] jobs =3D Job.getJobManager().find(null); for (Job job : jobs) { if (job instanceof StructuredRegionProcessor) { - if (job.getState() =3D=3D Job.RUNNING) { - TestUtil.delay(50); - isJobsCheck =3D true; - break; - } + TestUtil.delay(50); + isJobsCheck =3D true; + break; } } } - = - closeEditors(); - = - Platform.removeLogListener(this); - = - if (getException() !=3D null) { + + closeEditors(); + + Platform.removeLogListener(this); + + if (getException() !=3D null) { throw new Exception(getException()); } - = - super.tearDown(); = - } + super.tearDown(); = - /* - * (non-Javadoc) - * = - * @see - * org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runt= ime - * .IStatus, java.lang.String) - */ - /** - * Logging. - * = - * @param status the status - * @param plugin the plugin - */ - public void logging(IStatus status, String plugin) { - switch (status.getSeverity()) { - case IStatus.ERROR: - setException(status.getException()); - break; - case IStatus.WARNING: - if (isCheckWarning()) - setException(status.getException()); - break; - default: - break; - } + } = - } + /* + * (non-Javadoc) + * = + * @see + * org.eclipse.core.runtime.ILogListener#logging(org.eclipse.core.runtime + * .IStatus, java.lang.String) + */ + /** + * Logging. + * = + * @param status + * the status + * @param plugin + * the plugin + */ + public void logging(IStatus status, String plugin) { + switch (status.getSeverity()) { + case IStatus.ERROR: + setException(status.getException()); + break; + case IStatus.WARNING: + if (isCheckWarning()) + setException(status.getException()); + break; + default: + break; + } = - /** - * close all opened editors. - */ - protected void closeEditors() { + } = - // wait -// TestUtil.waitForJobs(); - IWorkbenchPage page =3D PlatformUI.getWorkbench().getActiveWorkben= chWindow().getActivePage(); - IWorkbenchPart part =3D page.getViewReferences()[0].getPart(false); - page.activate(part); - // close - page.closeAllEditors(false); + /** + * close all opened editors. + */ + protected void closeEditors() { = - } - = - /** + // wait + // TestUtil.waitForJobs(); + IWorkbenchPage page =3D PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); + IWorkbenchPart part =3D page.getViewReferences()[0].getPart(false); + page.activate(part); + // close + page.closeAllEditors(false); + + } + + /** * = * @return source document */ @@ -197,102 +203,118 @@ = } = - /** - * Perfoms test for some page. - * = - * @param componentPage the component page - * = - * @throws Throwable the throwable - * @throws PartInitException the part init exception - */ - protected void performTestForVpeComponent(IFile componentPage) throws = PartInitException, Throwable { - TestUtil.waitForJobs(); + /** + * Perfoms test for some page. + * = + * @param componentPage + * the component page + * = + * @throws Throwable + * the throwable + * @throws PartInitException + * the part init exception + */ + protected void performTestForVpeComponent(IFile componentPage) + throws PartInitException, Throwable { + TestUtil.waitForJobs(); = - setException(null); + setException(null); = - // IFile file =3D (IFile) - // TestUtil.getComponentPath(componentPage,getImportProjectName()); - IEditorInput input =3D new FileEditorInput(componentPage); + // IFile file =3D (IFile) + // TestUtil.getComponentPath(componentPage,getImportProjectName()); + IEditorInput input =3D new FileEditorInput(componentPage); = - TestUtil.waitForJobs(); + TestUtil.waitForJobs(); = - IEditorPart editor =3D PlatformUI.getWorkbench().getActiveWorkbenc= hWindow().getActivePage().openEditor(input, EDITOR_ID, true); - //here we wait for inintialization VPE controller - TestUtil.getVpeController((JSPMultiPageEditor) editor); - = - assertNotNull(editor); + IEditorPart editor =3D PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage().openEditor(input, + EDITOR_ID, true); + // here we wait for inintialization VPE controller + TestUtil.getVpeController((JSPMultiPageEditor) editor); = - TestUtil.waitForJobs(); - //JBIDE-1628 -// TestUtil.delay(1000); + assertNotNull(editor); = - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage= ().closeAllEditors(true); + TestUtil.waitForJobs(); + // JBIDE-1628 + // TestUtil.delay(1000); = - if (getException() !=3D null) { - throw getException(); - } - } + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() + .closeAllEditors(true); = - /** - * Open JSPMultiPageEditor editor. - * = - * @param input the input - * = - * @return the JSP multi page editor - * = - * @throws PartInitException the part init exception - */ - protected JSPMultiPageEditor openEditor(IEditorInput input) throws Par= tInitException { + if (getException() !=3D null) { + throw getException(); + } + } = - // get editor - JSPMultiPageEditor part =3D (JSPMultiPageEditor) PlatformUI.getWor= kbench().getActiveWorkbenchWindow().getActivePage().openEditor( - input, EDITOR_ID, true); + /** + * Open JSPMultiPageEditor editor. + * = + * @param input + * the input + * = + * @return the JSP multi page editor + * = + * @throws PartInitException + * the part init exception + */ + protected JSPMultiPageEditor openEditor(IEditorInput input) + throws PartInitException { = - assertNotNull(part); - return part; + // get editor + JSPMultiPageEditor part =3D (JSPMultiPageEditor) PlatformUI + .getWorkbench().getActiveWorkbenchWindow().getActivePage() + .openEditor(input, EDITOR_ID, true); = - } + assertNotNull(part); + return part; = - /** - * Gets the exception. - * = - * @return the exception - */ - protected Throwable getException() { - return exception; - } + } = - /** - * Sets the exception. - * = - * @param exception the exception to set - */ - protected void setException(Throwable exception) { - this.exception =3D exception; - } + /** + * Gets the exception. + * = + * @return the exception + */ + protected Throwable getException() { + return exception; + } = - /** - * Checks if is check warning. - * = - * @return the checkWarning - */ - protected boolean isCheckWarning() { - return checkWarning; - } + /** + * Sets the exception. + * = + * @param exception + * the exception to set + */ + protected void setException(Throwable exception) { + this.exception =3D exception; + } = - /** - * Sets the check warning. - * = - * @param checkWarning the checkWarning to set - */ - protected void setCheckWarning(boolean checkWarning) { - this.checkWarning =3D checkWarning; - } - /** - * Compares source nodes selection and visual selection - * @param VPE Editor part - */ - protected void checkSourceSelection(JSPMultiPageEditor part) { + /** + * Checks if is check warning. + * = + * @return the checkWarning + */ + protected boolean isCheckWarning() { + return checkWarning; + } + + /** + * Sets the check warning. + * = + * @param checkWarning + * the checkWarning to set + */ + protected void setCheckWarning(boolean checkWarning) { + this.checkWarning =3D checkWarning; + } + + /** + * Compares source nodes selection and visual selection + * = + * @param VPE + * Editor part + */ + protected void checkSourceSelection(JSPMultiPageEditor part) { // get controller VpeController controller =3D TestUtil.getVpeController(part); assertNotNull(controller); @@ -334,44 +356,45 @@ TestUtil.delay(50); = assertNotNull(xulRunnerEditor.getLastSelectedNode()); - = + nsIDOMNode sample; if (nodeMapping.getSourceNode().getNodeType() =3D=3D Node.TEXT_NODE && ((VpeElementMapping) nodeMapping).getElementData() !=3D null) { = - sample =3D ((VpeElementMapping) nodeMapping).getElementData().getNode= sData().get(0).getVisualNode(); - } - else { + sample =3D ((VpeElementMapping) nodeMapping).getElementData() + .getNodesData().get(0).getVisualNode(); + } else { sample =3D nodeMapping.getVisualNode(); } - = - assertEquals(sample, xulRunnerEditor - .getLastSelectedNode()); + + assertEquals(sample, xulRunnerEditor.getLastSelectedNode()); } } - } + } = /** * Opens specified file in the VPE editor. * = - * @param projectName the name of the project - * @param fileName the name of the file + * @param projectName + * the name of the project + * @param fileName + * the name of the file * = * @return VpeController - * @throws CoreException = - * @throws IOException = + * @throws CoreException + * @throws IOException */ protected VpeController openInVpe(String projectName, String fileName) throws CoreException, IOException { // get test page path - final IFile file =3D - (IFile) TestUtil.getComponentPath(fileName, projectName); - assertNotNull("Could not open specified file." //$NON-NLS-1$ - + " componentPage =3D " + fileName //$NON-NLS-1$ - + ";projectName =3D " + projectName, file); //$NON-NLS-1$ + final IFile file =3D (IFile) TestUtil.getComponentPath(fileName, + projectName); + assertNotNull("Could not open specified file." //$NON-NLS-1$ + + " componentPage =3D " + fileName //$NON-NLS-1$ + + ";projectName =3D " + projectName, file); //$NON-NLS-1$ = final IEditorInput input =3D new FileEditorInput(file); - assertNotNull("Editor input is null", input); //$NON-NLS-1$ + assertNotNull("Editor input is null", input); //$NON-NLS-1$ = // open and get the editor final JSPMultiPageEditor part =3D openEditor(input); @@ -379,7 +402,7 @@ final VpeController vpeController =3D TestUtil.getVpeController(part); return vpeController; } - = + /** * find source element by "id" * = @@ -392,7 +415,7 @@ = return getSourceDocument(controller).getElementById(elementId); } - = + /** * find visual element by "id" entered in source part of vpe * = --===============3720540848906415165==-- From jbosstools-commits at lists.jboss.org Mon May 3 07:31:35 2010 Content-Type: multipart/mixed; boundary="===============5564013197992783291==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21852 - trunk/drools/docs/guvnor_ref/en-US. Date: Mon, 03 May 2010 07:31:35 -0400 Message-ID: <201005031131.o43BVZPQ000998@svn01.web.mwc.hst.phx2.redhat.com> --===============5564013197992783291== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-03 07:31:35 -0400 (Mon, 03 May 2010) New Revision: 21852 Modified: trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml trunk/drools/docs/guvnor_ref/en-US/introduction.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-6 Show java-doc is shown for EL= content assist item. Screenshot has been made. TOOLSDOC-63 Eclipse Guvnor Tools Reference Guide restructureing and update.= Text was updated. Modified: trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml 2010-05-0= 3 09:58:56 UTC (rev 21851) +++ trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml 2010-05-0= 3 11:31:35 UTC (rev 21852) @@ -266,7 +266,7 @@ = As mentioned in the "Int= roduction", the main purpose of the EGT is to allow development using = resources held in a Guvnor - repository. There are two method of getting local copies of Gu= vnor repository + repository. There are two methods of getting local copies of G= uvnor repository resources: = @@ -305,10 +305,10 @@ above you can see the Dummy rule.drl file with t= he decoration in the Resource Navigator. The Guvnor ic= on decorator is on the top right of the file image, and the Guvnor revision details are appended to the file name. (The presence/= location of these can be - changed the = Guvnor + changed in the Guvnor Preferences.) = - Here we see that, Dummy role.drl is associated with a Guvnor repository + Here we see that, Dummy rule.drl is associated with a Guvnor repository resource and the local copy is based on revision 0, with a 02-10-2008, 4:21:53 date/time stamp. The file Sample.drl, however, is not associated with a Guvnor repository file. Further details about the association can be found in th= e standard Eclipse @@ -496,7 +496,7 @@ = The Show History - action is enable for one Guvnor repository ass= ociated file and causes + action is enabled for one Guvnor repository as= sociated file and causes the Guvnor Resource = History view to be populated with revision history for the selected file. @@ -634,7 +634,7 @@ = Here we see that the file test.txt - has three revisions. Double clicking on a revision= row (or the context menu + has seven revisions. Double clicking on a revision= row (or the context menu Open (Read only)) opens an= Eclipse read-only editor with the revision contents. = Modified: trunk/drools/docs/guvnor_ref/en-US/introduction.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/introduction.xml 2010-05-03 09:58:56= UTC (rev 21851) +++ trunk/drools/docs/guvnor_ref/en-US/introduction.xml 2010-05-03 11:31:35= UTC (rev 21852) @@ -119,7 +119,7 @@ How to start with Guvnor Tools = Guvnor Tools is a part of the JBoss Tools - project. Thus to get started with Guvnor Tools, you should have the following: + project. Thus to get started with Guvnor Tools, you should hav= e the following: = @@ -128,14 +128,35 @@ = - JBoss Server 4.2 or higher with Guvnor repository de= ployed. Thus, you should - download Guvnor CR1 and extract it to the deploy d= irectory of the - server. + JBoss Server 4.2 or higher with Guvnor repository de= ployed. - + To have JBoss Server with Guvnor repository deployed, you sh= ould + download Guvnor. + When downloading you may choose either web based Guvnor to dep= loy to your + JBoss Server or Standalone Guvnor with JBoss AS. = + If you use a JBoss AS 5 and a Guvnor Tools doesn't work when deployed to the server, + you should do the following to get Guvnor Tools running: + + + Remove the JBoss Security libraries (authorization-= spi-2.0.2.CR6.jar, = + identity-*, acl-spi-2.0.2.CR6.jar) from drools WAR fil= e (not the app server itself). = + The JBoss Security libraries are provided in AS 5. + + + Remove the JAXP libraries (xercesImpl-2.8.0.jar, xml= -apis-2.*) + + + Remove the EL libraries (el-*) + + + After this, Guvnor should operate as normal. = + During deployment, you would see the following exception in th= e log which indicates that the experiemental + JBoss Security based ACL integration has defined some EJB3/JPA= stuff in guvnor that has not been configured. + ERROR [AbstractKernelController] Error installing = to Start: name=3Dpersistence.unit:unitName=3D#ACL state=3DCreate +java.lang.RuntimeException: Specification violation [EJB3 JPA 6.2.1.2] - Y= ou have not defined a non-jta-data-source = +for a RESOURCE_LOCAL enabled persistence context named: ACL = + Now refer to the &q= uot;Functionality Overview" section to find out what you can do = with Guvnor and Eclipse synchronisation tool. --===============5564013197992783291==-- From jbosstools-commits at lists.jboss.org Mon May 3 09:57:35 2010 Content-Type: multipart/mixed; boundary="===============6633710838143425093==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21853 - trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/web/ui/test. Date: Mon, 03 May 2010 09:57:35 -0400 Message-ID: <201005031357.o43DvZFr030497@svn01.web.mwc.hst.phx2.redhat.com> --===============6633710838143425093== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-03 09:57:35 -0400 (Mon, 03 May 2010) New Revision: 21853 Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/= web/ui/test/WebWizardsTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6216, https://jira.jboss.org/jira/= browse/JBIDE-6190 Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/too= ls/jst/web/ui/test/WebWizardsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst= /web/ui/test/WebWizardsTest.java 2010-05-03 11:31:35 UTC (rev 21852) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst= /web/ui/test/WebWizardsTest.java 2010-05-03 13:57:35 UTC (rev 21853) @@ -10,15 +10,25 @@ *************************************************************************= *****/ = package org.jboss.tools.jst.web.ui.test; = +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.IWizardPage; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.ui.ISelectionService; +import org.eclipse.ui.IWorkbenchWizard; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; import org.jboss.tools.common.model.ui.test.AbstractModelNewWizardTest; import org.jboss.tools.common.model.ui.wizard.newfile.NewHTMLFileWizard; import org.jboss.tools.common.model.ui.wizard.newfile.NewJSPFileWizard; import org.jboss.tools.common.model.ui.wizard.newfile.NewPropertiesFileWiz= ard; +import org.jboss.tools.common.model.ui.wizards.standard.DefaultStandardSte= p; import org.jboss.tools.jst.web.ui.wizards.newfile.NewCSSFileWizard; import org.jboss.tools.jst.web.ui.wizards.newfile.NewJSFileWizard; import org.jboss.tools.jst.web.ui.wizards.newfile.NewTLDFileWizard; import org.jboss.tools.jst.web.ui.wizards.newfile.NewWebFileWizard; import org.jboss.tools.jst.web.ui.wizards.newfile.NewXHTMLWizard; +import org.jboss.tools.test.util.WorkbenchUtils; = /** * @author eskimo @@ -41,9 +51,38 @@ public void testNewJspWizardInstanceIsCreated() { testNewWizardInstanceIsCreated(NewJSPFileWizard.class.getName()); } - = + //rewritten by Maksim Areshkau, as fix for https://jira.jboss.org/jira/br= owse/JBIDE-6216, + //https://jira.jboss.org/jira/browse/JBIDE-6190 public void testNewXhtmlWizardInstanceIsCreated() { - testNewWizardInstanceIsCreated(NewXHTMLWizard.class.getName()); + //commented by Maksim Areshkau, because in this methid not called + //init for wizard + //testNewWizardInstanceIsCreated(NewXHTMLWizard.class.getName()); + IWorkbenchWizard = + aWizard =3D (IWorkbenchWizard) WorkbenchUtils.findWizardByDefId( + NewXHTMLWizard.class.getName()); + WizardDialog dialog =3D new WizardDialog( + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), + aWizard); + try { + //here we show view to get initialized selection + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().sh= owView("org.eclipse.jdt.ui.PackageExplorer"); //$NON-NLS-1$ + } catch (PartInitException e) { + fail(e.toString()); + } + ISelectionService selectionService =3D PlatformUI.getWorkbench().getA= ctiveWorkbenchWindow().getSelectionService(); + ISelection eclipseSelection =3D selectionService.getSelection(); + aWizard.init(PlatformUI.getWorkbench(), (IStructuredSelection) eclipseSe= lection); + dialog.setBlockOnOpen(false); + try { + dialog.open(); + IWizardPage htmlWizardNewFileCreationPage =3D dialog.getCurrentPage(); + assertEquals("The Page should be","HTMLWizardNewFileCreationPage", html= WizardNewFileCreationPage.getName()); //$NON-NLS-1$//$NON-NLS-2$ + IWizardPage newXHTMLTemplatesWizardPage=3DhtmlWizardNewFileCreationPage= .getNextPage(); + assertEquals("The Page should be","NewXHTMLTemplatesWizardPage", newXHT= MLTemplatesWizardPage.getName()); //$NON-NLS-1$//$NON-NLS-2$ + assertTrue("Start page is not loaded",newXHTMLTemplatesWizardPage.getNe= xtPage() instanceof DefaultStandardStep); //$NON-NLS-1$ + } finally { + dialog.close(); + } } = public void testNewHtmlWizardInstanceIsCreated() { --===============6633710838143425093==-- From jbosstools-commits at lists.jboss.org Mon May 3 11:33:40 2010 Content-Type: multipart/mixed; boundary="===============2692776700808573586==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21854 - branches/modular_build/site. Date: Mon, 03 May 2010 11:33:40 -0400 Message-ID: <201005031533.o43FXeJZ021183@svn01.web.mwc.hst.phx2.redhat.com> --===============2692776700808573586== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 11:33:40 -0400 (Mon, 03 May 2010) New Revision: 21854 Modified: branches/modular_build/site/ Log: svn:ignore Property changes on: branches/modular_build/site ___________________________________________________________________ Name: svn:ignore + plugins/ features/ content.* artifacts.* target/ bin/ buildlog.latest.txt --===============2692776700808573586==-- From jbosstools-commits at lists.jboss.org Mon May 3 12:12:29 2010 Content-Type: multipart/mixed; boundary="===============7146601448090918822==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21855 - branches/modular_build/site. Date: Mon, 03 May 2010 12:12:28 -0400 Message-ID: <201005031612.o43GCSg8032296@svn01.web.mwc.hst.phx2.redhat.com> --===============7146601448090918822== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 12:12:28 -0400 (Mon, 03 May 2010) New Revision: 21855 Added: branches/modular_build/site/category.JBDS.xml branches/modular_build/site/category.JBossTools.xml Removed: branches/modular_build/site/site.xml branches/modular_build/site/site.xml.jbds.template branches/modular_build/site/site.xml.jbosstools.template Log: remove site.xml* and create category.*.xml files Added: branches/modular_build/site/category.JBDS.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/category.JBDS.xml (= rev 0) +++ branches/modular_build/site/category.JBDS.xml 2010-05-03 16:12:28 UTC (= rev 21855) @@ -0,0 +1,194 @@ + + + + This is the ${update.site.description} Update Site for ${product.nam= e} ${product.version}. + + + + + + + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + + + = + + + + + + = + + + ${product.name} SDK contains plugins where an SDK packa= ge exists. These contain both source and runtimes. Use these if you want to= debug and/or provide patches to ${product.name} plugins. + + + + + + Contains ALL the plugins that are available from ${product.name} = except those related to integration with 3rd party plugins. Selecting this = category will give you all tools needed for both Web, Seam and SOA Developm= ent. + + + + + + Tools to help create SOA applications. Use these if you work with= jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. + + + + + + Tools to help create web and enterprise applications, using JSF, Facelets= , Seam, Hibernate/JPA, CSS, Webservices and more. + + + + + Tools for general application development. + + + + Tools related to data services such as persistence and = transformation. + + + + + + + + + + Tools used to improve testing and performance. + + + Added: branches/modular_build/site/category.JBossTools.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/category.JBossTools.xml = (rev 0) +++ branches/modular_build/site/category.JBossTools.xml 2010-05-03 16:12:28= UTC (rev 21855) @@ -0,0 +1,179 @@ + + + + This is the ${update.site.description} Update Site for ${product.nam= e} ${product.version}. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + = + + + = + + + + + + = + + + ${product.name} SDK contains plugins where an SDK packa= ge exists. These contain both source and runtimes. Use these if you want to= debug and/or provide patches to ${product.name} plugins. + + + + + + Contains ALL the plugins that are available from ${product.name} = except those related to integration with 3rd party plugins. Selecting this = category will give you all tools needed for both Web, Seam and SOA Developm= ent. + + + + + + Tools to help create SOA applications. Use these if you work with= jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. + + + + + + Tools to help create web and enterprise applications, using JSF, Facelets= , Seam, Hibernate/JPA, CSS, Webservices and more. + + + + + Tools for general application development. + + + + Tools related to data services such as persistence and = transformation. + + + + + Plugins related to Maven and m2eclipse support. Use the= se to enable use of Maven. + + + + + Business Intelligence, Reporting and Charting. Use these= if you plan to integrate Hibernate or Seam with Eclipse BIRT. + + + + Tools used to improve testing and performance. + + + Deleted: branches/modular_build/site/site.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/site.xml 2010-05-03 15:33:40 UTC (rev 21854) +++ branches/modular_build/site/site.xml 2010-05-03 16:12:28 UTC (rev 21855) @@ -1,168 +0,0 @@ - - - - This is the 0.0.0 Update Site for JBoss Tools. - - - - - - - - - - - - - - = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = - - = - - - - - - = - - - JBoss Tools SDK contains plugins where an SDK package e= xists. These contain both source and runtimes. Use these if you want to deb= ug and/or provide patches to JBoss Tools plugins. - - - - - - Contains ALL the plugins that are available from JBoss Tools exce= pt those related to integration with 3rd party plugins. Selecting this cate= gory will give you all tools needed for both Web, Seam and SOA Development. - - - - - - Tools to help create SOA applications. Use these if you work with= jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. - - - - - - Tools to help create web and enterprise applications, using JSF, Facelets= , Seam, Hibernate/JPA, CSS, Webservices and more. - - - - - Tools for general application development. - - - - Tools related to data services such as persistence and = transformation. - - - - Plugins related to Maven and m2eclipse support. Use the= se to enable use of Maven. - - - - Business Intelligence, Reporting and Charting. Use these= if you plan to integrate Hibernate or Seam with Eclipse BIRT. - - - - Tools used to improve testing and performance. - - - Deleted: branches/modular_build/site/site.xml.jbds.template =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/site.xml.jbds.template 2010-05-03 15:33:40 = UTC (rev 21854) +++ branches/modular_build/site/site.xml.jbds.template 2010-05-03 16:12:28 = UTC (rev 21855) @@ -1,181 +0,0 @@ - - - - - This is the ${update.site.description} Update Site for JBoss Develop= er Studio. = - - - - - - - - - - = - - - - - - - - - - - - - = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = - - - - - - - - = - - - - - - = - - - JBoss Developer Studio SDK contains plugins where an SD= K package exists. These contain both source and runtimes. Use these if you = want to debug and/or provide patches to JBoss Developer Studio plugins. - - - - - - Contains ALL the plugins that are available from JBoss Developer = Studio except those related to integration with 3rd party plugins. Selectin= g this category will give you all tools needed for both Web, Seam and SOA D= evelopment. - - - - - - Tools to help create SOA applications. Use these if you work with= jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. - - - - - - Tools to help create web and enterprise applications, using JSF, Facelets= , Seam, Hibernate/JPA, CSS, Webservices and more. - - - - - Tools for general application development. - - - - Tools related to data services such as persistence and = transformation. - - - - - - - - Tools used to improve testing and performance. - - - Deleted: branches/modular_build/site/site.xml.jbosstools.template =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/site.xml.jbosstools.template 2010-05-03 15:= 33:40 UTC (rev 21854) +++ branches/modular_build/site/site.xml.jbosstools.template 2010-05-03 16:= 12:28 UTC (rev 21855) @@ -1,166 +0,0 @@ - - - - This is the ${update.site.description} Update Site for JBoss Tools. - - - - - - - - - - - - - - = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = - - - - - - - - - - = - - - - - - = - - - JBoss Tools SDK contains plugins where an SDK package e= xists. These contain both source and runtimes. Use these if you want to deb= ug and/or provide patches to JBoss Tools plugins. - - - - - - Contains ALL the plugins that are available from JBoss Tools exce= pt those related to integration with 3rd party plugins. Selecting this cate= gory will give you all tools needed for both Web, Seam and SOA Development. - - - - - - Tools to help create SOA applications. Use these if you work with= jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. - - - - - - Tools to help create web and enterprise applications, using JSF, Facelets= , Seam, Hibernate/JPA, CSS, Webservices and more. - - - - - Tools for general application development. - - - - Tools related to data services such as persistence and = transformation. - - - - Plugins related to Maven and m2eclipse support. Use the= se to enable use of Maven. - - - - Business Intelligence, Reporting and Charting. Use these= if you plan to integrate Hibernate or Seam with Eclipse BIRT. - - - - Tools used to improve testing and performance. - - - --===============7146601448090918822==-- From jbosstools-commits at lists.jboss.org Mon May 3 12:43:44 2010 Content-Type: multipart/mixed; boundary="===============2914382052659442754==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21856 - branches/modular_build/build. Date: Mon, 03 May 2010 12:43:44 -0400 Message-ID: <201005031643.o43GhiXh003625@svn01.web.mwc.hst.phx2.redhat.com> --===============2914382052659442754== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 12:43:43 -0400 (Mon, 03 May 2010) New Revision: 21856 Modified: branches/modular_build/build/build.xml Log: enable uber-update-site builder Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-03 16:12:28 UTC (rev 218= 55) +++ branches/modular_build/build/build.xml 2010-05-03 16:43:43 UTC (rev 218= 56) @@ -24,6 +24,16 @@ = + + + + + + @@ -60,9 +70,8 @@ = - = + + + + + + + + + + + + @@ -354,36 +375,8 @@ = - - - - - - - - - - #!/bin/bash -if [[ -f /tmp/.X3-lock ]]; then = - kill -9 `cat /tmp/.X3-lock` - rm -fr /tmp/.X3-lock -fi -/usr/bin/Xvfb :3 -ac 2>&1 1>/dev/null & = -DISPLAY=3D:3 /opt/maven3/bin/mvn $* = -kill -9 `cat /tmp/.X3-lock` -rm -fr /tmp/.X3-lock - - - - - - - + = Exe: ${COMMON_TOOLS}/apache-maven-${maven.vers= ion}/bin/${mvnExe} Pom: ${WORKINGDIR}/@{COMPONENT}/pom.xml @@ -419,6 +412,34 @@ Builds done = + + + + + + + + + + + #!/bin/bash +if [[ -f /tmp/.X3-lock ]]; then = +kill -9 `cat /tmp/.X3-lock` +rm -fr /tmp/.X3-lock +fi +/usr/bin/Xvfb :3 -ac 2>&1 1>/dev/null & = +DISPLAY=3D:3 /opt/maven3/bin/mvn $* = +kill -9 `cat /tmp/.X3-lock` +rm -fr /tmp/.X3-lock + + + + + + + + + @@ -537,36 +558,42 @@ = - - + = - - - - - + + + + + = - - - - - - = + + + + + + + + + + = - - - = - - + + + + + + + + = = --===============3728394885016649809==-- From jbosstools-commits at lists.jboss.org Mon May 3 12:48:27 2010 Content-Type: multipart/mixed; boundary="===============5758792025776874758==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21858 - branches/modular_build/build. Date: Mon, 03 May 2010 12:48:27 -0400 Message-ID: <201005031648.o43GmRGE004180@svn01.web.mwc.hst.phx2.redhat.com> --===============5758792025776874758== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 12:48:26 -0400 (Mon, 03 May 2010) New Revision: 21858 Modified: branches/modular_build/build/build.xml Log: document syntax for rebuilding update site w/o first building all components Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-03 16:45:44 UTC (rev 218= 57) +++ branches/modular_build/build/build.xml 2010-05-03 16:48:26 UTC (rev 218= 58) @@ -57,6 +57,10 @@ or, to (re-)run tests w/o (re-)building first: cd /home/nboldt/workspace36/jbosstools-modular_build; \ ant -DCOMPONENTS=3Dtests,common,jmx -DMAVEN_FLAGS=3D"osgi-test:test -B= -fn" + = +or, to re-build the update site w/o building first: + cd /home/nboldt/workspace36/jbosstools-modular_build; \ + ant create.overall.update.site -Dbuild.if.sources.unchanged=3Dtrue = Note: if tests stall on Linux, install Xvfb and this script will use that = to run Maven. = --===============5758792025776874758==-- From jbosstools-commits at lists.jboss.org Mon May 3 12:49:03 2010 Content-Type: multipart/mixed; boundary="===============8282984824564015808==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21859 - branches/modular_build/site. Date: Mon, 03 May 2010 12:49:03 -0400 Message-ID: <201005031649.o43Gn3MQ004198@svn01.web.mwc.hst.phx2.redhat.com> --===============8282984824564015808== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 12:49:03 -0400 (Mon, 03 May 2010) New Revision: 21859 Added: branches/modular_build/site/README-HOWTO-BUILD.txt Log: Added: branches/modular_build/site/README-HOWTO-BUILD.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/README-HOWTO-BUILD.txt = (rev 0) +++ branches/modular_build/site/README-HOWTO-BUILD.txt 2010-05-03 16:49:03 = UTC (rev 21859) @@ -0,0 +1,13 @@ +To build this update site: + + cd /tmp; \ + svn co http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/= build/; \ + cd build; \ + ant + +To build just the update site (assuming you've previously built the compon= ents): + + cd /tmp/build; + ant create.overall.update.site -Dbuild.if.sources.unchanged=3Dtrue + + --===============8282984824564015808==-- From jbosstools-commits at lists.jboss.org Mon May 3 13:16:02 2010 Content-Type: multipart/mixed; boundary="===============8696431983121150581==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21860 - branches/modular_build/build. Date: Mon, 03 May 2010 13:16:02 -0400 Message-ID: <201005031716.o43HG2bk013645@svn01.web.mwc.hst.phx2.redhat.com> --===============8696431983121150581== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 13:16:01 -0400 (Mon, 03 May 2010) New Revision: 21860 Modified: branches/modular_build/build/build.xml Log: copy update zip into workspace so Hudson can archive it Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-03 16:49:03 UTC (rev 218= 59) +++ branches/modular_build/build/build.xml 2010-05-03 17:16:01 UTC (rev 218= 60) @@ -597,6 +597,19 @@ basedir=3D"${WORKINGDIR}/site/target/site" update=3D"false" /> + + + + + + + + + + + + + = + = Modified: branches/modular_build/site/category.JBossTools.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/category.JBossTools.xml 2010-05-03 17:37:50= UTC (rev 21862) +++ branches/modular_build/site/category.JBossTools.xml 2010-05-03 20:01:42= UTC (rev 21863) @@ -129,6 +129,18 @@ + + + + + + + + + + + + = --===============9054007576325889288==-- From jbosstools-commits at lists.jboss.org Mon May 3 16:17:58 2010 Content-Type: multipart/mixed; boundary="===============0570908161239516491==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21864 - branches/modular_build/site. Date: Mon, 03 May 2010 16:17:57 -0400 Message-ID: <201005032017.o43KHvMc020438@svn01.web.mwc.hst.phx2.redhat.com> --===============0570908161239516491== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 16:17:57 -0400 (Mon, 03 May 2010) New Revision: 21864 Modified: branches/modular_build/site/category.JBDS.xml branches/modular_build/site/category.JBossTools.xml Log: add bpel and reformat xml Modified: branches/modular_build/site/category.JBDS.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/category.JBDS.xml 2010-05-03 20:01:42 UTC (= rev 21863) +++ branches/modular_build/site/category.JBDS.xml 2010-05-03 20:17:57 UTC (= rev 21864) @@ -1,209 +1,265 @@ - - This is the ${update.site.description} Update Site for ${product.nam= e} ${product.version}. + + This is the ${update.site.description} Update Site for ${product.name} $= {product.version}. = - - - - - - - - = - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + = - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = - - + + = - - - - + + = - = - - - - = - - - - - - - - - - - - - - - - = - - - ${product.name} SDK contains plugins where an SDK packa= ge exists. These contain both source and runtimes. Use these if you want to= debug and/or provide patches to ${product.name} plugins. - - + + + + = - - - Contains ALL the plugins that are available from ${product.name} = except those related to integration with 3rd party plugins. Selecting this = category will give you all tools needed for both Web, Seam and SOA Developm= ent. - - + + + + = - - - Tools to help create SOA applications. Use these if you work with= jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. - - + + + + + + + + + + + + + + + + + + + ${product.name} SDK contains plugins where an SDK package + exists. These contain both source and runtimes. Use these if you want + to debug and/or provide patches to ${product.name} plugins. + + + + + + Contains ALL the plugins that are available from + ${product.name} except those + related to integration with 3rd party + plugins. Selecting this + category will give you all tools needed for + both Web, Seam and SOA + Development. - + = - - Tools for general application development. - + + + Tools to help create SOA applications. Use these if you + work with jBPM, + Drools, JBoss ESB, JBoss WebServices or Smooks. + + = - - Tools related to data services such as persistence and = transformation. - + + + Tools to help create web and enterprise applications, + using JSF, Facelets, + Seam, Hibernate/JPA, CSS, Webservices and more. + + = - - + + Tools for general application development. + = - - + + Tools related to data services such as persistence and + transformation. + = - - Tools used to improve testing and performance. - + + = + + + + + Tools used to improve testing and performance. + + + Modified: branches/modular_build/site/category.JBossTools.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/category.JBossTools.xml 2010-05-03 20:01:42= UTC (rev 21863) +++ branches/modular_build/site/category.JBossTools.xml 2010-05-03 20:17:57= UTC (rev 21864) @@ -1,191 +1,263 @@ - - This is the ${update.site.description} Update Site for ${product.nam= e} ${product.version}. + + This is the ${update.site.description} Update Site for ${product.name} $= {product.version}. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = - - - - - - - - - - - - - - - - - - + + = - = - - = - - - = - - - - - - - - - - - - - - - - - - = - - - ${product.name} SDK contains plugins where an SDK packa= ge exists. These contain both source and runtimes. Use these if you want to= debug and/or provide patches to ${product.name} plugins. - - + + + + + + + + + + + + + + + + + + = - - - Contains ALL the plugins that are available from ${product.name} = except those related to integration with 3rd party plugins. Selecting this = category will give you all tools needed for both Web, Seam and SOA Developm= ent. - - + + + + + = - - - Tools to help create SOA applications. Use these if you work with= jBPM, Drools, JBoss ESB, JBoss WebServices or Smooks. - - + + + + + + + + + + + + + + + + + = - - - Tools to help create web and enterprise applications, using JSF, Facelets= , Seam, Hibernate/JPA, CSS, Webservices and more. + + + + + + + + ${product.name} SDK contains plugins where an SDK package + exists. These contain both source and runtimes. Use these if you want + to debug and/or provide patches to ${product.name} plugins. + + + + + + Contains ALL the plugins that are available from + ${product.name} except those + related to integration with 3rd party + plugins. Selecting this + category will give you all tools needed for + both Web, Seam and SOA + Development. - + = - - Tools for general application development. - + + + Tools to help create SOA applications. Use these if you + work with jBPM, + Drools, JBoss ESB, JBoss WebServices or Smooks. + + = - - Tools related to data services such as persistence and = transformation. - + + + Tools to help create web and enterprise applications, + using JSF, Facelets, + Seam, Hibernate/JPA, CSS, Webservices and more. + + = - - - Plugins related to Maven and m2eclipse support. Use the= se to enable use of Maven. - + + Tools for general application development. + = - - - Business Intelligence, Reporting and Charting. Use these= if you plan to integrate Hibernate or Seam with Eclipse BIRT. - + + Tools related to data services such as persistence and + transformation. + = - - Tools used to improve testing and performance. - + + + Plugins related to Maven and m2eclipse support. Use these + to enable use of Maven. + = + + + Business Intelligence, Reporting and Charting. Use these + if you plan to integrate Hibernate or Seam with Eclipse BIRT. + + + + + Tools used to improve testing and performance. + + + --===============0570908161239516491==-- From jbosstools-commits at lists.jboss.org Mon May 3 16:27:53 2010 Content-Type: multipart/mixed; boundary="===============6408075142335751708==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21865 - branches/modular_build/build. Date: Mon, 03 May 2010 16:27:52 -0400 Message-ID: <201005032027.o43KRq2J022000@svn01.web.mwc.hst.phx2.redhat.com> --===============6408075142335751708== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 16:27:52 -0400 (Mon, 03 May 2010) New Revision: 21865 Modified: branches/modular_build/build/build.xml Log: generate per-component update site zips; improve overall update site zip; r= efactoring and misc. tweaks Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-03 20:17:57 UTC (rev 218= 64) +++ branches/modular_build/build/build.xml 2010-05-03 20:27:52 UTC (rev 218= 65) @@ -33,6 +33,9 @@ --> = + + + @@ -58,10 +61,15 @@ cd /home/nboldt/workspace36/jbosstools-modular_build; \ ant -DCOMPONENTS=3Dtests,common,jmx -DMAVEN_FLAGS=3D"osgi-test:test -B= -fn" = -or, to re-build the update site w/o building first: +or, to re-build the overall update site w/o building first: cd /home/nboldt/workspace36/jbosstools-modular_build; \ ant create.overall.update.site -Dbuild.if.sources.unchanged=3Dtrue = +or, to re-build a single component's update site w/o first building, testi= ng, and installing it into the m2 repo: + cd /home/nboldt/workspace36/jbosstools-modular_build; \ + ant -DCOMPONENT=3Djmx create.update.site; \ + ant -DCOMPONENT=3Djbpm create.update.site + Note: if tests stall on Linux, install Xvfb and this script will use that = to run Maven. = Here is the order in which components must be built: @@ -73,14 +81,22 @@ = + = + + + = @@ -369,6 +385,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -378,24 +416,10 @@ = - - + + + = - Exe: ${COMMON_TOOLS}/apache-maven-${maven.vers= ion}/bin/${mvnExe} - Pom: ${WORKINGDIR}/@{COMPONENT}/pom.xml - - - - - - - - @@ -410,11 +434,44 @@ + + + + + + + + + + + + Builds done = + + + + Exe: ${COMMON_TOOLS}/apache-maven-${maven.versio= n}/bin/${mvnExe} + Pom: ${WORKINGDIR}/${COMPONENT}/pom.xml + + + + + + + + + + + @@ -557,12 +614,8 @@ = - - - - + - = @@ -579,22 +632,57 @@ = - - + + - - + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + = - - + + - = @@ -604,14 +692,104 @@ - - - + + + = + + + + + + + + + + + + + <project xsi:schemaLocatio= n=3D"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.= 0.0.xsd" xmlns=3D"http://maven.apache.org/POM/4.0.0" xmlns:xsi=3D"http://ww= w.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> = + <parent> + <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>${COMPONENT}.site</artifactId> = + <version>0.0.1-SNAPSHOT</version> + <packaging>eclipse-update-site</packaging> +</project> + + + + = + + + + + + + <?xml version=3D"1.0" enc= oding=3D"UTF-8"?> +<site> + <description>To install these features, point Eclipse at this site.= </description> + <!-- ${category.name} --> + <category-def label=3D"${category.name}" name=3D"${category.name}"> + <description>${category.name}: contains all features in this build= .</description> + </category-def> + + + + + + + + + + + + + + <featu= re url=3D"features/${feature.id}_0.0.0.jar" id=3D"${feature.id}" version=3D= "0.0.0"> + <category name=3D"${category.name}"/> + </feature> + + + + + + +</site> + + + @@ -76,7 +150,7 @@ = - Click on the + Click the New Connection icon = = = @@ -86,7 +160,7 @@ = in the MBean Explorer menu - bar + bar. = @@ -95,7 +169,7 @@ service:jmx:rmi:///jndi/rmi://:8118/jmxs= erver - + = You now have access to the MBeans exposed by Equinox. @@ -226,7 +300,7 @@ = There are two ways to connect to an application with re= mote management enabled: = - The first step is the same for both - to connect to a M= Bean Server, click on the + The first step is the same for both - to connect to a M= Bean Server, click the New Connection icon = = --===============1972184001625387504==-- From jbosstools-commits at lists.jboss.org Mon May 3 16:37:04 2010 Content-Type: multipart/mixed; boundary="===============8287909448214130438==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21868 - trunk/jmx/docs/reference/en-US. Date: Mon, 03 May 2010 16:37:04 -0400 Message-ID: <201005032037.o43Kb4bA023030@svn01.web.mwc.hst.phx2.redhat.com> --===============8287909448214130438== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-03 16:37:03 -0400 (Mon, 03 May 2010) New Revision: 21868 Modified: trunk/jmx/docs/reference/en-US/introduction.xml Log: added some general info about jmx technology Modified: trunk/jmx/docs/reference/en-US/introduction.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/docs/reference/en-US/introduction.xml 2010-05-03 20:36:35 UTC= (rev 21867) +++ trunk/jmx/docs/reference/en-US/introduction.xml 2010-05-03 20:37:03 UTC= (rev 21868) @@ -6,9 +6,38 @@ JBoss Tools' JMX project is a fork of eclipse-jmx, a p= roject by Jeff Mesnil. It was forked with permission. + = +
+ What is JMX? + +The Java Management Extensions (JMX) technology is a standard part of the = Java Platform, Standard Edition (Java SE platform). The JMX technology was = added to the platform in the Java 2 Platform, Standard Edition (J2SE) 5.0 r= elease. + + +The JMX technology provides a simple, standard way of managing resources s= uch as applications, devices, and services. Because the JMX technology is d= ynamic, you can use it to monitor and manage resources as they are created,= installed and implemented. You can also use the JMX technology to monitor = and manage the Java Virtual Machine (Java VM). + + +The JMX specification defines the architecture, design patterns, APIs, and= services in the Java programming language for management and monitoring of= applications and networks. + + +Using the JMX technology, a given resource is instrumented by one or more = Java objects known as Managed Beans, or MBeans. These MBeans are registered= in a core-managed object server, known as an MBean server. The MBean serve= r acts as a management agent and can run on most devices that have been ena= bled for the Java programming language. = + + + +The specifications define JMX agents that you use to manage any resources = that have been correctly configured for management. A JMX agent consists of= an MBean server, in which MBeans are registered, and a set of services for= handling the MBeans. In this way, JMX agents directly control resources an= d make them available to remote management applications. + + +The way in which resources are instrumented is completely independent from= the management infrastructure. Resources can therefore be rendered managea= ble regardless of how their management applications are implemented. + + +The JMX technology defines standard connectors (known as JMX connectors) t= hat enable you to access JMX agents from remote management applications. JM= X connectors using different protocols provide the same management interfac= e. Consequently, a management application can manage resources transparentl= y, regardless of the communication protocol used. JMX agents can also be us= ed by systems or applications that are not compliant with the JMX specifica= tion, as long as those systems or applications support JMX agents. = + +Read more about JMX. +
+ =
What is JMX Tools? - JMX Tools allows to setup multiple JMX conne= ctions and provides view + JBoss JMX Tools allow to setup multiple JMX = connections and provide view for exploring the JMX tree and execute operations directly from Eclips= e. = This chapter covers the basics of working with JMX plugi= n, which is --===============8287909448214130438==-- From jbosstools-commits at lists.jboss.org Mon May 3 16:37:24 2010 Content-Type: multipart/mixed; boundary="===============7223011958821460698==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21869 - trunk/jmx/docs/reference/en-US. Date: Mon, 03 May 2010 16:37:23 -0400 Message-ID: <201005032037.o43KbNfH023044@svn01.web.mwc.hst.phx2.redhat.com> --===============7223011958821460698== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-03 16:37:23 -0400 (Mon, 03 May 2010) New Revision: 21869 Modified: trunk/jmx/docs/reference/en-US/connection.xml Log: updated Modified: trunk/jmx/docs/reference/en-US/connection.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/docs/reference/en-US/connection.xml 2010-05-03 20:37:03 UTC (= rev 21868) +++ trunk/jmx/docs/reference/en-US/connection.xml 2010-05-03 20:37:23 UTC (= rev 21869) @@ -6,7 +6,7 @@ = The MBean Explorer supports several differe= nt types of connections. = The tooling itself comes only with a default connection type, ho= wever other - adopters can provide additional connection types that may requir= e additional + adapters can provide additional connection types that may requir= e additional or non-spec behavior. Connections can be in either the connected= state or the disconnected state. Some connection types (such as the defau= lt connection type) allow you to control the current state. Other connection types m= ay not. @@ -15,15 +15,19 @@ The default connection type, for example, can be created and del= eted by you at will. The AS Tools connection type, which represents a JBoss = server, does not allow you this level of control. A JBoss JMX connection is creat= ed when a JBoss server is created - in the server's view, and deleted when said server is deleted. T= he JMX connection for = + in the server's view, and deleted when the server is deleted. Th= e JMX connection for = this server is in the connected state only when the server is st= arted. = =
The Default Connection = There are two ways to connect to an application with remote = management enabled: + + Simple + Advanced + = - The first step is the same for both - to connect to a MBean = Server, click on the + The first step is the same for both to connect to a MBean Se= rver, click on the New Connection icon = = --===============7223011958821460698==-- From jbosstools-commits at lists.jboss.org Mon May 3 17:45:43 2010 Content-Type: multipart/mixed; boundary="===============5495259223298431262==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21870 - trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath. Date: Mon, 03 May 2010 17:45:43 -0400 Message-ID: <201005032145.o43LjhS5004771@svn01.web.mwc.hst.phx2.redhat.com> --===============5495259223298431262== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bbrodt Date: 2010-05-03 17:45:42 -0400 (Mon, 03 May 2010) New Revision: 21870 Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/valid= ator/xpath/JoinCondition.java trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/valid= ator/xpath/XPathValidator.java Log: https://jira.jboss.org/jira/browse/JBIDE-6000 duplicated error message checking returned too soon. It should only check i= f we're sure that there really IS a problem. Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpe= l/validator/xpath/JoinCondition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/vali= dator/xpath/JoinCondition.java 2010-05-03 20:37:23 UTC (rev 21869) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/vali= dator/xpath/JoinCondition.java 2010-05-03 21:45:42 UTC (rev 21870) @@ -91,12 +91,17 @@ final String name =3D expr.getVariableName(); IProblem problem; = - if (duplicateThing( "duplicate.joinCondition.link.check.", name)) { - return ; - } + // https://jira.jboss.org/jira/browse/JBIDE-6000 + // this returns too soon - only check duplicateThing if we're sure that = there really IS a problem +// if (duplicateThing( "duplicate.joinCondition.link.check.", name)) { +// return ; +// } = if ( isEmpty ( prefix ) =3D=3D false ) { = + if (duplicateThing( "duplicate.joinCondition.link.check.", name)) { + return ; + } problem =3D createError(); problem.fill("XPATH_PREFIX_NOT_ALLOWED", = toString(mNode.nodeName()), @@ -116,6 +121,9 @@ ); = if (isUndefined(target)) { = + if (duplicateThing( "duplicate.joinCondition.link.check.", name)) { + return ; + } problem =3D createError(); problem.fill("XPATH_LINK_UNDEF", name , expr.getText() ); = repointOffsets(problem, expr); Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpe= l/validator/xpath/XPathValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/vali= dator/xpath/XPathValidator.java 2010-05-03 20:37:23 UTC (rev 21869) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/vali= dator/xpath/XPathValidator.java 2010-05-03 21:45:42 UTC (rev 21870) @@ -747,13 +747,19 @@ String name =3D expr.getVariableName(); IProblem problem; = + // https://jira.jboss.org/jira/browse/JBIDE-6000 + // this returns too soon - only check duplicateThing if we're sure that = there really IS a problem // check to make sure we don't print the same message twice. - if (duplicateThing("duplicate.variable.check.", name)) { - return; - } +// if (duplicateThing("duplicate.variable.check.", name)) { +// return; +// } = if (isEmpty(prefix) =3D=3D false) { = + // check to make sure we don't print the same message twice. + if (duplicateThing("duplicate.variable.check.", name)) { + return; + } problem =3D createError(); problem.fill("XPATH_INVALID_VARREF_PREFIX", //$NON-NLS-1$ prefix + ":" + name); //$NON-NLS-1$ @@ -774,6 +780,10 @@ = if (isUndefined(variable)) { = + // check to make sure we don't print the same message twice. + if (duplicateThing("duplicate.variable.check.", name)) { + return; + } problem =3D createError(); problem.fill("XPATH_UNDEF_VARIABLE", //$NON-NLS-1$ varName, expr.getText()); @@ -808,6 +818,10 @@ if (partName !=3D null) { = if (WSDL_ND_MESSAGE.equals(varTypeNode.nodeName()) =3D=3D false) { + // check to make sure we don't print the same message twice. + if (duplicateThing("duplicate.variable.check.", name)) { + return; + } problem =3D createError(); problem.fill("XPATH_VARIABLE_PART", varName, partName, expr .getText(), 0); @@ -815,6 +829,10 @@ = } else if (isUndefined(variablePart)) { = + // check to make sure we don't print the same message twice. + if (duplicateThing("duplicate.variable.check.", name)) { + return; + } problem =3D createError(); problem.fill("XPATH_UNDEF_VARIABLE_PART", //$NON-NLS-1$ varName, partName, expr.getText()); @@ -829,6 +847,10 @@ // there is no part name specified, but variable does have more then // 1 part. if (WSDL_ND_MESSAGE.equals(varTypeNode.nodeName())) { + // check to make sure we don't print the same message twice. + if (duplicateThing("duplicate.variable.check.", name)) { + return; + } problem =3D createError(); problem.fill("XPATH_VARIABLE_PART", varName, "text.term.unspecified", expr.getText(), 1); --===============5495259223298431262==-- From jbosstools-commits at lists.jboss.org Mon May 3 17:50:50 2010 Content-Type: multipart/mixed; boundary="===============2265581063432167424==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21871 - branches/modular_build/build. Date: Mon, 03 May 2010 17:50:49 -0400 Message-ID: <201005032150.o43LonOU005327@svn01.web.mwc.hst.phx2.redhat.com> --===============2265581063432167424== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 17:50:49 -0400 (Mon, 03 May 2010) New Revision: 21871 Modified: branches/modular_build/build/build.xml Log: fix code to get feature.id from feature path when generating site.xml; add = tests Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-03 21:45:42 UTC (rev 218= 70) +++ branches/modular_build/build/build.xml 2010-05-03 21:50:49 UTC (rev 218= 71) @@ -656,10 +656,10 @@ = - + @@ -667,6 +667,7 @@ + @@ -682,10 +683,7 @@ - + = @@ -733,7 +731,7 @@ = - = + @@ -757,27 +755,9 @@ - - - + + + <featu= re url=3D"features/${feature.id}_0.0.0.jar" id=3D"${feature.id}" version=3D= "0.0.0"> <category name=3D"${category.name}"/> </feature> @@ -791,6 +771,84 @@ = + + + + + + + + + + + + + + + + + + + + + + + + + + + Test @{featureJar} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = --===============2265581063432167424==-- From jbosstools-commits at lists.jboss.org Mon May 3 18:02:28 2010 Content-Type: multipart/mixed; boundary="===============7374852504763538750==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21872 - branches/modular_build/build. Date: Mon, 03 May 2010 18:02:28 -0400 Message-ID: <201005032202.o43M2SHX007173@svn01.web.mwc.hst.phx2.redhat.com> --===============7374852504763538750== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 18:02:28 -0400 (Mon, 03 May 2010) New Revision: 21872 Modified: branches/modular_build/build/build.xml Log: fix expected paths Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-03 21:50:49 UTC (rev 218= 71) +++ branches/modular_build/build/build.xml 2010-05-03 22:02:28 UTC (rev 218= 72) @@ -1126,7 +1126,7 @@ - + @@ -1144,9 +1144,9 @@ - - + @@ -1154,9 +1154,9 @@ - + - + @@ -1185,9 +1185,9 @@ - - + @@ -1195,9 +1195,9 @@ - + - + @@ -1223,9 +1223,9 @@ - - + @@ -1233,9 +1233,9 @@ - + - + --===============7374852504763538750==-- From jbosstools-commits at lists.jboss.org Mon May 3 18:20:05 2010 Content-Type: multipart/mixed; boundary="===============2934697110939363576==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21873 - branches/modular_build. Date: Mon, 03 May 2010 18:20:05 -0400 Message-ID: <201005032220.o43MK5qk014611@svn01.web.mwc.hst.phx2.redhat.com> --===============2934697110939363576== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 18:20:04 -0400 (Mon, 03 May 2010) New Revision: 21873 Modified: branches/modular_build/parent-pom.xml Log: reconfigure the suffix used in plugin qualifiers Modified: branches/modular_build/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/parent-pom.xml 2010-05-03 22:02:28 UTC (rev 2187= 2) +++ branches/modular_build/parent-pom.xml 2010-05-03 22:20:04 UTC (rev 2187= 3) @@ -16,6 +16,15 @@ + org.codehaus.tycho + maven-osgi-packaging-plugin + ${tycho-version} + + 'v'yyyyMMdd-HHmm + + + + org.sonatype.tycho tycho-maven-plugin ${tychoVersion} --===============2934697110939363576==-- From jbosstools-commits at lists.jboss.org Mon May 3 18:20:27 2010 Content-Type: multipart/mixed; boundary="===============1662596634900613664==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21874 - branches/modular_build. Date: Mon, 03 May 2010 18:20:27 -0400 Message-ID: <201005032220.o43MKRFx014923@svn01.web.mwc.hst.phx2.redhat.com> --===============1662596634900613664== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 18:20:26 -0400 (Mon, 03 May 2010) New Revision: 21874 Modified: branches/modular_build/parent-pom.xml Log: reconfigure the suffix used in plugin qualifiers Modified: branches/modular_build/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/parent-pom.xml 2010-05-03 22:20:04 UTC (rev 2187= 3) +++ branches/modular_build/parent-pom.xml 2010-05-03 22:20:26 UTC (rev 2187= 4) @@ -18,7 +18,7 @@ org.codehaus.tycho maven-osgi-packaging-plugin - ${tycho-version} + ${tychoVersion} 'v'yyyyMMdd-HHmm @@ -379,6 +379,15 @@ + + + jbosstools.internal.repo.snapshot + JBoss Tools Internal Snapshot Repository + sftp://filemgmt.jboss.org/downloads_htdocs/tools/repository/SNAPSH= OT/ + + false + + --===============1662596634900613664==-- From jbosstools-commits at lists.jboss.org Mon May 3 18:20:44 2010 Content-Type: multipart/mixed; boundary="===============6737141321003954922==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21875 - branches/modular_build. Date: Mon, 03 May 2010 18:20:44 -0400 Message-ID: <201005032220.o43MKivq014965@svn01.web.mwc.hst.phx2.redhat.com> --===============6737141321003954922== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 18:20:44 -0400 (Mon, 03 May 2010) New Revision: 21875 Modified: branches/modular_build/parent-pom.xml Log: reconfigure the suffix used in plugin qualifiers Modified: branches/modular_build/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/parent-pom.xml 2010-05-03 22:20:26 UTC (rev 2187= 4) +++ branches/modular_build/parent-pom.xml 2010-05-03 22:20:44 UTC (rev 2187= 5) @@ -379,15 +379,6 @@ - - - jbosstools.internal.repo.snapshot - JBoss Tools Internal Snapshot Repository - sftp://filemgmt.jboss.org/downloads_htdocs/tools/repository/SNAPSH= OT/ - - false - - --===============6737141321003954922==-- From jbosstools-commits at lists.jboss.org Mon May 3 21:59:49 2010 Content-Type: multipart/mixed; boundary="===============4949730153736055649==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21876 - branches/modular_build/build. Date: Mon, 03 May 2010 21:59:49 -0400 Message-ID: <201005040159.o441xnIS026764@svn01.web.mwc.hst.phx2.redhat.com> --===============4949730153736055649== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 21:59:49 -0400 (Mon, 03 May 2010) New Revision: 21876 Modified: branches/modular_build/build/build.xml Log: archive the whole overall update site, not just the site zip; this way publ= ishing is a single scp/rsync = Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-03 22:20:44 UTC (rev 218= 75) +++ branches/modular_build/build/build.xml 2010-05-04 01:59:49 UTC (rev 218= 76) @@ -638,6 +638,20 @@ + + + + + + + + + + + + + + = @@ -900,6 +914,7 @@ + = --===============4949730153736055649==-- From jbosstools-commits at lists.jboss.org Mon May 3 22:03:09 2010 Content-Type: multipart/mixed; boundary="===============6035535205851305103==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21877 - branches/modular_build/build. Date: Mon, 03 May 2010 22:03:09 -0400 Message-ID: <201005040203.o44239Mk000802@svn01.web.mwc.hst.phx2.redhat.com> --===============6035535205851305103== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 22:03:09 -0400 (Mon, 03 May 2010) New Revision: 21877 Modified: branches/modular_build/build/build.xml Log: document simpler -Dnotests=3Dtrue flag for running ant wrapper for maven Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-04 01:59:49 UTC (rev 218= 76) +++ branches/modular_build/build/build.xml 2010-05-04 02:03:09 UTC (rev 218= 77) @@ -48,6 +48,8 @@ or, to build everything but not *run* the tests: cd /home/nboldt/workspace36/jbosstools-modular_build; \ ant -DMAVEN_FLAGS=3D"clean install -Dmaven.test.skip" + or + ant -Dnotests=3Dtrue = or, to build specific module(s): = cd /home/nboldt/workspace36/jbosstools-modular_build; \ --===============6035535205851305103==-- From jbosstools-commits at lists.jboss.org Mon May 3 22:04:43 2010 Content-Type: multipart/mixed; boundary="===============1229326189685894616==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21878 - branches/modular_build/build. Date: Mon, 03 May 2010 22:04:43 -0400 Message-ID: <201005040204.o4424h2T000820@svn01.web.mwc.hst.phx2.redhat.com> --===============1229326189685894616== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 22:04:43 -0400 (Mon, 03 May 2010) New Revision: 21878 Modified: branches/modular_build/build/build.xml Log: more help doc Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-04 02:03:09 UTC (rev 218= 77) +++ branches/modular_build/build/build.xml 2010-05-04 02:04:43 UTC (rev 218= 78) @@ -59,6 +59,10 @@ cd /home/nboldt/workspace36/jbosstools-modular_build; \ ant -DCOMPONENTS=3Dtests,common -Dbuild.if.sources.unchanged=3Dtrue = +or, to fetch fresh sources, then build anew: + cd /home/nboldt/workspace36/jbosstools-modular_build; \ + ant -DCOMPONENTS=3Dtests,common,flow,jbpm -Dclean.sources=3Dtrue + or, to (re-)run tests w/o (re-)building first: cd /home/nboldt/workspace36/jbosstools-modular_build; \ ant -DCOMPONENTS=3Dtests,common,jmx -DMAVEN_FLAGS=3D"osgi-test:test -B= -fn" --===============1229326189685894616==-- From jbosstools-commits at lists.jboss.org Mon May 3 22:13:39 2010 Content-Type: multipart/mixed; boundary="===============3237176478085678273==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21879 - branches/modular_build/build. Date: Mon, 03 May 2010 22:13:38 -0400 Message-ID: <201005040213.o442DcVP001843@svn01.web.mwc.hst.phx2.redhat.com> --===============3237176478085678273== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 22:13:38 -0400 (Mon, 03 May 2010) New Revision: 21879 Modified: branches/modular_build/build/build.xml Log: more doc Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-04 02:04:43 UTC (rev 218= 78) +++ branches/modular_build/build/build.xml 2010-05-04 02:13:38 UTC (rev 218= 79) @@ -42,7 +42,7 @@ To run this script in Eclipse: Run As > Ant Build = -To run this script via commandline (build default modules + run tests): +To run this script via commandline (build default modules + run tests, the= n collect test results and build per-component + overall update site zips): cd /home/nboldt/workspace36/jbosstools-modular_build; ant = or, to build everything but not *run* the tests: --===============3237176478085678273==-- From jbosstools-commits at lists.jboss.org Mon May 3 22:20:38 2010 Content-Type: multipart/mixed; boundary="===============7625982017977806262==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21880 - branches/modular_build/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF. Date: Mon, 03 May 2010 22:20:38 -0400 Message-ID: <201005040220.o442KcH7002821@svn01.web.mwc.hst.phx2.redhat.com> --===============7625982017977806262== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-03 22:20:37 -0400 (Mon, 03 May 2010) New Revision: 21880 Modified: branches/modular_build/as/plugins/org.jboss.ide.eclipse.archives.webtool= s/META-INF/MANIFEST.MF Log: add org.eclipse.wst.common.emfworkbench.integration Modified: branches/modular_build/as/plugins/org.jboss.ide.eclipse.archives.= webtools/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/as/plugins/org.jboss.ide.eclipse.archives.webtoo= ls/META-INF/MANIFEST.MF 2010-05-04 02:13:38 UTC (rev 21879) +++ branches/modular_build/as/plugins/org.jboss.ide.eclipse.archives.webtoo= ls/META-INF/MANIFEST.MF 2010-05-04 02:20:37 UTC (rev 21880) @@ -6,6 +6,7 @@ Bundle-Activator: org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, + org.eclipse.wst.common.emfworkbench.integration, org.jboss.ide.eclipse.archives.core;bundle-version=3D"2.0.0", org.jboss.ide.eclipse.archives.ui;bundle-version=3D"1.0.0", org.eclipse.wst.server.core;bundle-version=3D"1.1.0", --===============7625982017977806262==-- From jbosstools-commits at lists.jboss.org Mon May 3 23:34:30 2010 Content-Type: multipart/mixed; boundary="===============1696322599157266578==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21881 - trunk/documentation/guides/JBDS_Release_Notes/en-US. Date: Mon, 03 May 2010 23:34:30 -0400 Message-ID: <201005040334.o443YUuo017687@svn01.web.mwc.hst.phx2.redhat.com> --===============1696322599157266578== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: irooskov(a)redhat.com Date: 2010-05-03 23:34:29 -0400 (Mon, 03 May 2010) New Revision: 21881 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml Log: updated with added fixed issues Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-04 02:20:37 UTC (rev 21880) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-04 03:34:29 UTC (rev 21881) @@ -52,6 +52,12 @@ JBIDE-60= 75: In the Hibernate reverse engineering editor it was impossible t= o add a parameter as the button to do so was missing. This update corrects = the user interface to include the Add parameter butt= on under the Id Generator details Class section. + + @@ -85,7 +91,7 @@ - + JBDS- @@ -157,6 +163,16 @@ + JBDS-1187= : An empty URL tag (<url>) caused the Classic Up= date option under PreferencesGeneralCapabilities to error upon installation of a plug-in. To fix this iss= ue the unused URL element has been removed. The Classic Update= option is now usable and installs plug-ins correctly. + + + + + JBDS-1168= : The JBoss Developer Studio Installer was missleading in terms of = system requirements. The consequence of this was that some users were unsur= e if the JBoss Developer Studio supported Java 6 even though it was require= d for the JBoss Enterprise Application Platform 5 and which JDK distributio= ns were supported. The text in Step 4 of installation has been updated to i= nform the user that the JBoss Developer Studio works with both Java 5 and 6= (though Java 6 is required for JBoss Enterprise Application Platform 5), h= as been tested with the OpenJDK, SunJDK and IBM JDK distributions and the m= isspelt gij Java has been corrected to gcj J= ava. + + + + JBDS-1155= : A regression existed in the Eclipse 3.5.2 Web Tools Platform (WTP= ) 3.1.2. The bug would break EAR deployments that used classpath variables = by deploying dependent artifacts to <root_ear>/lib/lib/lib<= /filename> instead of <root_ear>/lib. The issue = has been corrected with these updated packages so that the regression no lo= nger exists and EAR deployments function correctly. --===============1696322599157266578==-- From jbosstools-commits at lists.jboss.org Tue May 4 02:08:16 2010 Content-Type: multipart/mixed; boundary="===============6769392486053102350==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21882 - trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf. Date: Tue, 04 May 2010 02:08:16 -0400 Message-ID: <201005040608.o4468GRS021694@svn01.web.mwc.hst.phx2.redhat.com> --===============6769392486053102350== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-04 02:08:15 -0400 (Tue, 04 May 2010) New Revision: 21882 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/vcf/AbstractFilesetVirtualComponent.java Log: small empty method addition for 3.2 compilation Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/= ide/eclipse/as/wtp/core/vcf/AbstractFilesetVirtualComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/AbstractFilesetVirtualComponent.java 2010-05-04 03:34= :29 UTC (rev 21881) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/vcf/AbstractFilesetVirtualComponent.java 2010-05-04 06:08= :15 UTC (rev 21882) @@ -10,6 +10,7 @@ *************************************************************************= *****/ = package org.jboss.ide.eclipse.as.wtp.core.vcf; = +import java.util.Map; import java.util.Properties; = import org.eclipse.core.resources.IContainer; @@ -98,6 +99,11 @@ return null; } = + public IVirtualReference[] getReferences(Map options) { + // ignore + return null; + } + public IVirtualReference[] getReferences() { // Ignore; no children return new IVirtualReference[] {}; --===============6769392486053102350==-- From jbosstools-commits at lists.jboss.org Tue May 4 03:27:54 2010 Content-Type: multipart/mixed; boundary="===============8352592629800944925==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21883 - trunk/jst/tests/org.jboss.tools.jst.web.ui.test. Date: Tue, 04 May 2010 03:27:54 -0400 Message-ID: <201005040727.o447RsvJ004016@svn01.web.mwc.hst.phx2.redhat.com> --===============8352592629800944925== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-04 03:27:54 -0400 (Tue, 04 May 2010) New Revision: 21883 Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/build.properties Log: https://jira.jboss.org/jira/browse/JBIDE-6190 Added test project to build.= properties Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/build.properties 2010-0= 5-04 06:08:15 UTC (rev 21882) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/build.properties 2010-0= 5-04 07:27:54 UTC (rev 21883) @@ -1,5 +1,6 @@ output.. =3D bin/ bin.includes =3D META-INF/,\ jst-web-ui.jar,\ - plugin.properties + plugin.properties,\ + projects/ source.jst-web-ui.jar =3D src/ --===============8352592629800944925==-- From jbosstools-commits at lists.jboss.org Tue May 4 07:17:32 2010 Content-Type: multipart/mixed; boundary="===============9143897677859527384==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21884 - trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/parts. Date: Tue, 04 May 2010 07:17:32 -0400 Message-ID: <201005041117.o44BHW3W024784@svn01.web.mwc.hst.phx2.redhat.com> --===============9143897677859527384== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: lzoubek(a)redhat.com Date: 2010-05-04 07:17:31 -0400 (Tue, 04 May 2010) New Revision: 21884 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/parts/SWTBotBrowserExt.java Log: SWTBot ext : added executeScript method to browser component Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/parts/SWTBotBrowserExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/parts/SWTBotBrowserExt.java 2010-05-04 07:27:54 UTC (rev 21883) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/parts/SWTBotBrowserExt.java 2010-05-04 11:17:31 UTC (rev 21884) @@ -10,6 +10,7 @@ import org.eclipse.swt.browser.ProgressListener; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; +import org.eclipse.swtbot.swt.finder.results.Result; import org.eclipse.swtbot.swt.finder.results.VoidResult; import org.eclipse.swtbot.swt.finder.widgets.AbstractSWTBotControl; import org.hamcrest.SelfDescribing; @@ -123,6 +124,30 @@ } }); } + /** + * executes script in browser + * @param javaScript + * @return true if script was successfully executed + */ + public boolean executeScript(final String javaScript) { + return UIThreadRunnable.syncExec(new Result() { + public Boolean run() { + return widget.execute(javaScript); + } + }); + + } + /** + * executes script in browser asynchronously + * @param javaScript + */ + public void executeScriptAsync(final String javaScript) { + UIThreadRunnable.asyncExec(new VoidResult(){ + + public void run() { + widget.execute(javaScript); + }}); + } public void forward() { UIThreadRunnable.syncExec(new VoidResult() { public void run() { --===============9143897677859527384==-- From jbosstools-commits at lists.jboss.org Tue May 4 07:26:48 2010 Content-Type: multipart/mixed; boundary="===============1006282089394343478==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21885 - branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/META-INF. Date: Tue, 04 May 2010 07:26:48 -0400 Message-ID: <201005041126.o44BQmXr025744@svn01.web.mwc.hst.phx2.redhat.com> --===============1006282089394343478== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-04 07:26:47 -0400 (Tue, 04 May 2010) New Revision: 21885 Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/META-INF/MANIFEST.MF Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - fix manifest.mf Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/META-INF/MANIFEST.MF 2010-05-04 11:17:31 UTC (rev 21884) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/META-INF/MANIFEST.MF 2010-05-04 11:26:47 UTC (rev 21885) @@ -49,6 +49,7 @@ Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Export-Package: org.hibernate.mediator, + org.hibernate.mediator.base, org.hibernate.mediator.execution, org.hibernate.mediator.logging, org.hibernate.mediator.preferences, --===============1006282089394343478==-- From jbosstools-commits at lists.jboss.org Tue May 4 09:32:04 2010 Content-Type: multipart/mixed; boundary="===============2332859894271133840==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21886 - trunk/esb/docs/esb_ref_guide/en-US. Date: Tue, 04 May 2010 09:32:04 -0400 Message-ID: <201005041332.o44DW4cd020341@svn01.web.mwc.hst.phx2.redhat.com> --===============2332859894271133840== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-04 09:32:03 -0400 (Tue, 04 May 2010) New Revision: 21886 Modified: trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml Log: TOOLSDOC-66-Broken "IntsallingJBossTools" in esb tools ref guide - fixed Modified: trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml 2010-05-04 11:26:47 = UTC (rev 21885) +++ trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml 2010-05-04 13:32:03 = UTC (rev 21886) @@ -25,7 +25,7 @@ ESB Tools come as one module of JBoss Tools project.= Since ESB Tools have a dependence on other JBoss Tools modules we recomme= nd you to install a bundle of all JBoss - Tools plug-ins. You can find all = necessary installation instructions on JBoss Wiki in the . You can find all = necessary installation instructions on JBoss Wiki in the InstallingJBossTools section.
= --===============2332859894271133840==-- From jbosstools-commits at lists.jboss.org Tue May 4 09:35:08 2010 Content-Type: multipart/mixed; boundary="===============5186637171854965286==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21887 - trunk/jsf/docs/jsf_tools_tutorial/en-US/images/jsf_application. Date: Tue, 04 May 2010 09:35:07 -0400 Message-ID: <201005041335.o44DZ7vu020700@svn01.web.mwc.hst.phx2.redhat.com> --===============5186637171854965286== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-04 09:35:07 -0400 (Tue, 04 May 2010) New Revision: 21887 Modified: trunk/jsf/docs/jsf_tools_tutorial/en-US/images/jsf_application/jsf_appli= cation_5.png Log: TOOLSDOC-69-figure 4.1 should show added property - figure is updated = Modified: trunk/jsf/docs/jsf_tools_tutorial/en-US/images/jsf_application/js= f_application_5.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============5186637171854965286==-- From jbosstools-commits at lists.jboss.org Tue May 4 10:12:35 2010 Content-Type: multipart/mixed; boundary="===============2456829130512062772==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21888 - trunk/documentation/guides/JBDS_Release_Notes/en-US. Date: Tue, 04 May 2010 10:12:35 -0400 Message-ID: <201005041412.o44ECZW3031012@svn01.web.mwc.hst.phx2.redhat.com> --===============2456829130512062772== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: irooskov(a)redhat.com Date: 2010-05-04 10:12:34 -0400 (Tue, 04 May 2010) New Revision: 21888 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml Log: updated with added JIRA Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-04 13:35:07 UTC (rev 21887) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-04 14:12:34 UTC (rev 21888) @@ -52,12 +52,11 @@ JBIDE-60= 75: In the Hibernate reverse engineering editor it was impossible t= o add a parameter as the button to do so was missing. This update corrects = the user interface to include the Add parameter butt= on under the Id Generator details Class section. - - + --===============2456829130512062772==-- From jbosstools-commits at lists.jboss.org Tue May 4 10:47:37 2010 Content-Type: multipart/mixed; boundary="===============8601834143841919445==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21889 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 3 other directories. Date: Tue, 04 May 2010 10:47:37 -0400 Message-ID: <201005041447.o44ElbHq002417@svn01.web.mwc.hst.phx2.redhat.com> --===============8601834143841919445== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-04 10:47:34 -0400 (Tue, 04 May 2010) New Revision: 21889 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= IBeanManager.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= IProducer.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/CDIProject.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/ProducerField.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/ProducerMethod.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= s: 1. There is no producer method declared by the (same) bean class that is as= signable to the disposed parameter of a disposer method. 2. There are multiple disposer methods for a single producer method Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/IBeanManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IBeanManager.java 2010-05-04 14:12:34 UTC (rev 21888) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IBeanManager.java 2010-05-04 14:47:34 UTC (rev 21889) @@ -232,6 +232,16 @@ Set resolve(Set beans); = /** + * Return the disposer methods which are bound to the producer method. + * = + * @param producer + * a producer method + * = + * @return bound disposer methods + */ + Set resolveDisposers(IProducerMethod producer); + + /** * Tests the given annotation type to determine if it is a scope type. * = * @param annotationType Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/IProducer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IProducer.java 2010-05-04 14:12:34 UTC (rev 21888) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IProducer.java 2010-05-04 14:47:34 UTC (rev 21889) @@ -17,4 +17,11 @@ */ public interface IProducer extends IBean, IBeanMember { = + /** + * Returns the @Produces annotation of this producer. + * = + * @return the @Produces annotation of this producer + */ + IAnnotationDeclaration getProducesAnnotation(); + } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/CDIProject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/CDIProject.java 2010-05-04 14:12:34 UTC (rev 21888) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/CDIProject.java 2010-05-04 14:47:34 UTC (rev 21889) @@ -35,12 +35,14 @@ import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IBeanMember; +import org.jboss.tools.cdi.core.IBeanMethod; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IObserverMethod; import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IProducer; +import org.jboss.tools.cdi.core.IProducerMethod; import org.jboss.tools.cdi.core.IQualifierDeclaration; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinit= ion; @@ -558,6 +560,11 @@ return new HashSet(); } = + public Set resolveDisposers(IProducerMethod producer) { + // TODO = + return new HashSet(); + } + public CDIProject getCDIProject() { return this; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/ProducerField.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ProducerField.java 2010-05-04 14:12:34 UTC (rev 21888) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ProducerField.java 2010-05-04 14:47:34 UTC (rev 21889) @@ -171,4 +171,8 @@ } return getCDIProject().getScope(CDIConstants.DEPENDENT_ANNOTATION_TYPE_N= AME); } + + public IAnnotationDeclaration getProducesAnnotation() { + return getDefinition().getProducesAnnotation(); + } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/ProducerMethod.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ProducerMethod.java 2010-05-04 14:12:34 UTC (rev 21888) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ProducerMethod.java 2010-05-04 14:47:34 UTC (rev 21889) @@ -211,4 +211,7 @@ return getCDIProject().getScope(CDIConstants.DEPENDENT_ANNOTATION_TYPE_N= AME); } = -} + public IAnnotationDeclaration getProducesAnnotation() { + return produces; + } +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-04 14:12:34 UTC (rev 218= 88) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-04 14:47:34 UTC (rev 218= 89) @@ -310,6 +310,32 @@ = private void validateDisposers(IClassBean bean) { Set disposers =3D bean.getDisposers(); + if(disposers.isEmpty()) { + return; + } + + Set boundDisposers =3D new HashSet(); + Set producers =3D bean.getProducers(); + for (IProducer producer : producers) { + if(producer instanceof IProducerMethod) { + IProducerMethod producerMethod =3D (IProducerMethod)producer; + Set disposerMethods =3D producer.getCDIProject().resolve= Disposers(producerMethod); + boundDisposers.addAll(disposerMethods); + if(disposerMethods.size()>1) { + /* + * 3.3.7. Disposer method resolution + * - there are multiple disposer methods for a single producer method + */ + for (IBeanMethod disposerMethod : disposerMethods) { + Set disposerDeclarations =3D getAnnotationPoss= itions(disposerMethod, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); + for (ITextSourceReference declaration : disposerDeclarations) { + addError(CDIValidationMessages.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDI= Preferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, declaration, bean.getResource(= )); + } + } + } + } + } + for (IBeanMethod disposer : disposers) { List params =3D disposer.getParameters(); = @@ -399,9 +425,34 @@ addError(CDIValidationMessages.DISPOSER_IN_INTERCEPTOR, CDIPreference= s.DISPOSER_IN_INTERCEPTOR_OR_DECORATOR, declaration, bean.getResource()); } } + + /* + * 3.3.7. Disposer method resolution + * - there is no producer method declared by the (same) bean class tha= t is assignable to the disposed parameter of a disposer method + */ + for (IBeanMethod disposerMethod : disposers) { + if(!boundDisposers.contains(disposerMethod)) { + for (ITextSourceReference declaration : disposerDeclarations) { + // TODO uncomment it when https://jira.jboss.org/jira/browse/JBIDE-6= 252 is resolved = +// addError(CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOSER, CDIP= references.NO_PRODUCER_MATCHING_DISPOSER, declaration, bean.getResource()); + } + } + } } } = + private Set getAnnotationPossitions(IBeanMethod met= hod, String annotationTypeName) { + List params =3D method.getParameters(); + Set declarations =3D new HashSet(); + for (IParameter param : params) { + ITextSourceReference declaration =3D param.getAnnotationPosition(annota= tionTypeName); + if(declaration!=3Dnull) { + declarations.add(declaration); + } + } + return declarations; + } + /** * If the method is not a static method and is not a business method of t= he session bean and is observer or disposer then mark it as incorrect. * = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-04 14:12:34 UTC (rev 21888) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-04 14:47:34 UTC (rev 21889) @@ -84,8 +84,8 @@ {CDIPreferences.MULTIPLE_DISPOSING_PARAMETERS, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_multipleDisposingParameters_label}, {CDIPreferences.DISPOSER_ANNOTATED_INJECT, CDIPreferencesMessages.CDIVa= lidatorConfigurationBlock_pb_disposerAnnotatedInject_label}, {CDIPreferences.ILLEGAL_DISPOSER_IN_SESSION_BEAN, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalDisposerInSessionBean_label}, -// {CDIPreferences.NO_PRODUCER_MATCHING_DISPOSER, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_noProducerMatchingDisposer_label}, -// {CDIPreferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_multipleDisposersForProducer_label}, + {CDIPreferences.NO_PRODUCER_MATCHING_DISPOSER, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_noProducerMatchingDisposer_label}, + {CDIPreferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_multipleDisposersForProducer_label}, // {CDIPreferences.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN, CDIPreference= sMessages.CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBe= an_label}, // {CDIPreferences.MULTIPLE_INJECTION_CONSTRUCTORS, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label}, // {CDIPreferences.CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED, CDIPrefere= ncesMessages.CDIValidatorConfigurationBlock_pb_constructorParameterIllegall= yAnnotated_label}, Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-04 14:12:34 UTC (rev 21888) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-04 14:47:34 UTC (rev 21889) @@ -240,15 +240,27 @@ = /** * 3.3.7. Disposer method resolution - * TODO + * - there is no producer method declared by the (same) bean class that = is assignable to the disposed parameter of a disposer method * = * @throws Exception */ public void testUnresolvedDisposalMethod() throws Exception { - //TODO + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/disposal/method/definition/broken/unresolvedMethod/SpiderPr= oducer_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOSER,= 35); } - = + /** + * 3.3.7. Disposer method resolution + * - there are multiple disposer methods for a single producer method + * = + * @throws Exception + */ + public void testMultipleDisposersForProducer() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/disposers/TimestampLogger_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.MULTIPLE_DISPOSERS_FOR_PRODUCE= R, 13, 16); + } + + /** * 3.9.1. Declaring an initializer method * - an initializer method has a parameter annotated @Disposes * = --===============8601834143841919445==-- From jbosstools-commits at lists.jboss.org Tue May 4 10:52:05 2010 Content-Type: multipart/mixed; boundary="===============4196264616014210814==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21890 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2. Date: Tue, 04 May 2010 10:52:04 -0400 Message-ID: <201005041452.o44Eq4Yc003014@svn01.web.mwc.hst.phx2.redhat.com> --===============4196264616014210814== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yzhishko Date: 2010-05-04 10:52:04 -0400 (Tue, 04 May 2010) New Revision: 21890 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/JSF2SourceValidator.java Log: Fixed VPE tests failing. Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/JSF2SourceValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2SourceValidator.java 2010-05-04 14:47:34 UTC (rev 21889) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2SourceValidator.java 2010-05-04 14:52:04 UTC (rev 21890) @@ -61,7 +61,11 @@ if (project =3D=3D null) { return; } - String filePath =3D helper.getURIs()[0]; + String[] uris =3D helper.getURIs(); + if (uris =3D=3D null || uris.length < 1) { + return; + } + String filePath =3D uris[0]; if (filePath =3D=3D null) { return; } @@ -101,7 +105,11 @@ if (project =3D=3D null) { return; } - String filePath =3D helper.getURIs()[0]; + String[] uris =3D helper.getURIs(); + if (uris =3D=3D null || uris.length < 1) { + return; + } + String filePath =3D uris[0]; if (filePath =3D=3D null) { return; } --===============4196264616014210814==-- From jbosstools-commits at lists.jboss.org Tue May 4 10:52:28 2010 Content-Type: multipart/mixed; boundary="===============3517984350276343068==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21891 - trunk/drools/docs/guvnor_ref/en-US. Date: Tue, 04 May 2010 10:52:28 -0400 Message-ID: <201005041452.o44EqSCT003032@svn01.web.mwc.hst.phx2.redhat.com> --===============3517984350276343068== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-04 10:52:27 -0400 (Tue, 04 May 2010) New Revision: 21891 Modified: trunk/drools/docs/guvnor_ref/en-US/conclusion.xml trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml trunk/drools/docs/guvnor_ref/en-US/introduction.xml trunk/drools/docs/guvnor_ref/en-US/master.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-6 Show java-doc is shown for EL= content assist item. Screenshot has been made. TOOLSDOC-63 Eclipse Guvnor Tools Reference Guide restructureing and update.= The Guide has been restructured. Modified: trunk/drools/docs/guvnor_ref/en-US/conclusion.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/conclusion.xml 2010-05-04 14:52:04 U= TC (rev 21890) +++ trunk/drools/docs/guvnor_ref/en-US/conclusion.xml 2010-05-04 14:52:27 U= TC (rev 21891) @@ -16,7 +16,39 @@ aspects of the current tooling that require revision going forward= , we feel that the current state of the EGT is sufficient for the major = use cases. = - If you have some questions, comments or suggestions on the topic= , please feel free to ask in the +
+ Other relevant resources on the topic + = + + + Guvnor wiki page + + = + + Drools on JBoss.org + + = + + + JBoss Tools= Home Page + + + = + + + The latest + JBossTools/JBDS documentation builds + + + = + + + JBossTools= /JBDS + release documentation + + + If you have some questions, comments or suggestions on the t= opic, please feel free to ask in the Jboss Tools Forum. +
= Modified: trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml 2010-05-0= 4 14:52:04 UTC (rev 21890) +++ trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml 2010-05-0= 4 14:52:27 UTC (rev 21891) @@ -8,265 +8,22 @@ = - Functionality Overview + Tasks = - This chapter will introduce you to the Guvnor Reposito= ry Exploring - perspective and give an overview on all functionali= ty the Guvnor Tools provides. - -
- Guvnor Perspective - - The Guvnor Repository Exploring perspective contains two views - supplied by EGT =E2=80=93 Repos= itory Explorer and - Version History, that will be the cen= ter of most interaction - with Guvnor, and Eclipse standard views such as Prop= erties and - Resource Navigator that are also usef= ul. - - While each of these views can be opened and positioned indep= endently within an Eclipse - workbench, the Guvnor perspective provide= s a convenient method of - getting a suggested layout. In the Eclipse workbench menu, cho= ose - Window > Open Perspective > Other - to get the perspective list: - -
- Enabling the Guvnor Repository Perspective - - - - - -
- - And then choose - Guvnor Repository Exploring. This opens the - Guvnor perspective. -
- -
- Guvnor Connection Wizard - - After opening the Guvnor perspective, t= he first task is to make a - connection to a Guvnor repository. This is handled by the Guvnor Connection - wizard. This wizard appears in a number of plac= es within the - EGT (as detailed below), but in this = section we will cover only - the two most basic entry points. - - The Guvnor Connection wizard can be sta= rted in the following - ways: - - - - using the Eclipse menu - File > New > Other > Guvnor >= ; Guvnor - repository location - - -
- New Guvnor Repository Location - - - - - -
- - - - in the Guvnor Repositories view= using the drop-down menu - -
- Adding New Guvnor Connection - - - - - -
- - - - using the menu button = - ( - - - - ) - - - - - Choosing either of these will start the Guvnor Con= nection - wizard. - = -
- Guvnor Connection Wizard - - - - - -
- - Default values appear in the - Location, - - Port, and - Repository - fields (See the =E2=80=9CGuvnor Preferences=E2=80=9D section below for details= about how to - change these default values.) Of course, any of these fields c= an be edited by typing in - the corresponding text box. Drag-and-drop or paste into the - Location - field of a typical Guvnor repository URL such as:<= /para> - - - - http://localhost:8080/drools-guvnor/org.drools.g= uvnor.Guvnor/webdav - - - - Results in the URL being parsed into the respective fields a= s well. The authentication - information (user name and password) can optionally be stored = in the Eclipse - workbench's key-ring file based on the selection of - Save user name and password. - - - Note: - If the authentication information is not stored in the k= ey-ring, then the - EGT uses a session authentication= , what means that the - credentials supplied are used only for the lifetime of the= Eclipse workbench - instance. - - - If authentication information is not stored in the key-ring = or the authentication - information (key-ring or session) is not valid, the = EGT will prompt - for authentication information when it has to access the Guvno= r repository. - - If authentication fails, the EGT will r= etry once and then issue - an authentication failure error. - - - Tip: - If an authentication failure error occurs, you can retry= the same operation and - supply different authentication information. - - - Note that the EGT calls the Guvnor repo= sitory at various times, - such as when determining if resource updates are available. Th= us if you use session - authentication, the authentication dialog will appear at diffe= rent times during the - Eclipse workbench session, depending on what actions you take.= For ease of use, we - recommend saving the authentication information in the Eclipse= key-ring. - - - Note: - The Eclipse key-ring file is distinct from key-ring file= s found in some platforms - such as Mac OS X and many forms of Linux. Thus, sometimes = if you access a Guvnor - repository outside the EGT, the key-r= ing files might become - unsynchronized and you will be unexpectedly prompted for a= uthentication in Eclipse. - This is nuisance, but your usual credentials should apply = in this case. - -
- -
- Guvnor Repositories View - - The Guvnor Repositories view contains t= ree structures for Guvnor - repository contents. = - -
- Guvnor Repositories View - - - - - -
- - You can perform the following actions under the resources in the - Guvnor Repositories view: - - - - create a new Guvnor repository connection. How to do= this is describe above in the "Gu= vnor Connection Wizard" section. - - - - remove a Guvnor repository connection. Use the Delet= e button = - ( - - - - ) in the tool-bar or the - Delete option in the context menu to= remove a repository connection. - - - - refresh Guvnor repository resorces. Use the - Refresh context menu item to reload = a tree content for the selected node. - - - - make use of "drill-into" functionality. It= 's represented by a number of tool-bar/context menu items such as Go Home - ( - - - - ), Go Bac= k - ( - - - - ) and - Go Into - ( - - - - ). - - - - Drill-down is useful when working with deeply nested tree st= ructures and when you wish to concentrate on only branch of the tree. For e= xample, drilling into the - "defaultPackage" node chan= ges the tree view to: - -
- Going Into the <emphasis>"defaultPackage"</emphasis></t= itle> - <mediaobject> - <imageobject> - <imagedata fileref=3D"images/functionality_overview/go_into_defaultPac= kage.png"/> - </imageobject> - </mediaobject> - </figure> - - <para>Clicking on the Go Home button ( <inlinemediaobject> - <imageobject> - <imagedata fileref=3D"images/functionality= _overview/go_home_button.png"/> - </imageobject> - </inlinemediaobject> ) or selecting <emphasis> - <property>Go Home</property></emphasis> in the context menu returns = the tree to the top-level structure shown in the previous picture above. - </para> - - <para>There are a number of operations that can be performed on Guvnor re= pository files. Selecting a file in -the Guvnor repository causes the Eclipse <property>Properties view</proper= ty> to update with details about that file: -</para> - - <figure> - <title>Guvnor Repository Files Properties - - - - - -
- - -
- + This chapter will give an overview on all functionality the Guvnor Tools provides. + = +
+ Creating a New Guvnor Connection + As mentioned in the "Intr= oduction", the main purpose + of the EGT is to allow development using r= esources held in a Guvnor + repository. The first task is to make a connection to a Guvnor = repository. = + This is handled by the Guvn= or Connection + wizard. +
+ =
- Local Copies of Guvnor Files - - As mentioned in the "Int= roduction", the main purpose - of the EGT is to allow development using = resources held in a Guvnor - repository. There are two methods of getting local copies of G= uvnor repository + Getting Local Copies of Guvnor Files + There are two methods of getting local copies of Guvnor repo= sitory resources: = @@ -329,8 +86,76 @@ the revision number.
= +
+ Importing Guvnor Repository Resources + = + In addition to the single file drag-and-drop from the Guvnor Repositories + view, the EGT also includes a = wizard for copying one + or more files from a Guvnor repository to the local workspace = (and setting the + association with the Guvnor repository). This wizard is availa= ble from the + File > Import > Guvnor > Resource from + Guvnor + and the + File > New > Other > Guvnor > Resour= ce from + Guvnor + menu items. + + Note: + = + Note that the wizard is identical but appears in both lo= cations to accommodate + users who tend to view this functionality as being in eith= er category. + + = + The first page of the wizard asks for the selection of the s= ource Guvnor repository + and gives the choice to create a new Guvnor repository connect= ion (in which case the + second page is the same as the Guvnor Connection wizard). + = +
+ Resource from Guvnor Wizard + + + + + +
+ = + Once the source Guvnor repository is chosen, the wizard prom= pts for resource selection: + = +
+ Resource Selection + + + + + +
+ = + Finally, the target location in the local workspace should b= e chosen: +
+ Choosing the Target Location + + + + + +
+ = + On completion the wizard copies the selected files from the = Guvnor repository to the local workspace. + If a file with the same name already exists in the destination= , the wizard uses the Eclipse standard + "prompt for rename" dialog: + = +
+ Prompt for Rename Dialog + + + + + +
+
+ =
- Actions for Local Guvnor Resources + Managing Guvnor Resources = The EGT provides a number of actions (a= vailable through the Guvnor context menu = on files) for working with files, both those associated with @@ -598,130 +423,6 @@ and removes local metadata for the Guvnor repository assoc= iation.
- -
- Guvnor Resource History View - - The Guvnor Resource History view should= details about revision - history for selected files, both local and those in Guvnor rep= ositories. The initial - state of this view is shown on the figure below. - -
- Initial State of the Guvnor Resource History View - - - - - -
- - The Guvnor Resource History view is pop= ulated by - Show History - actions in either the local - Guvnor context menu or= in the context menu for - a Guvnor repository file in the Guvnor - Repositories view. Once this action is performed, t= he Guvnor - Resource History view updates to show the revis= ion history: - -
- IGuvnor Resource History View - - - - - -
- - Here we see that the file - test.txt - has seven revisions. Double clicking on a revision= row (or the context menu - Open (Read only)) opens an= Eclipse read-only editor - with the revision contents. - -
- Eclipse Read-only Editor with the Revision Contents - - - - - -
- - Note: - You can also use the - Save As... - option when a file is open in a read-only edit= or to save a local - writable copy of the contents. Doing so, however, will not= associate the file - created with its Guvnor source. - - -
- -
- Importing Guvnor Repository Resources - - In addition to the single file drag-and-drop from the Guvnor Repositories - view, the EGT also include= s a wizard for copying one - or more files from a Guvnor repository to the local workspace = (and setting the - association with the Guvnor repository). This wizard is availa= ble from the - File > Import > Guvnor > Resource from - Guvnor - and the - File > New > Other > Guvnor > Resour= ce from - Guvnor - menu items. - - Note: - - Note that the wizard is identical but appears in both lo= cations to accommodate - users who tend to view this functionality as being in eith= er category. - - - The first page of the wizard asks for the selection of the s= ource Guvnor repository - and gives the choice to create a new Guvnor repository connect= ion (in which case the - second page is the same as the Guvnor Connection wizard). - -
- Resource from Guvnor Wizard - - - - - -
- = - Once the source Guvnor repository is chosen, the wizard prom= pts for resource selection: - -
- Resource Selection - - - - - -
- = - Finally, the target location in the local workspace should b= e chosen: -
- Choosing the Target Location - - - - - -
- = - On completion the wizard copies the selected files from the = Guvnor repository to the local workspace. - If a file with the same name already exists in the destination= , the wizard uses the Eclipse standard - "prompt for rename" dialog: - -
- Prompt for Rename Dialog - - - - - -
-
+ = + = Modified: trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml 2010-05-04 14= :52:04 UTC (rev 21890) +++ trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml 2010-05-04 14= :52:27 UTC (rev 21891) @@ -8,83 +8,390 @@ = - Guvnor Preferences - - The EGT provides a preference page in the <= emphasis> - Guvnor - category: - -
- Resource Selection - - - - - -
- - The preferences cover two categories: - - Guvnor repository connections - = - Local Guvnor - repository resource decorations. - - -
- Guvnor Repository Connection Preferences - There are two preferences that can be set for Guvnor reposit= ory connections, that are - used when creating new connections: - + Reference = + This chapter includes detailed reference information about Views= and Wizards used to manage Guvnor Tools. + = +
+ Guvnor Repository Exploring Perspective + = + The Guvnor Repository Exploring perspective contains two views + supplied by EGT =E2=80=93 Repos= itory Explorer and + Version History, that will be the center = of most interaction + with Guvnor, and Eclipse standard views such as Prop= erties and + Resource Navigator that are also useful.<= /para> + = + While each of these views can be opened and positioned indep= endently within an Eclipse + workbench, the Guvnor perspective provide= s a convenient method of + getting a suggested layout. In the Eclipse workbench menu, cho= ose + Window > Open Perspective > Other + to get the perspective list: + = +
+ Enabling the Guvnor Repository Perspective + + + + + +
+ = + And then choose + Guvnor Repository Exploring. T= his opens the + Guvnor perspective. +
+
+ Guvnor Connection Wizard + = + This wizard appears in a number of places within the + EGT (as detailed below), but in this sect= ion we will cover only + the two most basic entry points. + = + The Guvnor Connection wizard can be sta= rted in the following + ways: + = - The first is a default Guvnor repository URL templat= e, which can make it - easier to create multiple similar connections by simpl= y changing part of the - field, such as the host name. + using the Eclipse menu + File > New > Other > Guvnor > Gu= vnor + repository location + + = +
+ New Guvnor Repository Location + + + + + +
+ = - The second is whether saving of authentication infor= mation in the Eclipse - platform key-ring should be enabled by default. + in the Guvnor Repositories view= using the drop-down menu + = +
+ Adding New Guvnor Connection + + + + + +
+ = + + using the menu button = + ( + + + + ) + + - - As with the Guvnor repository URL template, actually whether= to save a specific - instance of authentication information in the Eclipse platform= key-ring can be - determined when actually creating the connection. That is, bot= h of these preferences are - simply convenience values set to reasonable defaults. + = + Choosing either of these will start the Guvnor Con= nection + wizard. + = +
+ Guvnor Connection Wizard + + + + + +
+ = + Default values appear in the + Location, + + Port, and + Repository + fields (See the =E2=80=9CGuvnor Preferences=E2=80=9D section below for det= ails about how to + change these default values.) Of course, any of these fields c= an be edited by typing in + the corresponding text box. Drag-and-drop or paste into the + Location + field of a typical Guvnor repository URL such as:<= /para> + = + + + http://localhost:8080/drools-guvnor/org.drools.g= uvnor.Guvnor/webdav + + + = + Results in the URL being parsed into the respective fields a= s well. The authentication + information (user name and password) can optionally be stored = in the Eclipse + workbench's key-ring file based on the selection of + Save user name and password. + = + + Note: + If the authentication information is not stored in the k= ey-ring, then the + EGT uses a session authentication, wh= at means that the + credentials supplied are used only for the lifetime of the= Eclipse workbench + instance. + + = + If authentication information is not stored in the key-ring = or the authentication + information (key-ring or session) is not valid, the = EGT will prompt + for authentication information when it has to access the Guvno= r repository. + = + If authentication fails, the EGT will r= etry once and then issue + an authentication failure error. + = + + Tip: + If an authentication failure error occurs, you can retry= the same operation and + supply different authentication information. + + = + Note that the EGT calls the Guvnor repo= sitory at various times, + such as when determining if resource updates are available. Th= us if you use session + authentication, the authentication dialog will appear at diffe= rent times during the + Eclipse workbench session, depending on what actions you take.= For ease of use, we + recommend saving the authentication information in the Eclipse= key-ring. + = + + Note: + The Eclipse key-ring file is distinct from key-ring file= s found in some platforms + such as Mac OS X and many forms of Linux. Thus, sometimes = if you access a Guvnor + repository outside the EGT, the key-r= ing files might become + unsynchronized and you will be unexpectedly prompted for a= uthentication in Eclipse. + This is nuisance, but your usual credentials should apply = in this case. +
- -
- Local Guvnor Repository Resource Decoration Preferences</ti= tle> - - <para>The second category of preferences provided by the <property= >EGT</property> deals with how the decoration of - local resources associated with Guvnor repository resources is= presented. Since the - Guvnor repository is not a substitute for a SCM, and since SCM= tools in Eclipse tend to - decorate local resources, it is useful to be able to control j= ust how the <property>EGT</property> decorate - its local resources to avoid messy conflicts with SCM packages= .</para> - = - <para>In the <emphasis> - <property>File Decoration</property></emphasis> - section of the preference page, you can choose the location (T= op right, Top left, Bottom right, - Bottom left) of the decoration icon, or you can choose not to= display it. In - the <emphasis> - <property>Text</property></emphasis> section, you can form= at the Guvnor metadata that is appended to the file - names:</para> + <section id=3D"guvnor_repositories_view"> + <title>Guvnor Repositories View + = + The Guvnor Repositories view contains t= ree structures for Guvnor + repository contents. = + = +
+ Guvnor Repositories View + + + + + +
+ = + You can perform the following actions under the resources in= the + Guvnor Repositories view: + = - Whether to show an indicator (>) when the local f= ile has changes not committed back to the - Guvnor repository + create a new Guvnor repository connection. How to do= this is describe above in the "Gu= vnor Connection Wizard" section. + = - Whether to show the revision number + remove a Guvnor repository connection. Use the Delet= e button = + ( + + + + ) in the tool-bar or the + Delete option in t= he context menu to remove a repository connection. + = - Whether to show the date/time stamp - - = - = - Any changes to these preferences take effect immediately upo= n clicking the - Apply and then - Ok buttons. + refresh Guvnor repository resorces. Use the + Refresh context menu i= tem to reload a tree content for the selected node. + + = + + make use of "drill-into" functionality. It= 's represented by a number of tool-bar/context menu items such as Go Home + ( + + + + ), Go Back + ( + + + + ) and + Go Into + ( + + + + ). + + + = + Drill-down is useful when working with deeply nested tree st= ructures and when you wish to concentrate on only branch of the tree. For e= xample, drilling into the + "defaultPackage" nod= e changes the tree view to: + = +
+ Going Into the <emphasis>"defaultPackage"</em= phasis> + + + + + +
+ = + Clicking on the Go Home button ( + + + + ) or selecting + Go Home in the context menu re= turns the tree to the top-level structure shown in the previous picture ab= ove. + + = + There are a number of operations that can be performed on Gu= vnor repository files. Selecting a file in + the Guvnor repository causes the Eclipse Properties = view to update with details about that file: + + = +
+ Guvnor Repository Files Properties + + + + + +
+ = +
+
+ Guvnor Resource History View + = + The Guvnor Resource History view should= details about revision + history for selected files, both local and those in Guvnor rep= ositories. The initial + state of this view is shown on the figure below. + = +
+ Initial State of the Guvnor Resource History View</titl= e> + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/functionality_overview/re= source_history_view.png"/> + </imageobject> + </mediaobject> + </figure> + = + <para>The <property>Guvnor Resource History view</property> is pop= ulated by <emphasis> + <property>Show History</property> + </emphasis> actions in either the local <emphasis> + <property>Guvnor</property></emphasis> context menu or in the = context menu for + a Guvnor repository file in the <link linkend=3D"guvnor_reposi= tories_view">Guvnor + Repositories view</link>. Once this action is performed, t= he <property>Guvnor + Resource History view</property> updates to show the r= evision history:</para> + = + <figure> + <title>IGuvnor Resource History View + + + + + +
+ = + Here we see that the file + test.txt + has seven revisions. Double clicking on a revision row= (or the context menu + Open (Read only)) opens an Ecl= ipse read-only editor + with the revision contents. + = +
+ Eclipse Read-only Editor with the Revision Contents</ti= tle> + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/functionality_overview/re= source_history_view3.png"/> + </imageobject> + </mediaobject> + </figure> + <note> + <title>Note: + You can also use the + Save As... + option when a file is open in a read-only editor t= o save a local + writable copy of the contents. Doing so, however, will not= associate the file + created with its Guvnor source. + + = +
+ = +
+ Guvnor Preferences + = + = + The EGT provides a preference page in t= he + Guvnor + category: + = +
+ Resource Selection + + + + + +
+ = + The preferences cover two categories: + + Guvnor repository connections + = + Local Guvnor + repository resource decorations. + + = +
+ Guvnor Repository Connection Preferences + There are two preferences that can be set for Guvnor rep= ository connections, that are + used when creating new connections: + = + + + The first is a default Guvnor repository URL tem= plate, which can make it + easier to create multiple similar connections by s= imply changing part of the + field, such as the host name. + + + The second is whether saving of authentication i= nformation in the Eclipse + platform key-ring should be enabled by default. + + + = + As with the Guvnor repository URL template, actually whe= ther to save a specific + instance of authentication information in the Eclipse plat= form key-ring can be + determined when actually creating the connection. That is,= both of these preferences are + simply convenience values set to reasonable defaults. +
+ = +
+ Local Guvnor Repository Resource Decoration Preferences= + = + The second category of preferences provided by the EGT deals with how the decoration of + local resources associated with Guvnor repository resource= s is presented. Since the + Guvnor repository is not a substitute for a SCM, and since= SCM tools in Eclipse tend to + decorate local resources, it is useful to be able to contr= ol just how the EGT decorate + its local resources to avoid messy conflicts with SCM pack= ages. + = + In the + File Decoration + section of the preference page, you can choose the locatio= n (Top right, Top left, Bottom right, + Bottom left) of the decoration icon, or you can choose no= t to display it. In + the + Text section, you can = format the Guvnor metadata that is appended to the file + names: + + + Whether to show an indicator (>) when the loc= al file has changes not committed back to the + Guvnor repository + + + Whether to show the revision number + + + Whether to show the date/time stamp + + = + = + Any changes to these preferences take effect immediately= upon clicking the + Apply and then + Ok buttons. +
+
Modified: trunk/drools/docs/guvnor_ref/en-US/introduction.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/introduction.xml 2010-05-04 14:52:04= UTC (rev 21890) +++ trunk/drools/docs/guvnor_ref/en-US/introduction.xml 2010-05-04 14:52:27= UTC (rev 21891) @@ -8,15 +8,7 @@ comprehensive reference, there should be enough detail included fo= r early adopters using these tools. = - The Guvnor repository is not intended as a = Source Code Management - (SCM) solution, and the EGT are not intended = to be Eclipse =E2=80=9Cteam - provider=E2=80=9D extensions or replacements. Rather, the Guvnor r= epository is a location where - certain artifacts (such as rules and SOA policy definitions) are c= ontrolled (=E2=80=9Cgoverned=E2=80=9D) by - policies defined by the deployment environment. The purpose of the= EGT - is then to enable access to resources held by the Guvnor repositor= y, so - they can be used in development. Thus, limited capabilities for re= ading, writing, adding, - and removing Guvnor repository resources are provided in the - EGT. + First, have a look at the key features of Guvnor Tools= : =
Guvnor Tools Key Features @@ -114,9 +106,20 @@
- +
+ What is Guvnor Tools? + The Guvnor repository is not intended a= s a Source Code Management + (SCM) solution, and the EGT are not intended = to be Eclipse =E2=80=9Cteam + provider=E2=80=9D extensions or replacements. Rather, the Guvnor r= epository is a location where + certain artifacts (such as rules and SOA policy definitions) are c= ontrolled (=E2=80=9Cgoverned=E2=80=9D) by + policies defined by the deployment environment. The purpose of the= EGT + is then to enable access to resources held by the Guvnor repositor= y, so + they can be used in development. Thus, limited capabilities for re= ading, writing, adding, + and removing Guvnor repository resources are provided in the + EGT. +
- How to start with Guvnor Tools + Requirements and Installation = Guvnor Tools is a part of the JBoss Tools project. Thus to get started with Guvnor Tools, you should hav= e the following: @@ -162,37 +165,4 @@ Eclipse synchronisation tool.
= -
- Other relevant resources on the topic - - - - Guvnor wiki page - - = - - Drools on JBoss.org - - - - - JBoss Tools= Home Page - - - - - - The latest - JBossTools/JBDS documentation builds - - - - - - JBossTools= /JBDS - release documentation - - - -
Modified: trunk/drools/docs/guvnor_ref/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/master.xml 2010-05-04 14:52:04 UTC (= rev 21890) +++ trunk/drools/docs/guvnor_ref/en-US/master.xml 2010-05-04 14:52:27 UTC (= rev 21891) @@ -2,7 +2,7 @@ +[ @@ -40,7 +40,7 @@ OlgaChikvina= = = - 2009 + 2009 2010 JBoss by Red Hat @@ -61,6 +61,5 @@ &introduction; &functionality_overview; &guvnor_preferences; - &conclusion; - + &conclusion; = = --===============3517984350276343068==-- From jbosstools-commits at lists.jboss.org Tue May 4 10:53:33 2010 Content-Type: multipart/mixed; boundary="===============0984747591714604184==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21892 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/disposers. Date: Tue, 04 May 2010 10:53:33 -0400 Message-ID: <201005041453.o44ErX0m003129@svn01.web.mwc.hst.phx2.redhat.com> --===============0984747591714604184== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-04 10:53:32 -0400 (Tue, 04 May 2010) New Revision: 21892 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/disposers/TimestampLogger_Broken.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/disposers/TimestampLogger_Broken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/disposers/TimestampLogger_Broken.java (re= v 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/disposers/TimestampLogger_Broken.java 2010-05-04 14:53:32 UTC (re= v 21892) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.disposers; + +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; + +public class TimestampLogger_Broken { + + @Produces + public static Spider getSpider() { + return new Spider(); + } + + public static void destorySpider(@Disposes Spider spider) { + } + + public static void destorySpiderAgain(@Disposes Spider spider) { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/disposers/TimestampLogger_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============0984747591714604184==-- From jbosstools-commits at lists.jboss.org Tue May 4 12:18:00 2010 Content-Type: multipart/mixed; boundary="===============7940721138300141332==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21893 - branches/modular_build/build. Date: Tue, 04 May 2010 12:18:00 -0400 Message-ID: <201005041618.o44GI0ks024193@svn01.web.mwc.hst.phx2.redhat.com> --===============7940721138300141332== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-04 12:18:00 -0400 (Tue, 04 May 2010) New Revision: 21893 Modified: branches/modular_build/build/build.xml Log: fix missing defn of update.site.path Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-04 14:53:32 UTC (rev 218= 92) +++ branches/modular_build/build/build.xml 2010-05-04 16:18:00 UTC (rev 218= 93) @@ -623,26 +623,28 @@ = + = - + + = - + - + = - + = @@ -657,7 +659,6 @@ - = --===============7940721138300141332==-- From jbosstools-commits at lists.jboss.org Tue May 4 12:56:25 2010 Content-Type: multipart/mixed; boundary="===============2624510029217224764==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21894 - branches/modular_build/build. Date: Tue, 04 May 2010 12:56:25 -0400 Message-ID: <201005041656.o44GuPJ2028304@svn01.web.mwc.hst.phx2.redhat.com> --===============2624510029217224764== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-04 12:56:24 -0400 (Tue, 04 May 2010) New Revision: 21894 Modified: branches/modular_build/build/build.xml Log: failonerror rsynching Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-04 16:18:00 UTC (rev 218= 93) +++ branches/modular_build/build/build.xml 2010-05-04 16:56:24 UTC (rev 218= 94) @@ -910,7 +910,7 @@ - + --===============2624510029217224764==-- From jbosstools-commits at lists.jboss.org Tue May 4 12:59:02 2010 Content-Type: multipart/mixed; boundary="===============6052165721465452390==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21895 - in trunk/seam/docs/reference/en-US: images/directory_structure and 1 other directory. Date: Tue, 04 May 2010 12:59:02 -0400 Message-ID: <201005041659.o44Gx26A028338@svn01.web.mwc.hst.phx2.redhat.com> --===============6052165721465452390== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-04 12:59:02 -0400 (Tue, 04 May 2010) New Revision: 21895 Added: trunk/seam/docs/reference/en-US/images/directory_structure/directory_str= ucture_7.png trunk/seam/docs/reference/en-US/images/directory_structure/directory_str= ucture_8.png Modified: trunk/seam/docs/reference/en-US/directory_structure.xml Log: TOOLSDOC-70-Option to specify the project(s) name in the "Seam Web project" wizard - description and images a= re added = Modified: trunk/seam/docs/reference/en-US/directory_structure.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/docs/reference/en-US/directory_structure.xml 2010-05-04 16:5= 6:24 UTC (rev 21894) +++ trunk/seam/docs/reference/en-US/directory_structure.xml 2010-05-04 16:5= 9:02 UTC (rev 21895) @@ -1,209 +1,230 @@ - - - - - - JBoss Tools - Seam - Eclipse - - - - Directory Structure of the Generated Project - - In this chapter we describe where the Seam wizard puts the gener= ated files for both EAR - and WAR deployments. - The Seam Project wizard generates projects like Eclipse WTP styl= e in order to utilize - Eclipse WTP features and to have a correct classpath. To be more p= recise it generates one - project per artifact. - -
- WAR Deployment - - The project layout for WAR projects is: - -
- Project Layout for WAR projects - - - - - -
- - A WAR project can only use Seam JavaBean and JPA Entity bean= components; it cannot use - EJB3 Session beans etc. - WAR projects are generated to enable Seam war hotdeploy feat= ure. Classes put - into - src/action - will be deployed to - WEB-INF/dev - from which Seam automatically will perform hotdep= loy of new - components. - - Note: - Because of Eclipse WTP limits the hot deployed classes a= lso existed in - WEB-INF/classes, but = since Seam gives - WEB-INF/dev - precedence it will work. - - - Furthermore the Seam Project wizard generates a test project= that is setup to run - TestNG directly against th= e proper libraries and - server runtime libraries. When the TestNG plugin is installed = you can just run your - tests via Run As > TestNG Test.= - In order to deploy WAR project on server, right-click on the= project and select - Run As > Run on Server.= Studio will deploy - WAR project into one web application on server to de= ploy - folder. - -
- -
- EAR Deployment - The project layout for EAR projects is: - -
- Project Layout for EAR projects - - - - - -
- - An EAR project can use the whole range of Seam components, i= ncluding EJB3 Session - beans. - In order to deploy EAR project on server, right-click on the= project with - -ear postfix and select - Run As > Run on Server.= Studio will take care - about all modules and deploy EAR project into one enterprise a= pplication on server to - deploy folder. EAR application keeps = ejb - and war modules of the EAR project. - = - Note: - The WAR generated for EAR= s is now configured to utilize Seam hot-deployment (WEB-INF/dev) similar to standalone = WAR projects. - = - - = -
- -
- - Changing the Seam Version - - To upgrade or downgrade your projects Seam version use the f= acet preferences. You - should right-click your project, open its Properties= and choose - Project Facets - category. Next select - Seam - and change its version to needed one. - -
- Changing the Seam Facet Version - - - - - -
- - After pressing - Apply - the wizard for adjusting new Seam runtime settings= appears. - -
- Changing the Seam Facet Version - - - - - -
- - If you need to update the libraries for you project, check t= he - Update libraries - option. All libraries you checked will be removed = and the libraries from the - new Seam distribution will be added after clicking - Ok. - -
- Changing the Seam Facet Version - - - - - -
- - - Note: - - The note "Seam configuration files and their XSDs won&ap= os;t be changed" is - meant that the libraries, Seam facet and runtime version w= ill be changed, but - configuration files that refer to the old version will hav= e to be manually - updated. - -
- -
- Changing Seam Parent Project - - Starting from the 2.0.0.CR2 version of JBoss Tools= it is possible - to change the Seam parent project. In earlier versions this wa= s only controllable at a - project creation time, now it can be changed for existing proj= ects too. - - Go to your project preferences and select - Seam Settings - category on the left. Press the - Browse - button next to the - Main Seam Project - section to select the other Seam parent project. - -
- Changing Seam Parent Project - - - - - -
-
- -
- Renaming the Projects and Folders - - If you need to rename one of the Seam Project artifacts - (<project_name>, - <project_name>-test, - <project_name>-test or - <project_name>-ejb) or any enti= re folder like - <project_name>/WebContent, - <project_name>/ejbModule, - <project_name>-test/test-src, o= r project name in - packages org.domain.<project_name>.session, - org.domain.<project_name>.entity, you can do this - by brining the context menu and navigating - Refactor > Rename... - or just pressing - Shift + Alt + R - under the chosen resource. - - Use - Refactor > Move... - (or - Shift + Alt + V - ), if you need to move - <project_name>/WebContent folde= r, - <project_name>/ejbModule folder= or - <project_name>/test-src folder = in the other place - within the Project structure. -
- + + + + + + JBoss Tools + Seam + Eclipse + + + + Directory Structure of the Generated Project + + In this chapter we describe where the Seam wizard puts the gener= ated files for both EAR + and WAR deployments. + The Seam Project wizard generates projects like Eclipse WTP styl= e in order to utilize + Eclipse WTP features and to have a correct classpath. To be more p= recise it generates one + project per artifact. + +
+ WAR Deployment + + The project layout for WAR projects is: + +
+ Project Layout for WAR projects + + + + + +
+ + A WAR project can only use Seam JavaBean and JPA Entity bean= components; it cannot use + EJB3 Session beans etc. + WAR projects are generated to enable Seam war hotdeploy feat= ure. Classes put + into + src/action + will be deployed to + WEB-INF/dev + from which Seam automatically will perform hotdep= loy of new + components. + + Note: + Because of Eclipse WTP limits the hot deployed classes a= lso existed in + WEB-INF/classes, but = since Seam gives + WEB-INF/dev + precedence it will work. + + + Furthermore the Seam Project wizard generates a test project= that is setup to run + TestNG directly against th= e proper libraries and + server runtime libraries. When the TestNG plugin is installed = you can just run your + tests via Run As > TestNG Test.= + In order to deploy WAR project on server, right-click on the= project and select + Run As > Run on Server.= Studio will deploy + WAR project into one web application on server to de= ploy + folder. + +
+ +
+ EAR Deployment + The project layout for EAR projects is: + +
+ Project Layout for EAR projects + + + + + +
+ + An EAR project can use the whole range of Seam components, i= ncluding EJB3 Session + beans. + In order to deploy EAR project on server, right-click on the= project with + -ear postfix and select + Run As > Run on Server.= Studio will take care + about all modules and deploy EAR project into one enterprise a= pplication on server to + deploy folder. EAR application keeps = ejb + and war modules of the EAR project. + = + Note: + The WAR generated for EAR= s is now configured to utilize Seam hot-deployment (WEB-INF/dev) similar to standalone = WAR projects. + = + + = +
+ +
+ + Changing the Seam Version + + To upgrade or downgrade your projects Seam version use the f= acet preferences. You + should right-click your project, open its Properties= and choose + Project Facets + category. Next select + Seam + and change its version to needed one. + +
+ Changing the Seam Facet Version + + + + + +
+ + After pressing + Apply + the wizard for adjusting new Seam runtime settings= appears. + +
+ Changing the Seam Facet Version + + + + + +
+ + If you need to update the libraries for you project, check t= he + Update libraries + option. All libraries you checked will be removed = and the libraries from the + new Seam distribution will be added after clicking + Ok. + +
+ Changing the Seam Facet Version + + + + + +
+ + + Note: + + The note "Seam configuration files and their XSDs won&ap= os;t be changed" is + meant that the libraries, Seam facet and runtime version w= ill be changed, but + configuration files that refer to the old version will hav= e to be manually + updated. + +
+ +
+ Changing Seam Parent Project + + Starting from the 2.0.0.CR2 version of JBoss Tools= it is possible + to change the Seam parent project. In earlier versions this wa= s only controllable at a + project creation time, now it can be changed for existing proj= ects too. + + Go to your project preferences and select + Seam Settings + category on the left. Press the + Browse + button next to the + Main Seam Project + section to select the other Seam parent project. + +
+ Changing Seam Parent Project + + + + + +
+
+ +
+ Renaming the Projects and Folders + + If you need to rename one of the Seam Project artifacts + (<project_name>, + <project_name>-ear, + <project_name>-ejb or + <project_name>-test) or any ent= ire folder like + <project_name>/WebContent, + <project_name>/ejbModule, + <project_name>-test/test-src, o= r project name in + packages org.domain.<project_name>.session, + org.domain.<project_name>.entity, you can do this + by brining the context menu and navigating + Refactor > Rename... + or just pressing + Shift + Alt + R + under the chosen resource. + = +
+ Renaming the folder + + + + + +
+ + Use + Refactor > Move... + (or + Shift + Alt + V + ), if you need to move + <project_name>/WebContent folde= r, + <project_name>/ejbModule folder= or + <project_name>/test-src folder = in the other place + within the Project structure. + = +
+ Moving the folder + + + + + +
+ = +
+ \ No newline at end of file Added: trunk/seam/docs/reference/en-US/images/directory_structure/directory= _structure_7.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/seam/docs/reference/en-US/images/directory_struc= ture/directory_structure_7.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/seam/docs/reference/en-US/images/directory_structure/directory= _structure_8.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/seam/docs/reference/en-US/images/directory_struc= ture/directory_structure_8.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============6052165721465452390==-- From jbosstools-commits at lists.jboss.org Tue May 4 14:21:30 2010 Content-Type: multipart/mixed; boundary="===============1747811949553853842==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21896 - trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console. Date: Tue, 04 May 2010 14:21:30 -0400 Message-ID: <201005041821.o44ILUHC017224@svn01.web.mwc.hst.phx2.redhat.com> --===============1747811949553853842== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-04 14:21:29 -0400 (Tue, 04 May 2010) New Revision: 21896 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/con= sole/ConsoleConfiguration.java Log: https://jira.jboss.org/jira/browse/JBIDE-5997 - fix in trunk Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibern= ate/console/ConsoleConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/co= nsole/ConsoleConfiguration.java 2010-05-04 16:59:02 UTC (rev 21895) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/co= nsole/ConsoleConfiguration.java 2010-05-04 18:21:29 UTC (rev 21896) @@ -156,6 +156,8 @@ Map overrides =3D new HashMap(); if(properties!=3Dnull) { overrides.putAll( properties ); + } else { + overrides.put("hibernate.search.autoregister_listeners", "false"); //$= NON-NLS-1$ //$NON-NLS-2$ } if(StringHelper.isNotEmpty( prefs.getNamingStrategy())) { overrides.put( "hibernate.ejb.naming_strategy", prefs.getNamingStrateg= y() ); //$NON-NLS-1$ @@ -746,6 +748,8 @@ private Configuration configureStandardConfiguration(final boolean includ= eMappings, Configuration localCfg, Properties properties) { if(properties!=3Dnull) { localCfg =3D localCfg.setProperties(properties); + } else { + localCfg.setProperty("hibernate.search.autoregister_listeners", "false"= ); //$NON-NLS-1$ //$NON-NLS-2$ } EntityResolver entityResolver =3D XMLHelper.DEFAULT_DTD_RESOLVER; if(StringHelper.isNotEmpty(prefs.getEntityResolverName())) { --===============1747811949553853842==-- From jbosstools-commits at lists.jboss.org Tue May 4 16:27:44 2010 Content-Type: multipart/mixed; boundary="===============1980510996054869616==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21897 - trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/validator/xpath. Date: Tue, 04 May 2010 16:27:44 -0400 Message-ID: <201005042027.o44KRiJF010408@svn01.web.mwc.hst.phx2.redhat.com> --===============1980510996054869616== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bbrodt Date: 2010-05-04 16:27:44 -0400 (Tue, 04 May 2010) New Revision: 21897 Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/valid= ator/xpath/XPathValidator.java Log: https://jira.jboss.org/jira/browse/JBIDE-6015 Allow unary expressions in "if" Conditions Modified: trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpe= l/validator/xpath/XPathValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/vali= dator/xpath/XPathValidator.java 2010-05-04 18:21:29 UTC (rev 21896) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/src/org/eclipse/bpel/vali= dator/xpath/XPathValidator.java 2010-05-04 20:27:44 UTC (rev 21897) @@ -407,6 +407,11 @@ mVisitor.visit((EqualityExpr) expr); } else if (expr instanceof RelationalExpr) { mVisitor.visit((RelationalExpr) expr); + } else if (expr instanceof UnaryExpr && !(((UnaryExpr)expr).getExpr() in= stanceof FunctionCallExpr)) { + // https://jira.jboss.org/jira/browse/JBIDE-6015 + // Allow unary expressions like variable references and literals + // Since we're using XPath 1.0 there's no XSD type checking + mVisitor.visit((UnaryExpr) expr); } else { FunctionCallExpr fce =3D null; // JBIDE-5999 --===============1980510996054869616==-- From jbosstools-commits at lists.jboss.org Tue May 4 17:01:19 2010 Content-Type: multipart/mixed; boundary="===============0945568259407327017==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21898 - trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard. Date: Tue, 04 May 2010 17:01:19 -0400 Message-ID: <201005042101.o44L1Jko013984@svn01.web.mwc.hst.phx2.redhat.com> --===============0945568259407327017== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-04 17:01:19 -0400 (Tue, 04 May 2010) New Revision: 21898 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/por= tlet/ui/internal/wizard/AddJBossPortletWizardPage.java Log: https://jira.jboss.org/jira/browse/JBDS-1214 EPP 5.0 Compatibility Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/to= ols/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/po= rtlet/ui/internal/wizard/AddJBossPortletWizardPage.java 2010-05-04 20:27:44= UTC (rev 21897) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/po= rtlet/ui/internal/wizard/AddJBossPortletWizardPage.java 2010-05-04 21:01:19= UTC (rev 21898) @@ -117,141 +117,148 @@ = boolean isJBossPortal =3D PortletUIActivator.isJBossPortalRuntime(model); model.setBooleanProperty(ADD_PORTLET, isJBossPortal); + boolean isGateIn =3D PortletUIActivator.isGateIn(model); + if (isGateIn) { + model.setBooleanProperty(ADD_JBOSS_APP, false); + model.setBooleanProperty(ADD_JBOSS_PORTLET, false); + } + GridData gd; + if (isJBossPortal) { + addPortlet =3D new Button(composite,SWT.CHECK); + addPortlet.setText(ADD_PORTLET_LABEL); + gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + gd.horizontalSpan =3D 2; + addPortlet.setLayoutData(gd); + synchHelper.synchCheckbox(addPortlet, ADD_PORTLET, null); = - addPortlet =3D new Button(composite,SWT.CHECK); - addPortlet.setText(ADD_PORTLET_LABEL); - GridData gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.horizontalSpan =3D 2; - addPortlet.setLayoutData(gd); - synchHelper.synchCheckbox(addPortlet, ADD_PORTLET, null); + // if exists + Label ifExistsLabel =3D new Label(composite, SWT.LEFT); + ifExistsLabel.setText(IF_EXISTS_LABEL); + ifExistsLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGI= NNING)); + ifExistsCombo =3D new Combo(composite,SWT.READ_ONLY); + ifExistsCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); = + ifExistsCombo.setItems(new String[] {"overwrite","keep"}); //$NON-NLS-1= $ //$NON-NLS-2$ + synchHelper.synchCombo(ifExistsCombo, IF_EXISTS, null); = - // if exists - Label ifExistsLabel =3D new Label(composite, SWT.LEFT); - ifExistsLabel.setText(IF_EXISTS_LABEL); - ifExistsLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGIN= NING)); - ifExistsCombo =3D new Combo(composite,SWT.READ_ONLY); - ifExistsCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); = - ifExistsCombo.setItems(new String[] {"overwrite","keep"}); //$NON-NLS-1$= //$NON-NLS-2$ - synchHelper.synchCombo(ifExistsCombo, IF_EXISTS, null); - = - // instance name - Label instanceNameLabel =3D new Label(composite, SWT.LEFT); - instanceNameLabel.setText(INSTANCE_NAME_LABEL); - instanceNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_B= EGINNING)); - instanceNameText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); - instanceNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - synchHelper.synchText(instanceNameText, INSTANCE_NAME, null); + // instance name + Label instanceNameLabel =3D new Label(composite, SWT.LEFT); + instanceNameLabel.setText(INSTANCE_NAME_LABEL); + instanceNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_= BEGINNING)); + instanceNameText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); + instanceNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + synchHelper.synchText(instanceNameText, INSTANCE_NAME, null); = - // window name - Label pageNameLabel =3D new Label(composite, SWT.LEFT); - pageNameLabel.setText(PAGE_NAME_LABEL); - pageNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGIN= NING)); - pageNameText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); - pageNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - synchHelper.synchText(pageNameText, PAGE_NAME, null); + // window name + Label pageNameLabel =3D new Label(composite, SWT.LEFT); + pageNameLabel.setText(PAGE_NAME_LABEL); + pageNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGI= NNING)); + pageNameText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); + pageNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + synchHelper.synchText(pageNameText, PAGE_NAME, null); = - // window name - Label windowNameLabel =3D new Label(composite, SWT.LEFT); - windowNameLabel.setText(WINDOW_NAME_LABEL); - windowNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEG= INNING)); - windowNameText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); - windowNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - synchHelper.synchText(windowNameText, WINDOW_NAME, null); + // window name + Label windowNameLabel =3D new Label(composite, SWT.LEFT); + windowNameLabel.setText(WINDOW_NAME_LABEL); + windowNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BE= GINNING)); + windowNameText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); + windowNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + synchHelper.synchText(windowNameText, WINDOW_NAME, null); = - // parent reference - Label parentReferenceLabel =3D new Label(composite, SWT.LEFT); - parentReferenceLabel.setText(PARENT_PORTAL_LABEL); - parentReferenceLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIG= N_BEGINNING)); - parentReferenceText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); - parentReferenceText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)= ); - synchHelper.synchText(parentReferenceText, PARENT_PORTAL, null); + // parent reference + Label parentReferenceLabel =3D new Label(composite, SWT.LEFT); + parentReferenceLabel.setText(PARENT_PORTAL_LABEL); + parentReferenceLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALI= GN_BEGINNING)); + parentReferenceText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); + parentReferenceText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL= )); + synchHelper.synchText(parentReferenceText, PARENT_PORTAL, null); = - // region - Label regionLabel =3D new Label(composite, SWT.LEFT); - regionLabel.setText(PAGE_REGION_LABEL); - regionLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNI= NG)); - regionText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); - regionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - synchHelper.synchText(regionText, PAGE_REGION, null); + // region + Label regionLabel =3D new Label(composite, SWT.LEFT); + regionLabel.setText(PAGE_REGION_LABEL); + regionLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINN= ING)); + regionText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); + regionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + synchHelper.synchText(regionText, PAGE_REGION, null); = - // height - Label heightLabel =3D new Label(composite, SWT.LEFT); - heightLabel.setText(PORTLET_HEIGHT_LABEL); - heightLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNI= NG)); - heightText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); - heightText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - synchHelper.synchText(heightText, PORTLET_HEIGHT, null); + // height + Label heightLabel =3D new Label(composite, SWT.LEFT); + heightLabel.setText(PORTLET_HEIGHT_LABEL); + heightLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINN= ING)); + heightText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); + heightText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + synchHelper.synchText(heightText, PORTLET_HEIGHT, null); = - // initial window state - Label initialWindowStateLabel =3D new Label(composite, SWT.LEFT); - initialWindowStateLabel.setText(INITIAL_WINDOW_STATE_LABEL); - initialWindowStateLabel.setLayoutData(new GridData(GridData.HORIZONTAL_A= LIGN_BEGINNING)); - initialWindowStateCombo =3D new Combo(composite,SWT.READ_ONLY); - initialWindowStateCombo.setLayoutData(new GridData(GridData.FILL_HORIZON= TAL)); = - initialWindowStateCombo.setItems(new String[] {"maximized","minimized","= normal"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - synchHelper.synchCombo(initialWindowStateCombo, INITIAL_WINDOW_STATE, nu= ll); + // initial window state + Label initialWindowStateLabel =3D new Label(composite, SWT.LEFT); + initialWindowStateLabel.setText(INITIAL_WINDOW_STATE_LABEL); + initialWindowStateLabel.setLayoutData(new GridData(GridData.HORIZONTAL_= ALIGN_BEGINNING)); + initialWindowStateCombo =3D new Combo(composite,SWT.READ_ONLY); + initialWindowStateCombo.setLayoutData(new GridData(GridData.FILL_HORIZO= NTAL)); = + initialWindowStateCombo.setItems(new String[] {"maximized","minimized",= "normal"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + synchHelper.synchCombo(initialWindowStateCombo, INITIAL_WINDOW_STATE, n= ull); = - addPortlet.addSelectionListener(new SelectionAdapter() { + addPortlet.addSelectionListener(new SelectionAdapter() { = - public void widgetSelected(SelectionEvent e) { - enableJBossProperties(); - } - }); - enableJBossProperties(); + public void widgetSelected(SelectionEvent e) { + enableJBossProperties(); + } + }); + enableJBossProperties(); = - if (isJSFPortlet() || isSeamPortlet()) { - final Button addJBossApp =3D new Button(composite, SWT.CHECK); - addJBossApp.setText(ADD_JBOSS_APP_LABEL); - gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.horizontalSpan =3D 2; - addJBossApp.setLayoutData(gd); - synchHelper.synchCheckbox(addJBossApp, ADD_JBOSS_APP, null); + if (isJSFPortlet() || isSeamPortlet()) { + final Button addJBossApp =3D new Button(composite, SWT.CHECK); + addJBossApp.setText(ADD_JBOSS_APP_LABEL); + gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + gd.horizontalSpan =3D 2; + addJBossApp.setLayoutData(gd); + synchHelper.synchCheckbox(addJBossApp, ADD_JBOSS_APP, null); = - // JBoss Application Name - Label jbossAppLabel =3D new Label(composite, SWT.LEFT); - jbossAppLabel.setText(JBOSS_APP_LABEL); - jbossAppLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGI= NNING)); - final Text jbossAppText =3D new Text(composite, SWT.SINGLE | SWT.BORDER= ); - jbossAppText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - synchHelper.synchText(jbossAppText, JBOSS_APP, null); + // JBoss Application Name + Label jbossAppLabel =3D new Label(composite, SWT.LEFT); + jbossAppLabel.setText(JBOSS_APP_LABEL); + jbossAppLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEG= INNING)); + final Text jbossAppText =3D new Text(composite, SWT.SINGLE | SWT.BORDE= R); + jbossAppText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + synchHelper.synchText(jbossAppText, JBOSS_APP, null); = - addJBossApp.addSelectionListener(new SelectionAdapter() { + addJBossApp.addSelectionListener(new SelectionAdapter() { = - public void widgetSelected(SelectionEvent e) { - boolean enable =3D addJBossApp.getSelection(); - jbossAppText.setEnabled(enable); + public void widgetSelected(SelectionEvent e) { + boolean enable =3D addJBossApp.getSelection(); + jbossAppText.setEnabled(enable); = - } - }); + } + }); = - addJBossApp.setSelection(isJBossPortal); - jbossAppText.setEnabled(addJBossApp.getSelection()); + addJBossApp.setSelection(isJBossPortal); + jbossAppText.setEnabled(addJBossApp.getSelection()); = - final Button addJBossPortlet =3D new Button(composite, SWT.CHECK); - addJBossPortlet.setText(ADD_JBOSS_PORTLET_LABEL); - gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.horizontalSpan =3D 2; - addJBossPortlet.setLayoutData(gd); - synchHelper.synchCheckbox(addJBossPortlet, ADD_JBOSS_PORTLET, null); + final Button addJBossPortlet =3D new Button(composite, SWT.CHECK); + addJBossPortlet.setText(ADD_JBOSS_PORTLET_LABEL); + gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + gd.horizontalSpan =3D 2; + addJBossPortlet.setLayoutData(gd); + synchHelper.synchCheckbox(addJBossPortlet, ADD_JBOSS_PORTLET, null); + } + } = - final Button copyJSFTemplates =3D new Button(composite, SWT.CHECK); - copyJSFTemplates.setText(COPY_JSF_TEMPLATES_LABEL); - gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.horizontalSpan =3D 2; - copyJSFTemplates.setLayoutData(gd); - synchHelper.synchCheckbox(copyJSFTemplates, COPY_JSF_TEMPLATES, null); + final Button copyJSFTemplates =3D new Button(composite, SWT.CHECK); + copyJSFTemplates.setText(COPY_JSF_TEMPLATES_LABEL); + gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + gd.horizontalSpan =3D 2; + copyJSFTemplates.setLayoutData(gd); + synchHelper.synchCheckbox(copyJSFTemplates, COPY_JSF_TEMPLATES, null); = - boolean isGateIn =3D PortletUIActivator.isGateIn(model); - model.setBooleanProperty(CONFIGURE_GATEIN_PARAMETERS, isGateIn); + model.setBooleanProperty(CONFIGURE_GATEIN_PARAMETERS, isGateIn); = - final Button configureGateIn =3D new Button(composite, SWT.CHECK); - configureGateIn.setText(CONFIGURE_GATEIN_PARAMETERS_LABEL); - gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.horizontalSpan =3D 2; - configureGateIn.setLayoutData(gd); - synchHelper.synchCheckbox(configureGateIn, CONFIGURE_GATEIN_PARAMETERS,= null); + final Button configureGateIn =3D new Button(composite, SWT.CHECK); + configureGateIn.setText(CONFIGURE_GATEIN_PARAMETERS_LABEL); + gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + gd.horizontalSpan =3D 2; + configureGateIn.setLayoutData(gd); + synchHelper.synchCheckbox(configureGateIn, CONFIGURE_GATEIN_PARAMETERS, = null); = - } + = } = public boolean canFlipToNextPage() { --===============0945568259407327017==-- From jbosstools-commits at lists.jboss.org Tue May 4 17:06:51 2010 Content-Type: multipart/mixed; boundary="===============5643813084337500317==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21899 - branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/wizard. Date: Tue, 04 May 2010 17:06:50 -0400 Message-ID: <201005042106.o44L6oxc020401@svn01.web.mwc.hst.phx2.redhat.com> --===============5643813084337500317== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-04 17:06:50 -0400 (Tue, 04 May 2010) New Revision: 21899 Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src= /org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java Log: https://jira.jboss.org/jira/browse/JBDS-1214 EPP 5.0 Compatibility Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .ui/src/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPag= e.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/sr= c/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java= 2010-05-04 21:01:19 UTC (rev 21898) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/sr= c/org/jboss/tools/portlet/ui/internal/wizard/AddJBossPortletWizardPage.java= 2010-05-04 21:06:50 UTC (rev 21899) @@ -117,141 +117,148 @@ = boolean isJBossPortal =3D PortletUIActivator.isJBossPortalRuntime(model); model.setBooleanProperty(ADD_PORTLET, isJBossPortal); + boolean isGateIn =3D PortletUIActivator.isGateIn(model); + if (isGateIn) { + model.setBooleanProperty(ADD_JBOSS_APP, false); + model.setBooleanProperty(ADD_JBOSS_PORTLET, false); + } + GridData gd; + if (isJBossPortal) { + addPortlet =3D new Button(composite,SWT.CHECK); + addPortlet.setText(ADD_PORTLET_LABEL); + gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + gd.horizontalSpan =3D 2; + addPortlet.setLayoutData(gd); + synchHelper.synchCheckbox(addPortlet, ADD_PORTLET, null); = - addPortlet =3D new Button(composite,SWT.CHECK); - addPortlet.setText(ADD_PORTLET_LABEL); - GridData gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.horizontalSpan =3D 2; - addPortlet.setLayoutData(gd); - synchHelper.synchCheckbox(addPortlet, ADD_PORTLET, null); + // if exists + Label ifExistsLabel =3D new Label(composite, SWT.LEFT); + ifExistsLabel.setText(IF_EXISTS_LABEL); + ifExistsLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGI= NNING)); + ifExistsCombo =3D new Combo(composite,SWT.READ_ONLY); + ifExistsCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); = + ifExistsCombo.setItems(new String[] {"overwrite","keep"}); //$NON-NLS-1= $ //$NON-NLS-2$ + synchHelper.synchCombo(ifExistsCombo, IF_EXISTS, null); = - // if exists - Label ifExistsLabel =3D new Label(composite, SWT.LEFT); - ifExistsLabel.setText(IF_EXISTS_LABEL); - ifExistsLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGIN= NING)); - ifExistsCombo =3D new Combo(composite,SWT.READ_ONLY); - ifExistsCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); = - ifExistsCombo.setItems(new String[] {"overwrite","keep"}); //$NON-NLS-1$= //$NON-NLS-2$ - synchHelper.synchCombo(ifExistsCombo, IF_EXISTS, null); - = - // instance name - Label instanceNameLabel =3D new Label(composite, SWT.LEFT); - instanceNameLabel.setText(INSTANCE_NAME_LABEL); - instanceNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_B= EGINNING)); - instanceNameText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); - instanceNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - synchHelper.synchText(instanceNameText, INSTANCE_NAME, null); + // instance name + Label instanceNameLabel =3D new Label(composite, SWT.LEFT); + instanceNameLabel.setText(INSTANCE_NAME_LABEL); + instanceNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_= BEGINNING)); + instanceNameText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); + instanceNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + synchHelper.synchText(instanceNameText, INSTANCE_NAME, null); = - // window name - Label pageNameLabel =3D new Label(composite, SWT.LEFT); - pageNameLabel.setText(PAGE_NAME_LABEL); - pageNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGIN= NING)); - pageNameText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); - pageNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - synchHelper.synchText(pageNameText, PAGE_NAME, null); + // window name + Label pageNameLabel =3D new Label(composite, SWT.LEFT); + pageNameLabel.setText(PAGE_NAME_LABEL); + pageNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGI= NNING)); + pageNameText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); + pageNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + synchHelper.synchText(pageNameText, PAGE_NAME, null); = - // window name - Label windowNameLabel =3D new Label(composite, SWT.LEFT); - windowNameLabel.setText(WINDOW_NAME_LABEL); - windowNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEG= INNING)); - windowNameText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); - windowNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - synchHelper.synchText(windowNameText, WINDOW_NAME, null); + // window name + Label windowNameLabel =3D new Label(composite, SWT.LEFT); + windowNameLabel.setText(WINDOW_NAME_LABEL); + windowNameLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BE= GINNING)); + windowNameText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); + windowNameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + synchHelper.synchText(windowNameText, WINDOW_NAME, null); = - // parent reference - Label parentReferenceLabel =3D new Label(composite, SWT.LEFT); - parentReferenceLabel.setText(PARENT_PORTAL_LABEL); - parentReferenceLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIG= N_BEGINNING)); - parentReferenceText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); - parentReferenceText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)= ); - synchHelper.synchText(parentReferenceText, PARENT_PORTAL, null); + // parent reference + Label parentReferenceLabel =3D new Label(composite, SWT.LEFT); + parentReferenceLabel.setText(PARENT_PORTAL_LABEL); + parentReferenceLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALI= GN_BEGINNING)); + parentReferenceText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); + parentReferenceText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL= )); + synchHelper.synchText(parentReferenceText, PARENT_PORTAL, null); = - // region - Label regionLabel =3D new Label(composite, SWT.LEFT); - regionLabel.setText(PAGE_REGION_LABEL); - regionLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNI= NG)); - regionText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); - regionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - synchHelper.synchText(regionText, PAGE_REGION, null); + // region + Label regionLabel =3D new Label(composite, SWT.LEFT); + regionLabel.setText(PAGE_REGION_LABEL); + regionLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINN= ING)); + regionText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); + regionText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + synchHelper.synchText(regionText, PAGE_REGION, null); = - // height - Label heightLabel =3D new Label(composite, SWT.LEFT); - heightLabel.setText(PORTLET_HEIGHT_LABEL); - heightLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNI= NG)); - heightText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); - heightText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - synchHelper.synchText(heightText, PORTLET_HEIGHT, null); + // height + Label heightLabel =3D new Label(composite, SWT.LEFT); + heightLabel.setText(PORTLET_HEIGHT_LABEL); + heightLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINN= ING)); + heightText =3D new Text(composite, SWT.SINGLE | SWT.BORDER); + heightText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + synchHelper.synchText(heightText, PORTLET_HEIGHT, null); = - // initial window state - Label initialWindowStateLabel =3D new Label(composite, SWT.LEFT); - initialWindowStateLabel.setText(INITIAL_WINDOW_STATE_LABEL); - initialWindowStateLabel.setLayoutData(new GridData(GridData.HORIZONTAL_A= LIGN_BEGINNING)); - initialWindowStateCombo =3D new Combo(composite,SWT.READ_ONLY); - initialWindowStateCombo.setLayoutData(new GridData(GridData.FILL_HORIZON= TAL)); = - initialWindowStateCombo.setItems(new String[] {"maximized","minimized","= normal"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - synchHelper.synchCombo(initialWindowStateCombo, INITIAL_WINDOW_STATE, nu= ll); + // initial window state + Label initialWindowStateLabel =3D new Label(composite, SWT.LEFT); + initialWindowStateLabel.setText(INITIAL_WINDOW_STATE_LABEL); + initialWindowStateLabel.setLayoutData(new GridData(GridData.HORIZONTAL_= ALIGN_BEGINNING)); + initialWindowStateCombo =3D new Combo(composite,SWT.READ_ONLY); + initialWindowStateCombo.setLayoutData(new GridData(GridData.FILL_HORIZO= NTAL)); = + initialWindowStateCombo.setItems(new String[] {"maximized","minimized",= "normal"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + synchHelper.synchCombo(initialWindowStateCombo, INITIAL_WINDOW_STATE, n= ull); = - addPortlet.addSelectionListener(new SelectionAdapter() { + addPortlet.addSelectionListener(new SelectionAdapter() { = - public void widgetSelected(SelectionEvent e) { - enableJBossProperties(); - } - }); - enableJBossProperties(); + public void widgetSelected(SelectionEvent e) { + enableJBossProperties(); + } + }); + enableJBossProperties(); = - if (isJSFPortlet() || isSeamPortlet()) { - final Button addJBossApp =3D new Button(composite, SWT.CHECK); - addJBossApp.setText(ADD_JBOSS_APP_LABEL); - gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.horizontalSpan =3D 2; - addJBossApp.setLayoutData(gd); - synchHelper.synchCheckbox(addJBossApp, ADD_JBOSS_APP, null); + if (isJSFPortlet() || isSeamPortlet()) { + final Button addJBossApp =3D new Button(composite, SWT.CHECK); + addJBossApp.setText(ADD_JBOSS_APP_LABEL); + gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + gd.horizontalSpan =3D 2; + addJBossApp.setLayoutData(gd); + synchHelper.synchCheckbox(addJBossApp, ADD_JBOSS_APP, null); = - // JBoss Application Name - Label jbossAppLabel =3D new Label(composite, SWT.LEFT); - jbossAppLabel.setText(JBOSS_APP_LABEL); - jbossAppLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGI= NNING)); - final Text jbossAppText =3D new Text(composite, SWT.SINGLE | SWT.BORDER= ); - jbossAppText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - synchHelper.synchText(jbossAppText, JBOSS_APP, null); + // JBoss Application Name + Label jbossAppLabel =3D new Label(composite, SWT.LEFT); + jbossAppLabel.setText(JBOSS_APP_LABEL); + jbossAppLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEG= INNING)); + final Text jbossAppText =3D new Text(composite, SWT.SINGLE | SWT.BORDE= R); + jbossAppText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + synchHelper.synchText(jbossAppText, JBOSS_APP, null); = - addJBossApp.addSelectionListener(new SelectionAdapter() { + addJBossApp.addSelectionListener(new SelectionAdapter() { = - public void widgetSelected(SelectionEvent e) { - boolean enable =3D addJBossApp.getSelection(); - jbossAppText.setEnabled(enable); + public void widgetSelected(SelectionEvent e) { + boolean enable =3D addJBossApp.getSelection(); + jbossAppText.setEnabled(enable); = - } - }); + } + }); = - addJBossApp.setSelection(isJBossPortal); - jbossAppText.setEnabled(addJBossApp.getSelection()); + addJBossApp.setSelection(isJBossPortal); + jbossAppText.setEnabled(addJBossApp.getSelection()); = - final Button addJBossPortlet =3D new Button(composite, SWT.CHECK); - addJBossPortlet.setText(ADD_JBOSS_PORTLET_LABEL); - gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.horizontalSpan =3D 2; - addJBossPortlet.setLayoutData(gd); - synchHelper.synchCheckbox(addJBossPortlet, ADD_JBOSS_PORTLET, null); + final Button addJBossPortlet =3D new Button(composite, SWT.CHECK); + addJBossPortlet.setText(ADD_JBOSS_PORTLET_LABEL); + gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + gd.horizontalSpan =3D 2; + addJBossPortlet.setLayoutData(gd); + synchHelper.synchCheckbox(addJBossPortlet, ADD_JBOSS_PORTLET, null); + } + } = - final Button copyJSFTemplates =3D new Button(composite, SWT.CHECK); - copyJSFTemplates.setText(COPY_JSF_TEMPLATES_LABEL); - gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.horizontalSpan =3D 2; - copyJSFTemplates.setLayoutData(gd); - synchHelper.synchCheckbox(copyJSFTemplates, COPY_JSF_TEMPLATES, null); + final Button copyJSFTemplates =3D new Button(composite, SWT.CHECK); + copyJSFTemplates.setText(COPY_JSF_TEMPLATES_LABEL); + gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + gd.horizontalSpan =3D 2; + copyJSFTemplates.setLayoutData(gd); + synchHelper.synchCheckbox(copyJSFTemplates, COPY_JSF_TEMPLATES, null); = - boolean isGateIn =3D PortletUIActivator.isGateIn(model); - model.setBooleanProperty(CONFIGURE_GATEIN_PARAMETERS, isGateIn); + model.setBooleanProperty(CONFIGURE_GATEIN_PARAMETERS, isGateIn); = - final Button configureGateIn =3D new Button(composite, SWT.CHECK); - configureGateIn.setText(CONFIGURE_GATEIN_PARAMETERS_LABEL); - gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); - gd.horizontalSpan =3D 2; - configureGateIn.setLayoutData(gd); - synchHelper.synchCheckbox(configureGateIn, CONFIGURE_GATEIN_PARAMETERS,= null); + final Button configureGateIn =3D new Button(composite, SWT.CHECK); + configureGateIn.setText(CONFIGURE_GATEIN_PARAMETERS_LABEL); + gd =3D new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING); + gd.horizontalSpan =3D 2; + configureGateIn.setLayoutData(gd); + synchHelper.synchCheckbox(configureGateIn, CONFIGURE_GATEIN_PARAMETERS, = null); = - } + = } = public boolean canFlipToNextPage() { --===============5643813084337500317==-- From jbosstools-commits at lists.jboss.org Wed May 5 04:01:05 2010 Content-Type: multipart/mixed; boundary="===============0238962914547825779==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21900 - in trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config: requirement and 1 other directory. Date: Wed, 05 May 2010 04:01:05 -0400 Message-ID: <201005050801.o458150F021638@svn01.web.mwc.hst.phx2.redhat.com> --===============0238962914547825779== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: lzoubek(a)redhat.com Date: 2010-05-05 04:01:05 -0400 (Wed, 05 May 2010) New Revision: 21900 Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/PrepareViews.java Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/ConfiguredState.java Log: SWTBotExt : added prepare views requirement Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/ConfiguredState.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/ConfiguredState.java 2010-05-04 21:06:50 UTC (rev 21899) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/ConfiguredState.java 2010-05-05 08:01:05 UTC (rev 21900) @@ -9,21 +9,23 @@ * this class represents state of running test suite. Properties of this o= bject * should be changed only by classed extending {@link RequirementBase} cla= ss. * = - * @author lzoubek + * @author lzoubek(a)redhat.com * = */ public class ConfiguredState { private List jreList =3D new Vector(); private Server server =3D new Server(); private Seam seam =3D new Seam(); - private boolean welcomeViewVisible =3D true; + private ESB esb =3D new ESB(); = - public boolean isWelcomeViewVisible() { - return welcomeViewVisible; + private boolean viewsPrepared =3D false; + + public boolean isViewsPrepared() { + return viewsPrepared; } = - public void setWelcomeViewVisible(boolean welcomeViewVisible) { - this.welcomeViewVisible =3D welcomeViewVisible; + public void setViewsPrepared(boolean viewsPrepared) { + this.viewsPrepared =3D viewsPrepared; } = /** @@ -53,6 +55,15 @@ return server; } = + /** + * gets configured esb + * = + * @return + */ + public ESB getEsb() { + return esb; + } + public class Server { /** * is server runtime & server added? @@ -95,4 +106,19 @@ */ public String name =3D null; } + + public class ESB { + /** + * version of ESB runtime + */ + public String version =3D null; + /** + * is configured? + */ + public boolean isConfiured =3D false; + /** + * name of added runtime + */ + public String name =3D null; + } } Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bo= t/ext/config/requirement/PrepareViews.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/PrepareViews.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/PrepareViews.java 2010-05-05 08:01:05 UTC (rev 21900) @@ -0,0 +1,47 @@ +package org.jboss.tools.ui.bot.ext.config.requirement; + +import java.util.List; +import java.util.Vector; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.gen.IView; + +/** + * this is a special requirement which should run only once, main aim of t= his is to prepare + * and setup views behavior (e.g. force Console View not to steal focus) = + * @author lzoubek(a)redhat.com + * + */ +public class PrepareViews extends RequirementBase { + + @Override + public boolean checkFulfilled() { + return SWTTestExt.configuredState.isViewsPrepared(); + } + + @Override + public void handle() { = + SWTTestExt.open.viewClose(new IView(){ + public List getGroupPath() { + // TODO Auto-generated method stub + return new Vector(); + } + public String getName() { + // TODO Auto-generated method stub + return "Welcome"; + }}); + = + // force console view not to steal focus when something happens + try { + SWTBotView consoleView =3D SWTTestExt.console.show(); + consoleView.toolbarToggleButton("Show Console When Standard Out Changes"= ).deselect(); + consoleView.toolbarToggleButton("Show Console When Standard Error Change= s").deselect(); + } catch (Exception ex) { + // do nothing since buttons must not always be available = + } + SWTTestExt.configuredState.setViewsPrepared(true); + + } + +} Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jbo= ss/tools/ui/bot/ext/config/requirement/PrepareViews.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============0238962914547825779==-- From jbosstools-commits at lists.jboss.org Wed May 5 04:11:39 2010 Content-Type: multipart/mixed; boundary="===============4772056171243324382==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21901 - in trunk/jst/tests/org.jboss.tools.ui.bot.ext: src/org/jboss/tools/ui/bot/ext and 3 other directories. Date: Wed, 05 May 2010 04:11:39 -0400 Message-ID: <201005050811.o458BdKH028787@svn01.web.mwc.hst.phx2.redhat.com> --===============4772056171243324382== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: lzoubek(a)redhat.com Date: 2010-05-05 04:11:37 -0400 (Wed, 05 May 2010) New Revision: 21901 Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/ESBBean.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/AddESB.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/AddJava.java Removed: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/AddJRE.java Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.= properties trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTEclipseExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTOpenExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/Annotations.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/TestConfigurator.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/AddServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/ClearWorkspace.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/PrepareViews.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/RequirementBase.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/IDELabel.java Log: SWTBotExt : add esb runtime annotations, preparing views, small fixes Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-d= efault.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default= .properties 2010-05-05 08:01:05 UTC (rev 21900) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default= .properties 2010-05-05 08:11:37 UTC (rev 21901) @@ -6,3 +6,4 @@ SERVER=3DEAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as #, SEAM=3D2.2,/data/jboss/jboss-eap-5.0/seam +ESB=3D4.7,/data/jboss/esb-4.7 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTEclipseExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-05 08:01:05 UTC (rev 21900) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-05 08:11:37 UTC (rev 21901) @@ -477,7 +477,24 @@ open.finish(wiz, IDELabel.Button.OK); } } - + public void addESBRuntime(String name, String version, String runtimeHome= ) { + SWTBot wiz =3D open.preferenceOpen(ActionItem.Preference.JBossToolsJBoss= ESBRuntimes.LABEL); + wiz.button("Add").click(); + bot.shell(IDELabel.Shell.NEW_ESB_RUNTIME).activate(); + bot.text(0).setText(name); + bot.text(1).setText(runtimeHome); + String[] versions =3D bot.comboBox().items(); + int myIndex =3D0; + for (int index=3D0;index iter =3D item.getGroupPath().iterator(); - = + if (iter.hasNext()) { String next =3D iter.next(); - ti =3D bot.tree().expandNode(next); = + ti =3D bot.tree().expandNode(next); try { while (iter.hasNext()) { next =3D iter.next(); - // expanding node is failing, so try to collapse and expand it again= = + // expanding node is failing, so try to collapse and + // expand it again ti.expand(); - ti =3D ti.expandNode(next); = + ti =3D ti.expandNode(next); } - next =3D item.getName(); = - ti.expandNode(next).select(); - } - catch (WidgetNotFoundException ex) { - log.warn("Tree item '"+next+"' was not found, trying to collapse and = reexpand parent node"); + next =3D item.getName(); + ti.expandNode(next).select(); + } catch (WidgetNotFoundException ex) { + log + .warn("Tree item '" + + next + + "' was not found, trying to collapse and reexpand parent node"); ti.collapse(); ti.expand(); ti.select(); @@ -113,9 +115,10 @@ bot.tree().select(item.getName()); } } catch (WidgetNotFoundException ex) { - String exStr=3D"Item '"+ ActionItem.getItemString(item)+ "' does not ex= ist in tree"; - if (ti!=3Dnull) { - exStr+=3D", last selected item was '"+ti.getText()+"'"; + String exStr =3D "Item '" + ActionItem.getItemString(item) + + "' does not exist in tree"; + if (ti !=3D null) { + exStr +=3D ", last selected item was '" + ti.getText() + "'"; } throw new WidgetNotFoundException(exStr, ex); } @@ -146,7 +149,7 @@ shell.activate(); bot.table().select(perspective.getName()); bot.button("OK").click(); - log.info("Perspective switched to '"+perspective.getName()+"'"); + log.info("Perspective switched to '" + perspective.getName() + "'"); } = /** @@ -165,7 +168,7 @@ bot.button("Next >").click(); return bot; } - = + /** * Wait for appearance shell of given name * = @@ -218,14 +221,28 @@ SWTBotButton btn =3D bot.button("Cancel"); btn.click(); } + /** * clicks given button on active shell and waits until shell disappears - * @param bot = + * = + * @param bot * @param finishButtonText */ public void finish(SWTBot bot, String finishButtonText) { - long timeout =3D480*1000; - = + finish(bot, finishButtonText,false); + } + + /** + * clicks given button on active shell and waits until shell disappears + * = + * @param bot + * @param finishButtonText + * @param autoCloseShells true if you want close all possibly risen shell= s when closing = + */ + public void finish(SWTBot bot, String finishButtonText, + boolean autoCloseShells) { + long timeout =3D 480 * 1000; + SWTBotShell activeShell =3D bot.activeShell(); String activeShellStr =3D bot.activeShell().getText(); bot.button(finishButtonText).click(); @@ -234,38 +251,58 @@ log.info("Waiting until shell '" + activeShellStr + "' closes"); try { bot.waitUntil(shellCloses(activeShell)); - log.info("OK, shell '"+activeShellStr+"' closed."); + log.info("OK, shell '" + activeShellStr + "' closed."); return; } catch (TimeoutException ex) { - String currentShellStr =3D bot.activeShell().getText(); - if (!activeShellStr.equals(currentShellStr)) { - log.error("Unexpected shell '"+currentShellStr+"': ["+SWTUtilExt.getA= llBotWidgetsAsText(bot)+"] appeared, when waiting for shell to close"); - bot.activeShell().close(); - log.info("Shell '"+currentShellStr+"' closed."); + if (autoCloseShells) { + String currentShellStr =3D bot.activeShell().getText(); + if (!activeShellStr.equals(currentShellStr)) { + log + .error("Unexpected shell '" + + currentShellStr + + "': [" + + SWTUtilExt + .getAllBotWidgetsAsText(bot) + + "] appeared, when waiting for shell to close"); + bot.activeShell().close(); + log.info("Shell '" + currentShellStr + "' closed, clicking finish bu= tton again."); + bot.button(finishButtonText).click(); + } } - if (System.currentTimeMillis()-time>timeout) { - log.error("Shell '"+activeShellStr+"' probably hanged up (480s timeou= t), returning, forcing to close it, expect errors"); + if (System.currentTimeMillis() - time > timeout) { + log + .error("Shell '" + + activeShellStr + + "' probably hanged up (480s timeout), returning, forcing to clo= se it, expect errors"); try { bot.activeShell().close(); activeShell.close(); bot.waitUntil(shellCloses(activeShell)); - log.info("Shell '"+activeShellStr+"' was forced to close."); + log.info("Shell '" + activeShellStr + + "' was forced to close."); return; - } - catch (Exception e) { + } catch (Exception e) { e.printStackTrace(); } - throw new WidgetNotFoundException("Shell '"+activeShellStr+"' did not= close after timeout", ex); + throw new WidgetNotFoundException("Shell '" + + activeShellStr + "' did not close after timeout", + ex); } log.warn("Shell '" + activeShellStr + "' is still opened"); } } } + /** * clicks 'Finish' button on active shell and waits until shell disappears + * = * @param bot */ public void finish(SWTBot bot) { - finish(bot,"Finish"); + finish(bot, "Finish",false); } + + public void finish(SWTBot bot, boolean autoCloseShells) { + finish(bot, "Finish",autoCloseShells); + } } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/Annotations.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/Annotations.java 2010-05-05 08:01:05 UTC (rev 21900) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/Annotations.java 2010-05-05 08:11:37 UTC (rev 21901) @@ -35,6 +35,11 @@ */ Seam seam() default @Seam( required =3D false ); /** + * optionally require ESB runtime + * @return + */ + ESB esb() default @ESB( required =3D false); + /** * name of perspective to run within * @return */ @@ -93,17 +98,41 @@ */ boolean required() default true; /** - * version of required server (use * for all) + * version of required runtime (use * for all) * @return */ String version() default "*"; /** - * defines operator on server, possible values (=3D,<,>=3D<=3D,>=3D,!=3D= ) default =3D + * defines operator on runtime version, possible values (=3D,<,>=3D<=3D,= >=3D,!=3D) default =3D * @return */ String operator() default "=3D"; = } + /** + * = + * @author lzoubek(a)redhat.com + * + */ + @Retention(RetentionPolicy.RUNTIME) + public @interface ESB { + /** + * true if ESB is required (default) + * @return + */ + boolean required() default true; + /** + * version of required runtime (use * for all) + * @return + */ + String version() default "*"; + /** + * defines operator on runtime version, possible values (=3D,<,>=3D<=3D,= >=3D,!=3D) default =3D + * @return + */ + String operator() default "=3D"; + = + } public enum ServerType { /** * EAP Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bo= t/ext/config/ESBBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/ESBBean.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/ESBBean.java 2010-05-05 08:11:37 UTC (rev 21901) @@ -0,0 +1,19 @@ +package org.jboss.tools.ui.bot.ext.config; + +public class ESBBean { + public String version; + public String esbHome; + = + public static ESBBean fromString(String propValue) throws Exception{ + try { + String[] esbParams =3D propValue.split(","); + ESBBean bean =3D new ESBBean(); + bean.esbHome=3DesbParams[1]; + bean.version=3DesbParams[0]; + return bean; + } + catch (Exception ex) { + throw new Exception("Cannot parse ESB property line",ex); + } + } +} Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jbo= ss/tools/ui/bot/ext/config/ESBBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/TestConfigurator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/TestConfigurator.java 2010-05-05 08:01:05 UTC (rev 21900) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/TestConfigurator.java 2010-05-05 08:11:37 UTC (rev 21901) @@ -13,6 +13,7 @@ import org.apache.log4j.Logger; import org.jboss.tools.ui.bot.ext.Activator; import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.ESB; import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; @@ -27,6 +28,7 @@ public static final String SEAM =3D "SEAM"; public static final String JAVA_HOME_15 =3D "JAVA_HOME_15"; public static final String JAVA_HOME_16 =3D "JAVA_HOME_16"; + public static final String ESB =3D "ESB"; } = public class Values { @@ -39,6 +41,7 @@ private static Properties swtTestProperties =3D new Properties(); public static ServerBean server; public static SeamBean seam; + public static ESBBean esb; static { try { // try to load from file first @@ -78,6 +81,7 @@ try { server =3D ServerBean.fromString(getProperty(Keys.SERVER)); seam =3D SeamBean.fromString(getProperty(Keys.SEAM)); + esb =3D ESBBean.fromString(getProperty(Keys.ESB)); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -93,10 +97,11 @@ checkDirExists(getProperty(Keys.JAVA_HOME_16)); checkDirExists(seam.seamHome); checkDirExists(server.runtimeHome); + checkDirExists(esb.esbHome); return true; } catch (Exception ex) { - log.error(ex.getMessage()+ " incorrect configuration, set your custom p= roperties file via 'swtbot.test.properties.file' java property"); + log.error("'"+ex.getMessage()+ "' - incorrect configuration, set your c= ustom properties file via '"+SWTBOT_TEST_PROPERTIES_FILE+"' java property"); return false; } = @@ -153,6 +158,15 @@ } return RequirementBase.createAddSeam(); } + private static RequirementBase getESBRequirement(ESB e) { + if (!e.required()) { + return null; + } + if (!matches(esb.version, e.operator(), e.version())) { + return null; + } + return RequirementBase.createAddESB(); + } = /** * returns list of requirements if given class (Test) can run, all this is @@ -165,6 +179,7 @@ .getAnnotation(SWTBotTestRequires.class); // internal list List reqs =3D new ArrayList(); + reqs.add(RequirementBase.createPrepareViews()); // all not annotated classes can run if (requies =3D=3D null) { return reqs; @@ -183,6 +198,13 @@ } reqs.add(req); } + if (requies.esb().required()) { + RequirementBase req =3D getESBRequirement(requies.esb()); + if (req =3D=3D null) { + return null; + } + reqs.add(req); + } if (!"".equals(requies.perspective())) { reqs.add(RequirementBase.createSwitchPerspective(requies .perspective())); Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bo= t/ext/config/requirement/AddESB.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddESB.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddESB.java 2010-05-05 08:11:37 UTC (rev 21901) @@ -0,0 +1,23 @@ +package org.jboss.tools.ui.bot.ext.config.requirement; + +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.TestConfigurator; + +public class AddESB extends RequirementBase { + + @Override + public boolean checkFulfilled() { + return SWTTestExt.configuredState.getEsb().isConfiured; + } + + @Override + public void handle() { + String esbName =3D "ESB-"+TestConfigurator.esb.version; + SWTTestExt.eclipse.addESBRuntime(esbName,TestConfigurator.esb.version,Te= stConfigurator.esb.esbHome); + SWTTestExt.configuredState.getEsb().isConfiured=3Dtrue; + SWTTestExt.configuredState.getEsb().name=3DesbName; + SWTTestExt.configuredState.getEsb().version=3DTestConfigurator.esb.versi= on; = + + } + +} Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jbo= ss/tools/ui/bot/ext/config/requirement/AddESB.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/= bot/ext/config/requirement/AddJRE.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddJRE.java 2010-05-05 08:01:05 UTC (rev 21900) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddJRE.java 2010-05-05 08:11:37 UTC (rev 21901) @@ -1,48 +0,0 @@ -package org.jboss.tools.ui.bot.ext.config.requirement; - -import static org.junit.Assert.fail; -import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.config.TestConfigurator; -/** - * adds JRE among Installed JRE's - * @author lzoubek - * - */ -public class AddJRE extends RequirementBase { - - private final String version; - /** - * requirement for adding JRE - * @param version to add - */ - public AddJRE(String version) { - this.version =3D version; - } - @Override - public boolean checkFulfilled() { - return SWTTestExt.configuredState.getJreList().contains(getAddedAsName()= ); - } - - @Override - public void handle(){ - SWTTestExt.eclipse.addJavaVM(getAddedAsName(), getJavaHome()); - SWTTestExt.configuredState.getJreList().add(getAddedAsName()); - } - public String getAddedAsName() { - return "JRE-"+version; - } - private String getJavaHome() { - if ("1.5".equals(version)) { - return TestConfigurator.getProperty(TestConfigurator.Keys.JAVA_HOME_15); - } - if ("1.6".equals(version)) { - return TestConfigurator.getProperty(TestConfigurator.Keys.JAVA_HOME_16); - } - failParsing(); - return null; - } - private void failParsing() { - fail("Unable to add JRE runtime, unsupported verson :"+version); - } - -} Copied: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/b= ot/ext/config/requirement/AddJava.java (from rev 21883, trunk/jst/tests/org= .jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/A= ddJRE.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddJava.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddJava.java 2010-05-05 08:11:37 UTC (rev 21901) @@ -0,0 +1,48 @@ +package org.jboss.tools.ui.bot.ext.config.requirement; + +import static org.junit.Assert.fail; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.TestConfigurator; +/** + * adds JRE among Installed JRE's + * @author lzoubek + * + */ +public class AddJava extends RequirementBase { + + private final String version; + /** + * requirement for adding JRE + * @param version to add + */ + public AddJava(String version) { + this.version =3D version; + } + @Override + public boolean checkFulfilled() { + return SWTTestExt.configuredState.getJreList().contains(getAddedAsName()= ); + } + + @Override + public void handle(){ + SWTTestExt.eclipse.addJavaVM(getAddedAsName(), getJavaHome()); + SWTTestExt.configuredState.getJreList().add(getAddedAsName()); + } + public String getAddedAsName() { + return "JRE-"+version; + } + private String getJavaHome() { + if ("1.5".equals(version)) { + return TestConfigurator.getProperty(TestConfigurator.Keys.JAVA_HOME_15); + } + if ("1.6".equals(version)) { + return TestConfigurator.getProperty(TestConfigurator.Keys.JAVA_HOME_16); + } + failParsing(); + return null; + } + private void failParsing() { + fail("Unable to add JRE runtime, unsupported verson :"+version); + } + +} Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jbo= ss/tools/ui/bot/ext/config/requirement/AddJava.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/requirement/AddServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddServer.java 2010-05-05 08:01:05 UTC (rev 21900) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddServer.java 2010-05-05 08:11:37 UTC (rev 21901) @@ -8,10 +8,12 @@ import org.jboss.tools.ui.bot.ext.gen.IServerRuntime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBos= sAS42; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBos= sAS50; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBos= sAS60; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMid= dlewareJBossEnterpriseApplicationPlatform43; import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMid= dlewareJBossEnterpriseApplicationPlatform50; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommun= ityJBoss42Runtime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommun= ityJBoss50Runtime; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommun= ityJBoss60Runtime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterp= riseMiddlewareJBossEnterpriseApplicationPlatform43Runtime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterp= riseMiddlewareJBossEnterpriseApplicationPlatform50Runtime; /** @@ -25,7 +27,7 @@ public AddServer() { String javaVer =3D getNeededJavaVersion(TestConfigurator.server.withJava= Version); if (javaVer!=3Dnull) { - AddJRE addJava =3D createAddJRE(javaVer); + AddJava addJava =3D createAddJRE(javaVer); getDependsOn().add(addJava); javaName=3DaddJava.getAddedAsName(); } @@ -73,6 +75,7 @@ return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicat= ionPlatform50Runtime.LABEL, JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50.LABEL); } + = } else if (TestConfigurator.Values.SERVER_TYPE_JBOSSAS.equals(serverType= )) { if ("4.2".equals(version)) { return new ServerInfo(JBossCommunityJBoss42Runtime.LABEL,JBossCommunit= yJBossAS42.LABEL); = @@ -80,6 +83,9 @@ if ("5.0".equals(version)) { return new ServerInfo(JBossCommunityJBoss50Runtime.LABEL,JBossCommunit= yJBossAS50.LABEL); = } + if ("6.0".equals(version)) { + return new ServerInfo(JBossCommunityJBoss60Runtime.LABEL,JBossCommunit= yJBossAS60.LABEL); = + } } failParsing(); return null; Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/requirement/ClearWorkspace.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/ClearWorkspace.java 2010-05-05 08:01:05 UTC (rev 2190= 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/ClearWorkspace.java 2010-05-05 08:11:37 UTC (rev 2190= 1) @@ -1,38 +1,19 @@ package org.jboss.tools.ui.bot.ext.config.requirement; -import java.util.List; -import java.util.Vector; - import org.jboss.tools.ui.bot.ext.SWTTestExt; -import org.jboss.tools.ui.bot.ext.gen.IView; = public class ClearWorkspace extends RequirementBase { - = + // this requirement will always run handle(); + private boolean once =3D false; @Override public boolean checkFulfilled() { - try { - return SWTTestExt.bot.shells().length=3D=3D2 && SWTTestExt.bot.editors()= .isEmpty() && !SWTTestExt.configuredState.isWelcomeViewVisible(); - } - catch (Exception ex) { - log.error("Cannot determine, if all editors and shells are closed", ex); - return false; - } + return once; } = @Override public void handle() { SWTTestExt.bot.closeAllShells(); SWTTestExt.bot.closeAllEditors(); - SWTTestExt.open.viewClose(new IView(){ - public List getGroupPath() { - // TODO Auto-generated method stub - return new Vector(); - } - public String getName() { - // TODO Auto-generated method stub - return "Welcome"; - }}); - SWTTestExt.configuredState.setWelcomeViewVisible(false); - + once =3D true; } = } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/requirement/PrepareViews.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/PrepareViews.java 2010-05-05 08:01:05 UTC (rev 21900) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/PrepareViews.java 2010-05-05 08:11:37 UTC (rev 21901) @@ -24,11 +24,9 @@ public void handle() { = SWTTestExt.open.viewClose(new IView(){ public List getGroupPath() { - // TODO Auto-generated method stub return new Vector(); } public String getName() { - // TODO Auto-generated method stub return "Welcome"; }}); = Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/requirement/RequirementBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/RequirementBase.java 2010-05-05 08:01:05 UTC (rev 219= 00) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/RequirementBase.java 2010-05-05 08:11:37 UTC (rev 219= 01) @@ -115,9 +115,13 @@ RequirementBase req =3D new AddSeam(); return req; } + public static RequirementBase createAddESB() { + RequirementBase req =3D new AddESB(); + return req; + } = - public static AddJRE createAddJRE(String version) { - AddJRE req =3D new AddJRE(version); + public static AddJava createAddJRE(String version) { + AddJava req =3D new AddJava(version); return req; } = @@ -138,5 +142,12 @@ req.setPriority(-1); return req; } + public static RequirementBase createPrepareViews() { + RequirementBase req =3D new PrepareViews(); + req.setPriority(2); + return req; + } = + = + } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/IDELabel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-05 08:01:05 UTC (rev 21900) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-05 08:11:37 UTC (rev 21901) @@ -117,7 +117,8 @@ public static final String RENAME_COMPILATION_UNIT =3D "Rename Compilat= ion Unit"; public static final String RENAME_JAVA_PROJECT =3D "Rename Java Project= "; public static final String CONFIRM_PERSPECTIVE_SWITCH =3D "Confirm Pers= pective Switch"; - public static final String NEW_SEAM_RUNTIME =3D "New Seam Runtime"; = + public static final String NEW_SEAM_RUNTIME =3D "New Seam Runtime"; + public static final String NEW_ESB_RUNTIME =3D "New JBoss ESB Runtime"; = } = public class EntityGroup { --===============4772056171243324382==-- From jbosstools-commits at lists.jboss.org Wed May 5 07:23:54 2010 Content-Type: multipart/mixed; boundary="===============5831978915641227797==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21902 - trunk/documentation/guides/GettingStartedGuide/en-US. Date: Wed, 05 May 2010 07:23:54 -0400 Message-ID: <201005051123.o45BNsUQ004937@svn01.web.mwc.hst.phx2.redhat.com> --===============5831978915641227797== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-05 07:23:53 -0400 (Wed, 05 May 2010) New Revision: 21902 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-62 Minor improvements in code l= istings. Code listing in section 3.3.1 has been updated. Modified: trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.x= ml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml 201= 0-05-05 08:11:37 UTC (rev 21901) +++ trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml 201= 0-05-05 11:23:53 UTC (rev 21902) @@ -467,14 +467,14 @@ start by adding some custom login logic. Open Authenticator.java in JBoss Develope= r Studio and replace the authenticate() method with this code: -
--===============5831978915641227797==-- From jbosstools-commits at lists.jboss.org Wed May 5 08:21:27 2010 Content-Type: multipart/mixed; boundary="===============4928502701668976671==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21903 - trunk/documentation/guides/GettingStartedGuide/en-US. Date: Wed, 05 May 2010 08:21:27 -0400 Message-ID: <201005051221.o45CLRtZ018095@svn01.web.mwc.hst.phx2.redhat.com> --===============4928502701668976671== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-05 08:21:26 -0400 (Wed, 05 May 2010) New Revision: 21903 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_application= .xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-62 Minor improvements in code l= istings. Code listings in section 5.5 has been updated. Modified: trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_appl= ication.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_applicatio= n.xml 2010-05-05 11:23:53 UTC (rev 21902) +++ trunk/documentation/guides/GettingStartedGuide/en-US/rad_jsf_applicatio= n.xml 2010-05-05 12:21:26 UTC (rev 21903) @@ -447,14 +447,12 @@ The whole java bean should look as follows: --===============5743229970198354779== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2010-05-05 08:27:43 -0400 (Wed, 05 May 2010) New Revision: 21904 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD= .java Log: https://jira.jboss.org/jira/browse/JBIDE-6239: Implement predictable select= ion after DnD. - now dropped node is selected after DnD Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd= /VpeDnD.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDn= D.java 2010-05-05 12:21:26 UTC (rev 21903) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDn= D.java 2010-05-05 12:27:43 UTC (rev 21904) @@ -367,14 +367,14 @@ } = private void externalDropAny(final String flavor, final String data, - final Point range) { + final int offset) { StructuredTextEditor sourceEditor =3D vpeController.getSourceEditor(); if (flavor =3D=3D null || flavor.length() =3D=3D 0 = || !(sourceEditor instanceof IDNDTextEditor)) { return; } = - sourceEditor.setHighlightRange(range.x, range.y, true); + sourceEditor.setHighlightRange(offset, 0, true); ((IDNDTextEditor) sourceEditor).runDropCommand(flavor, data); = } @@ -461,6 +461,9 @@ dropper.drop(vpeController.getPageContext(), sourceInnerDragInfo, sourceDropInfo); = + // select dropped node, JBIDE-6239 + setSelectedNode(sourceInnerDragInfo.getNode()); + if (sourceInnerDragInfo !=3D null) { sourceInnerDragInfo =3D null; } @@ -472,6 +475,17 @@ } } = + @SuppressWarnings("restriction") + private void setSelectedNode(final Node node) { + IndexedRegion sourceNodeBounds + =3D ((IndexedRegion)node); + = + vpeController.getSourceEditor().getTextViewer() + .getTextWidget().setSelection( + sourceNodeBounds.getStartOffset(), + sourceNodeBounds.getEndOffset()); + } + private void externalDrop(nsIDOMMouseEvent mouseEvent, String flavor, Str= ing data) { vpeController.onHideTooltip(); = @@ -514,7 +528,7 @@ .println(" drop! container: " + dropInfo.getContainer().getNodeNam= e()); //$NON-NLS-1$ } = - externalDropAny(aFlavor, data, range); + externalDropAny(aFlavor, data, range.x); = // TypedEvent tEvent =3D new TypedEvent(mouseEvent); // tEvent.data =3D data; --===============5743229970198354779==-- From jbosstools-commits at lists.jboss.org Wed May 5 09:02:08 2010 Content-Type: multipart/mixed; boundary="===============2810545410491476304==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21905 - in trunk: drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke and 6 other directories. Date: Wed, 05 May 2010 09:02:08 -0400 Message-ID: <201005051302.o45D28O5023021@svn01.web.mwc.hst.phx2.redhat.com> --===============2810545410491476304== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vpakan(a)redhat.com Date: 2010-05-05 09:02:06 -0400 (Wed, 05 May 2010) New Revision: 21905 Added: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/StopServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/view/GuvnorRepositories.java Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/DroolsAllBotTests.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTEclipseExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTUtilExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/StartServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/parts/SWTBotBrowserExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/IDELabel.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/PerspectiveType.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/ViewType.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/view/ExplorerBase.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/view/ServersView.java Log: Added Guvnor Repositories Test. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/DroolsAllBotTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-05 12:27:43 UTC (rev 2= 1904) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-05 13:02:06 UTC (rev 2= 1905) @@ -17,6 +17,7 @@ import org.jboss.tools.drools.ui.bot.test.smoke.DecisionTableTest; import org.jboss.tools.drools.ui.bot.test.smoke.DomainSpecificLanguageEdit= orTest; import org.jboss.tools.drools.ui.bot.test.smoke.GuidedDroolsRulesEditorTes= t; +import org.jboss.tools.drools.ui.bot.test.smoke.GuvnorRepositoriesTest; import org.jboss.tools.drools.ui.bot.test.smoke.ManageDroolsRuntime; import org.jboss.tools.drools.ui.bot.test.smoke.ManageDroolsProject; import org.jboss.tools.drools.ui.bot.test.smoke.ManageDroolsRules; @@ -47,7 +48,8 @@ GuidedDroolsRulesEditorTest.class, DomainSpecificLanguageEditorTest.class, RuleFlowTest.class, - DecisionTableTest.class}) = + DecisionTableTest.class, + GuvnorRepositoriesTest.class}) = public class DroolsAllBotTests extends SWTTestExt { public static final String DROOLS_PROJECT_NAME =3D "droolsTest"; public static final String DROOLS_RUNTIME_NAME =3D "Drools Test Runtime"; @@ -64,6 +66,7 @@ public static final String RULE_FLOW_JAVA_TEST_FILE_NAME =3D "ProcessTes= t.java"; public static final String RULE_FLOW_RF_FILE_NAME =3D "ruleflow.rf"; public static final String DECISION_TABLE_JAVA_TEST_FILE_NAME =3D "Decis= ionTableTest.java"; + public static final String EAP_50_WITH_GUVNOR_PROPERTY_NAME=3D "jboss-ea= p5.0-with-drools-home"; private static String testDroolsRuntimeName =3D null; public static String getTestDroolsRuntimeName() { return testDroolsRuntimeName; Added: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/= tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java = (rev 0) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2010-05-05 13:02:06= UTC (rev 21905) @@ -0,0 +1,153 @@ + /************************************************************************= ******* + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ + +package org.jboss.tools.drools.ui.bot.test.smoke; + +import static org.jboss.tools.ui.bot.ext.SWTTestExt.bot; + +import java.awt.event.KeyEvent; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.config.requirement.RequirementNotFulfill= edException; +import org.jboss.tools.ui.bot.ext.config.requirement.StartServer; +import org.jboss.tools.ui.bot.ext.config.requirement.StopServer; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.View.GeneralInternalWebBr= owser; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; +import org.jboss.tools.ui.bot.ext.parts.SWTBotBrowserExt; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.jboss.tools.ui.bot.ext.types.PerspectiveType; +import org.jboss.tools.ui.bot.ext.types.ViewType; +import org.jboss.tools.ui.bot.ext.view.GuvnorRepositories; +import org.jboss.tools.ui.bot.ext.SWTEclipseExt; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; +import org.jboss.tools.ui.bot.ext.Timing; +import org.junit.Test; +/** + * Tests Guvnor Repositories + * @author Vladimir Pakan + * + */ +public class GuvnorRepositoriesTest extends SWTTestExt{ + private GuvnorRepositories guvnorRepositories =3D new GuvnorRepositories= (); = + /** + * Tests Guvnor Repositories + */ + @Test + public void testGuvnorRepositories() { + //startGuvnor(); + addGuvnorRepository(); + deleteGuvnorRepository(); + addGuvnorRepository(); + openGuvnorConsole(); + browseGuvnorRepository(); + //stopGuvnor(); + } + + /** + * Adds Guvnor Repository + */ + private void addGuvnorRepository(){ + eclipse.openPerspective(PerspectiveType.GUVNOR_REPOSITORY_EXPLORING); + SWTBot guvnorRepositoriesBot =3D guvnorRepositories.show().bot(); + SWTUtilExt.getViewToolbarButtonWithTooltip( + guvnorRepositories.show(), + IDELabel.GuvnorRepositories.ADD_GUVNOR_REPOSITORY_TOOLTIP) + .click(); + eclipse.waitForShell(""); + guvnorRepositoriesBot.activeShell().bot().button(IDELabel.Button.FINIS= H).click(); + assertTrue("Guvnor repository was not created properly", + guvnorRepositoriesBot.tree().rowCount() =3D=3D 1); + } + /** + * Deletes Guvnor Repostiry + */ + private void deleteGuvnorRepository(){ + SWTBot guvnorRepositoriesBot =3D guvnorRepositories.show().bot();; + SWTBotTree guvnorRepositoryTree =3D guvnorRepositoriesBot.tree(); + guvnorRepositoryTree.select(0); + SWTUtilExt.getViewToolbarButtonWithTooltip( + guvnorRepositories.show(), + IDELabel.GuvnorRepositories.REMOVE_GUVNOR_REPOSITORY_TOOLTIP) + .click(); + guvnorRepositoriesBot.shell(IDELabel.GuvnorRepositories.REMOVE_GUVNOR_= REPOSITORY_DIALOG_TITLE) + .activate(); + bot.button(IDELabel.Button.OK).click(); + assertTrue("Guvnor repository was not deleted properly", + guvnorRepositoriesBot.tree().rowCount() =3D=3D 0); + } + /** + * Opens Guvnor Console + */ + private void openGuvnorConsole(){ + SWTBot guvnorRepositoriesBot =3D guvnorRepositories.show().bot(); + SWTBotTree guvnorRepositoryTree =3D guvnorRepositoriesBot.tree(); + SWTBotTreeItem tiGuvnorRepository =3D guvnorRepositoryTree.getAllItems= ()[0]; + ContextMenuHelper.prepareTreeItemForContextMenu(guvnorRepositoryTree, = tiGuvnorRepository); + new SWTBotMenu(ContextMenuHelper.getContextMenu(guvnorRepositoryTree, = + IDELabel.Menu.OPEN_GUVNOR_CONSOLE, false)).click(); + bot.sleep(Timing.time5S()); + SWTBotBrowserExt browser =3D bot.browserByTitle(IDELabel.GuvnorConsole= .GUVNOR_CONSOLE_TITLE); + browser.clickOnButtonViaJavaScript(0, bot); + browser.clickOnButtonViaJavaScript(IDELabel.GuvnorConsole.BUTTON_YES_I= NSTALL_SAMPLES, bot); + bot.sleep(Timing.time1S()); + KeyboardHelper.pressKeyCodeUsingAWT(KeyEvent.VK_RIGHT); + KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_RIGHT); + bot.sleep(Timing.time1S()); + KeyboardHelper.pressKeyCodeUsingAWT(KeyEvent.VK_ENTER); + KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_ENTER); + bot.sleep(Timing.time10S()); + KeyboardHelper.pressKeyCodeUsingAWT(KeyEvent.VK_ENTER); + KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_ENTER); + } + /** + * Browse Guvnor Repository + */ + private void browseGuvnorRepository(){ + = + guvnorRepositories.show(); + + String fileToOpen =3D "Underage.brl"; + guvnorRepositories.openFile(Timing.time1S(),IDELabel.GuvnorRepositorie= s.GUVNOR_REPOSITORY_ROOT_TREE_ITEM, + IDELabel.GuvnorRepositories.PACKAGES_TREE_ITEM, + IDELabel.GuvnorRepositories.MORTGAGE_TREE_ITEM, + fileToOpen); + = + assertTrue("File from Guvnor Repository was not opened properly. File = " + fileToOpen + " is not opened in editor", + SWTEclipseExt.existEditorWithLabel(bot,fileToOpen + " (Read only)")); + = + } + /** + * Starts Guvnor AS + */ + private void startGuvnor(){ + try { + new StartServer().fulfill(); + } catch (RequirementNotFulfilledException e) { + throw new RuntimeException(e); + } = + } + /** + * Stops Guvnor AS + */ + private void stopGuvnor(){ + try { + new StopServer().fulfill(); + } catch (RequirementNotFulfilledException e) { + throw new RuntimeException(e); + } = + } +} \ No newline at end of file Property changes on: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/= src/org/jboss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2010-05= -05 12:27:43 UTC (rev 21904) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/META-INF/MANIFEST.MF 2010-05= -05 13:02:06 UTC (rev 21905) @@ -25,6 +25,7 @@ Eclipse-RegisterBuddy: org.apache.log4j Export-Package: org.jboss.tools.ui.bot.ext, org.jboss.tools.ui.bot.ext.config, + org.jboss.tools.ui.bot.ext.config.requirement, org.jboss.tools.ui.bot.ext.entity, org.jboss.tools.ui.bot.ext.gen, org.jboss.tools.ui.bot.ext.helper, Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTEclipseExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-05 12:27:43 UTC (rev 21904) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-05 13:02:06 UTC (rev 21905) @@ -158,7 +158,10 @@ break; case DEBUG: perspectiveLabel =3D IDELabel.SelectPerspectiveDialog.DEBUG; - break; = + break; = + case GUVNOR_REPOSITORY_EXPLORING: + perspectiveLabel =3D IDELabel.SelectPerspectiveDialog.GUVNOR_REPOSIT= ORY_EXPLORING; + break; default: fail("Unknown perspective to open"); } @@ -430,6 +433,7 @@ * @param serverName */ public void addServer(IServer server, String serverName) { + log.info("Adding server: " + serverName); SWTBot wiz =3D open.newObject(ActionItem.NewObject.ServerServer.LABEL); open.selectTreeNode(server); wiz.textWithLabel(ServerServer.TEXT_SERVER_NAME).setText(serverName); @@ -442,6 +446,9 @@ * @param seamHome path to seam home directory */ public void addSeamRuntime(String name, String version, String seamHome) { + log.info("Adding Seam Runtime: " + name + + "\nVersion: " + version + + "\nHome: " + seamHome); SWTBot wiz =3D open.preferenceOpen(ActionItem.Preference.JBossToolsWebSe= am.LABEL); SWTBotTable tbRuntimeEnvironments =3D bot.table(); boolean createRuntime =3D true; @@ -505,6 +512,9 @@ */ public void addJbossServerRuntime(IServerRuntime runtime, String runtimeHome, String name, String jreToUse) { + log.info("Adding JBoss Server Runtime: " + name + + "\nHome: " + runtimeHome + + "\nJRE: " + jreToUse); = Properties props =3D new Properties(); props .put(IDELabel.JBossServerRuntimeDialog.HOME_DIRECTORY, @@ -522,6 +532,8 @@ */ public void addServerRuntime(IServerRuntime runtime, Properties propertie= s, String jreToUse) { + log.info("Addding Server Runtime: " + runtime.getName() + + "\nJRE: " + jreToUse); SWTBot wiz =3D open .preferenceOpen(ActionItem.Preference.ServerRuntimeEnvironments.LABEL); = @@ -569,6 +581,7 @@ * path to jre */ public void addJavaVM(String vmName, String jreHome) { + log.info("Adding Java Virtual Machine: " + vmName + "\nHome: " + jreHom= e); SWTBot pref =3D open .preferenceOpen(ActionItem.Preference.JavaInstalledJREs.LABEL); pref.button(IDELabel.Button.ADD).click(); @@ -591,7 +604,10 @@ */ public void addServerRuntime(String runtimeName, String runtimeGroup, String runtimeType, String runtimeHomeDir) { - + log.info("Adding Server Runtime: " + runtimeName + + "\nRuntime Group: " + runtimeGroup + + "\nRuntime Type: " + runtimeType + + "\nHome: " + runtimeHomeDir); bot.menu(IDELabel.Menu.WINDOW).menu(IDELabel.Menu.PREFERENCES).click(); bot.shell(IDELabel.Shell.PREFERENCES).activate(); bot.tree().expandNode(IDELabel.PreferencesDialog.SERVER_GROUP).select( Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTUtilExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTUtilExt.java 2010-05-05 12:27:43 UTC (rev 21904) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTUtilExt.java 2010-05-05 13:02:06 UTC (rev 21905) @@ -10,6 +10,7 @@ *************************************************************************= *****/ package org.jboss.tools.ui.bot.ext; = +import static org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory.= withTooltip; import static org.junit.Assert.fail; = import java.io.BufferedReader; @@ -19,6 +20,7 @@ import java.io.InputStream; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Properties; = @@ -46,6 +48,7 @@ import org.osgi.framework.Bundle; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; +import org.hamcrest.Matcher; = /** * Base class for all classes using SWTBot @@ -662,10 +665,38 @@ List buttons =3D view.getToolbarButtons(); for (SWTBotToolbarButton button : buttons){ System.out.println("Button Tooltip: " + button.getToolTipText() + - " Text: " + button.getText()); + " Text: " + button.getText() + = + " Class: " + button.getClass()); } } /** + * Returns Toolbar Button of view with specified toolTip + * @param view = + * @param toolTip + */ + public static SWTBotToolbarButton getViewToolbarButtonWithTooltip (SWTBo= tView view, String toolTip){ + List buttons =3D view.getToolbarButtons(); + SWTBotToolbarButton result =3D null; + if (buttons !=3D null){ + Matcher withTooltip =3D withTooltip(toolTip); + Iterator iterator =3D buttons.iterator(); + while (iterator.hasNext() && result =3D=3D null){ + SWTBotToolbarButton button =3D iterator.next(); + if (withTooltip.matches(button)){ + result =3D button; = + } + } + } = + = + if (result =3D=3D null){ + throw new WidgetNotFoundException("Unable to find Toolbar Button wit= h ToolTip " + + toolTip); = + }else{ + return result; + } + = + } + /** * Invoke method on object and returns result as String * @param object * @param method Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/requirement/StartServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/StartServer.java 2010-05-05 12:27:43 UTC (rev 21904) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/StartServer.java 2010-05-05 13:02:06 UTC (rev 21905) @@ -20,8 +20,9 @@ = @Override public void handle(){ - SWTTestExt.servers.startServer(SWTTestExt.configuredState.getServer().na= me); - SWTTestExt.configuredState.getServer().isRunning =3D true; - + if (!SWTTestExt.configuredState.getServer().isRunning){ + SWTTestExt.servers.startServer(SWTTestExt.configuredState.getServer()= .name); + SWTTestExt.configuredState.getServer().isRunning =3D true; + } } } Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bo= t/ext/config/requirement/StopServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/StopServer.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/StopServer.java 2010-05-05 13:02:06 UTC (rev 21905) @@ -0,0 +1,23 @@ +package org.jboss.tools.ui.bot.ext.config.requirement; + +import org.jboss.tools.ui.bot.ext.SWTTestExt; +/** + * Stops server (as dependent requirement has {@link AddServer} + * @author Vladimir Pakan + * + */ +public class StopServer extends RequirementBase { + + @Override + public boolean checkFulfilled() { + return !SWTTestExt.configuredState.getServer().isRunning; + } + + @Override + public void handle(){ + if (SWTTestExt.configuredState.getServer().isRunning){ + SWTTestExt.servers.stopServer(SWTTestExt.configuredState.getServer().= name); + SWTTestExt.configuredState.getServer().isRunning =3D false; + } + } +} Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jbo= ss/tools/ui/bot/ext/config/requirement/StopServer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/parts/SWTBotBrowserExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/parts/SWTBotBrowserExt.java 2010-05-05 12:27:43 UTC (rev 21904) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/parts/SWTBotBrowserExt.java 2010-05-05 13:02:06 UTC (rev 21905) @@ -8,12 +8,15 @@ import org.eclipse.swt.browser.Browser; import org.eclipse.swt.browser.ProgressEvent; import org.eclipse.swt.browser.ProgressListener; +import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.results.Result; import org.eclipse.swtbot.swt.finder.results.VoidResult; import org.eclipse.swtbot.swt.finder.widgets.AbstractSWTBotControl; import org.hamcrest.SelfDescribing; +import org.jboss.tools.ui.bot.ext.SWTUtilExt; +import org.jboss.tools.ui.bot.ext.Timing; = /** * browser component @@ -201,5 +204,35 @@ } }); } - + /** + * Click on the button generated via Java script on position specified b= y index = + * @param index + */ + public void clickOnButtonViaJavaScript(int index,SWTWorkbenchBot bot){ + executeScriptAsync("document.getElementsByTagName('button')[" + + index + + "].click();"); + bot.sleep(Timing.time5S()); + } + /** + * Click on the button generated via Java script with specified label + * @param label + */ + public void clickOnButtonViaJavaScript(String label,SWTWorkbenchBot bot){ + executeScriptAsync("var buttons =3D document.getElementsByTagName('but= ton');" + + "for (var i=3D0; i <=3D(buttons.length-1); i++){" + + "if (buttons[i].innerHTML =3D=3D \"" + label + "\") {" + = + " buttons[i].click();}" + "}"); + bot.sleep(Timing.time5S()); + } + /** + * Navigate Browser to url and wait until page is completely loaded + * @param url + * @param bot + */ + public void loadUrlToBrowser(String url,SWTWorkbenchBot bot){ + goURL(url); + new SWTUtilExt(bot).waitForBrowserLoadsPage(this); + bot.sleep(Timing.time5S()); + } } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/IDELabel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-05 12:27:43 UTC (rev 21904) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-05 13:02:06 UTC (rev 21905) @@ -65,6 +65,7 @@ public static final String TOGGLE_BREAKPOINT=3D"Toggle Breakpoint"; public static final String DEBUG_AS =3D "Debug As"; public static final String DEBUG_AS_DROOLS_APPLICATION =3D "Drools App= lication"; + public static final String OPEN_GUVNOR_CONSOLE =3D "Open Guvnor Consol= e"; } = public class Button { @@ -171,6 +172,7 @@ public static final String WEB_PROJECTS =3D "Web Projects"; public static final String PROBLEMS =3D "Problems"; public static final String DEBUG =3D "Debug"; + public static final String GUVNOR_REPOSITORIES =3D "Guvnor Repositories"; } = public class ViewGroup { @@ -180,6 +182,7 @@ public static final String SERVER =3D "Server"; public static final String JBOSS_TOOLS_WEB =3D "JBoss Tools Web"; public static final String DEBUG =3D "Debug"; + public static final String GUVNOR =3D "Guvnor"; } = public class SelectPerspectiveDialog { @@ -190,6 +193,7 @@ public static final String DB_DEVELOPMENT =3D "Database Development"; public static final String JPA =3D "JPA"; public static final String DEBUG =3D "Debug"; + public static final String GUVNOR_REPOSITORY_EXPLORING =3D "Guvnor Repos= itory Exploring"; } /** * Hibernate Console Wizard (ConsoleConfigurationCreationWizard) Labels ( @@ -430,4 +434,21 @@ public static final String SCOPE_COMBO_VALUE =3D "condition"; = } + = + public static final class GuvnorRepositories { + = + public static final String ADD_GUVNOR_REPOSITORY_TOOLTIP =3D "Add a G= uvnor respository connection"; + public static final String REMOVE_GUVNOR_REPOSITORY_TOOLTIP =3D "Dele= te Guvnor repository connection"; + public static final String REMOVE_GUVNOR_REPOSITORY_DIALOG_TITLE =3D = "Remove repository connection"; + public static final String GUVNOR_REPOSITORY_ROOT_TREE_ITEM =3D "http= ://localhost:8080/drools-guvnor/org.drools.guvnor.Guvnor/webdav"; + public static final String PACKAGES_TREE_ITEM =3D "packages/"; + public static final String MORTGAGE_TREE_ITEM =3D "mortgages/"; + } + = + public static final class GuvnorConsole { + = + public static final String GUVNOR_CONSOLE_TITLE =3D "JBoss Guvnor"; + public static final String BUTTON_YES_INSTALL_SAMPLES =3D "Yes, pleas= e install samples"; + = + } } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/PerspectiveType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/PerspectiveType.java 2010-05-05 12:27:43 UTC (rev 21904) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/PerspectiveType.java 2010-05-05 13:02:06 UTC (rev 21905) @@ -16,6 +16,6 @@ * */ public enum PerspectiveType { - SEAM, JAVA, WEB_DEVELOPMENT, HIBERNATE, DB_DEVELOPMENT, JPA, DEBUG; + SEAM, JAVA, WEB_DEVELOPMENT, HIBERNATE, DB_DEVELOPMENT, JPA, DEBUG, GUVNO= R_REPOSITORY_EXPLORING; } = Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/ViewType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/ViewType.java 2010-05-05 12:27:43 UTC (rev 21904) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/ViewType.java 2010-05-05 13:02:06 UTC (rev 21905) @@ -18,7 +18,8 @@ * */ public enum ViewType { - PACKAGE_EXPLORER, PROJECT_EXPLORER, WELCOME, DATA_SOURCE_EXPLORER,SERVERS= ,WEB_PROJECTS,PROBLEMS,DEBUG; + PACKAGE_EXPLORER, PROJECT_EXPLORER, WELCOME, DATA_SOURCE_EXPLORER, + SERVERS,WEB_PROJECTS,PROBLEMS,DEBUG,GUVNOR_REPOSITORIES; = = public String getGroupLabel() { @@ -31,6 +32,7 @@ case WEB_PROJECTS: viewLabel =3D IDELabel.ViewGroup.JBOSS_TOOLS_WEB; br= eak; case PROBLEMS: viewLabel =3D IDELabel.ViewGroup.GENERAL; break; case DEBUG: viewLabel =3D IDELabel.ViewGroup.DEBUG; break; + case GUVNOR_REPOSITORIES: viewLabel =3D IDELabel.ViewGroup.GUVNOR; brea= k; default: fail("Unknown View Type"); } return viewLabel; = @@ -46,6 +48,7 @@ case WEB_PROJECTS: viewLabel =3D IDELabel.View.WEB_PROJECTS; break; case PROBLEMS: viewLabel =3D IDELabel.View.PROBLEMS; break; case DEBUG: viewLabel =3D IDELabel.View.DEBUG; break; + case GUVNOR_REPOSITORIES: viewLabel =3D IDELabel.View.GUVNOR_REPOSITORI= ES; break; default: fail("Unknown View Type"); } return viewLabel; Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/view/ExplorerBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/view/ExplorerBase.java 2010-05-05 12:27:43 UTC (rev 21904) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/view/ExplorerBase.java 2010-05-05 13:02:06 UTC (rev 21905) @@ -90,18 +90,21 @@ } /** * opens file (selects in tree and doubleclicks) + * @param timeOut * @param projectName * @param path to file * @return editor with opened file */ - public SWTBotEditor openFile(String projectName, String... path) { + public SWTBotEditor openFile(int timeOut, String projectName, String... p= ath) { SWTBot viewBot =3D show().bot(); SWTBotTree tree =3D viewBot.tree(); SWTBotTreeItem item =3D tree.expandNode(projectName); + viewBot.sleep(timeOut); StringBuilder builder =3D new StringBuilder(projectName); // Go through path for (String nodeName : path) { item =3D item.expandNode(nodeName); + viewBot.sleep(timeOut); builder.append("/" + nodeName); } item.select().doubleClick(); @@ -110,6 +113,15 @@ return editor; } /** + * opens file (selects in tree and doubleclicks) with zero timeOut for e= xpandNode() method + * @param projectName + * @param path to file + * @return editor with opened file + */ + public SWTBotEditor openFile(String projectName, String... path) { + return openFile(0,projectName,path); + } + /** * runs given project on Server (uses default server, the first one) serv= er MUST be running * @param projectName */ Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bo= t/ext/view/GuvnorRepositories.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/view/GuvnorRepositories.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/view/GuvnorRepositories.java 2010-05-05 13:02:06 UTC (rev 21905) @@ -0,0 +1,16 @@ +package org.jboss.tools.ui.bot.ext.view; + +import org.apache.log4j.Logger; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.View.GuvnorGuvnorReposito= ries; + +/** + * Class provides bot routines related to Repositories View + * @author Vlado Pakan + * + */ +public class GuvnorRepositories extends ExplorerBase { + Logger log =3D Logger.getLogger(GuvnorRepositories.class); + public GuvnorRepositories() { + viewObject =3D GuvnorGuvnorRepositories.LABEL; + } +} Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jbo= ss/tools/ui/bot/ext/view/GuvnorRepositories.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/view/ServersView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/view/ServersView.java 2010-05-05 12:27:43 UTC (rev 21904) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/view/ServersView.java 2010-05-05 13:02:06 UTC (rev 21905) @@ -81,8 +81,11 @@ new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Me= nu.START, false)).click(); new SWTUtilExt(this).waitForNonIgnoredJobs(Timing.time100S()); new SWTUtilExt(this).waitForAll(Timing.time3S()); - = } + else{ + throw new RuntimeException("Unable to start server witn name: " + serv= erName + + "\nThis server is not defined within Servers view"); + } } = private SWTBotTreeItem findServerByName(SWTBotTree tree, String name) { --===============2810545410491476304==-- From jbosstools-commits at lists.jboss.org Wed May 5 09:34:08 2010 Content-Type: multipart/mixed; boundary="===============4153762918048007129==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21906 - branches/modular_build/build. Date: Wed, 05 May 2010 09:34:08 -0400 Message-ID: <201005051334.o45DY82o032635@svn01.web.mwc.hst.phx2.redhat.com> --===============4153762918048007129== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 09:34:07 -0400 (Wed, 05 May 2010) New Revision: 21906 Modified: branches/modular_build/build/build.xml Log: dedupe COMPONENTS.to.build Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-05 13:02:06 UTC (rev 219= 05) +++ branches/modular_build/build/build.xml 2010-05-05 13:34:07 UTC (rev 219= 06) @@ -330,7 +330,6 @@ - --===============4153762918048007129==-- From jbosstools-commits at lists.jboss.org Wed May 5 10:42:46 2010 Content-Type: multipart/mixed; boundary="===============4601074773132374704==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21907 - trunk/drools/docs/guvnor_ref/en-US. Date: Wed, 05 May 2010 10:42:46 -0400 Message-ID: <201005051442.o45EgkGi015223@svn01.web.mwc.hst.phx2.redhat.com> --===============4601074773132374704== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-05 10:42:46 -0400 (Wed, 05 May 2010) New Revision: 21907 Modified: trunk/drools/docs/guvnor_ref/en-US/conclusion.xml trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml trunk/drools/docs/guvnor_ref/en-US/introduction.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-63 Eclipse Guvnor Tools Referen= ce Guide restructureing and update. The minor structure and text changes ha= ve been made. Modified: trunk/drools/docs/guvnor_ref/en-US/conclusion.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/conclusion.xml 2010-05-05 13:34:07 U= TC (rev 21906) +++ trunk/drools/docs/guvnor_ref/en-US/conclusion.xml 2010-05-05 14:42:46 U= TC (rev 21907) @@ -8,7 +8,7 @@ = - Conclusion + Summary = As stated at the beginning of this document, the key goal of the= EGT is to provide a way of interacting with Guvnor repository resource= s in a local Eclipse @@ -18,7 +18,7 @@ =
Other relevant resources on the topic - = + For more information visit the following resources: Guvnor wiki page Modified: trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml 2010-05-0= 5 13:34:07 UTC (rev 21906) +++ trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml 2010-05-0= 5 14:42:46 UTC (rev 21907) @@ -12,7 +12,7 @@ = This chapter will give an overview on all functionality the Guvnor Tools provides. = -
+
Creating a New Guvnor Connection As mentioned in the "Intr= oduction", the main purpose of the EGT is to allow development using r= esources held in a Guvnor @@ -85,74 +85,6 @@ repository, the location within the repository, the version (d= ate/time stamp) and the revision number.
- -
- Importing Guvnor Repository Resources - = - In addition to the single file drag-and-drop from the Guvnor Repositories - view, the EGT also includes a = wizard for copying one - or more files from a Guvnor repository to the local workspace = (and setting the - association with the Guvnor repository). This wizard is availa= ble from the - File > Import > Guvnor > Resource from - Guvnor - and the - File > New > Other > Guvnor > Resour= ce from - Guvnor - menu items. - - Note: - = - Note that the wizard is identical but appears in both lo= cations to accommodate - users who tend to view this functionality as being in eith= er category. - - = - The first page of the wizard asks for the selection of the s= ource Guvnor repository - and gives the choice to create a new Guvnor repository connect= ion (in which case the - second page is the same as the Guvnor Connection wizard). - = -
- Resource from Guvnor Wizard - - - - - -
- = - Once the source Guvnor repository is chosen, the wizard prom= pts for resource selection: - = -
- Resource Selection - - - - - -
- = - Finally, the target location in the local workspace should b= e chosen: -
- Choosing the Target Location - - - - - -
- = - On completion the wizard copies the selected files from the = Guvnor repository to the local workspace. - If a file with the same name already exists in the destination= , the wizard uses the Eclipse standard - "prompt for rename" dialog: - = -
- Prompt for Rename Dialog - - - - - -
-
=
Managing Guvnor Resources Modified: trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml 2010-05-05 13= :34:07 UTC (rev 21906) +++ trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml 2010-05-05 14= :42:46 UTC (rev 21907) @@ -15,8 +15,8 @@ Guvnor Repository Exploring Perspective = The Guvnor Repository Exploring perspective contains two views - supplied by EGT =E2=80=93 Repos= itory Explorer and - Version History, that will be the center = of most interaction + supplied by EGT =E2=80=93 Guvnor Repositories and + Guvnor Resource History<= /link>, that will be the center of most interactions with Guvnor, and Eclipse standard views such as Prop= erties and Resource Navigator that are also useful.<= /para> = @@ -39,6 +39,7 @@ Guvnor Repository Exploring. T= his opens the Guvnor perspective.
+ =
Guvnor Connection Wizard = @@ -160,6 +161,75 @@ This is nuisance, but your usual credentials should apply = in this case.
+ = +
+ Import from Guvnor wizard + = + In addition to the single file drag-and-drop from the Guvnor Repositories + view, the EGT also includes a = wizard for copying one + or more files from a Guvnor repository to the local workspace = (and setting the + association with the Guvnor repository). This wizard is availa= ble from the + File > Import > Guvnor > Resource from + Guvnor + and the + File > New > Other > Guvnor > Resour= ce from + Guvnor + menu items. + + Note: + = + Note that the wizard is identical but appears in both lo= cations to accommodate + users who tend to view this functionality as being in eith= er category. + + = + The first page of the wizard asks for the selection of the s= ource Guvnor repository + and gives the choice to create a new Guvnor repository connect= ion (in which case the + second page is the same as the Guvnor Connection wizard). + = +
+ Resource from Guvnor Wizard + + + + + +
+ = + Once the source Guvnor repository is chosen, the wizard prom= pts for resource selection: + = +
+ Resource Selection + + + + + +
+ = + Finally, the target location in the local workspace should b= e chosen: +
+ Choosing the Target Location + + + + + +
+ = + On completion the wizard copies the selected files from the = Guvnor repository to the local workspace. + If a file with the same name already exists in the destination= , the wizard uses the Eclipse standard + "prompt for rename" dialog: + = +
+ Prompt for Rename Dialog + + + + + +
+
+ =
Guvnor Repositories View = @@ -254,6 +324,7 @@ =
+ =
Guvnor Resource History View = Modified: trunk/drools/docs/guvnor_ref/en-US/introduction.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/introduction.xml 2010-05-05 13:34:07= UTC (rev 21906) +++ trunk/drools/docs/guvnor_ref/en-US/introduction.xml 2010-05-05 14:42:46= UTC (rev 21907) @@ -109,8 +109,8 @@
What is Guvnor Tools? The Guvnor repository is not intended a= s a Source Code Management - (SCM) solution, and the EGT are not intended = to be Eclipse =E2=80=9Cteam - provider=E2=80=9D extensions or replacements. Rather, the Guvnor r= epository is a location where + (SCM) solution, and the EGT is not intended t= o be Eclipse =E2=80=9Cteam + provider=E2=80=9D extension or replacement. Rather, the Guvnor rep= ository is a location where certain artifacts (such as rules and SOA policy definitions) are c= ontrolled (=E2=80=9Cgoverned=E2=80=9D) by policies defined by the deployment environment. The purpose of the= EGT is then to enable access to resources held by the Guvnor repositor= y, so @@ -160,8 +160,8 @@ java.lang.RuntimeException: Specification violation [EJB3 JPA 6.2.1.2] - Y= ou have not defined a non-jta-data-source = for a RESOURCE_LOCAL enabled persistence context named: ACL = - Now refer to the &q= uot;Functionality - Overview" section to find out what you can do = with Guvnor and + Now refer to the &q= uot;Tasks" = + section to find out what you can do with Guvnor and Eclipse synchronisation tool.
= --===============4601074773132374704==-- From jbosstools-commits at lists.jboss.org Wed May 5 11:01:23 2010 Content-Type: multipart/mixed; boundary="===============9221349142078859801==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21908 - branches/modular_build/build. Date: Wed, 05 May 2010 11:01:22 -0400 Message-ID: <201005051501.o45F1MC0017293@svn01.web.mwc.hst.phx2.redhat.com> --===============9221349142078859801== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 11:01:22 -0400 (Wed, 05 May 2010) New Revision: 21908 Modified: branches/modular_build/build/build.xml Log: add doc about dependency:purge-local-repository Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-05 14:42:46 UTC (rev 219= 07) +++ branches/modular_build/build/build.xml 2010-05-05 15:01:22 UTC (rev 219= 08) @@ -51,6 +51,10 @@ or ant -Dnotests=3Dtrue = +or, to purge the local repo before building: + cd /home/nboldt/workspace36/jbosstools-modular_build; \ + ant -DMAVEN_FLAGS=3D"dependency:purge-local-repository clean install" + or, to build specific module(s): = cd /home/nboldt/workspace36/jbosstools-modular_build; \ ant -DCOMPONENTS=3Dtests,common,flow,jbpm @@ -90,7 +94,7 @@ = --===============3629600539588384739== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 11:44:39 -0400 (Wed, 05 May 2010) New Revision: 21909 Modified: branches/modular_build/as/plugins/org.jboss.ide.eclipse.archives.webtool= s/META-INF/MANIFEST.MF Log: add org.eclipse.jem.util Modified: branches/modular_build/as/plugins/org.jboss.ide.eclipse.archives.= webtools/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/as/plugins/org.jboss.ide.eclipse.archives.webtoo= ls/META-INF/MANIFEST.MF 2010-05-05 15:01:22 UTC (rev 21908) +++ branches/modular_build/as/plugins/org.jboss.ide.eclipse.archives.webtoo= ls/META-INF/MANIFEST.MF 2010-05-05 15:44:39 UTC (rev 21909) @@ -14,6 +14,7 @@ org.eclipse.core.resources;bundle-version=3D"3.4.0", org.eclipse.jdt.core;bundle-version=3D"3.4.0", org.eclipse.jst.server.core;bundle-version=3D"1.1.0", + org.eclipse.jem.util, org.eclipse.wst.common.modulecore;bundle-version=3D"1.1.200", org.apache.ant;bundle-version=3D"1.7.0", org.jboss.ide.eclipse.as.core;bundle-version=3D"1.0.0", --===============3629600539588384739==-- From jbosstools-commits at lists.jboss.org Wed May 5 11:56:50 2010 Content-Type: multipart/mixed; boundary="===============7717987640442784465==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21910 - branches/modular_build/build. Date: Wed, 05 May 2010 11:56:49 -0400 Message-ID: <201005051556.o45Fun8q030058@svn01.web.mwc.hst.phx2.redhat.com> --===============7717987640442784465== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 11:56:49 -0400 (Wed, 05 May 2010) New Revision: 21910 Modified: branches/modular_build/build/build.xml Log: only do a purge ONCE, not per component Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-05 15:44:39 UTC (rev 219= 09) +++ branches/modular_build/build/build.xml 2010-05-05 15:56:49 UTC (rev 219= 10) @@ -53,7 +53,7 @@ = or, to purge the local repo before building: cd /home/nboldt/workspace36/jbosstools-modular_build; \ - ant -DMAVEN_FLAGS=3D"dependency:purge-local-repository clean install" + ant clean-run = or, to build specific module(s): = cd /home/nboldt/workspace36/jbosstools-modular_build; \ @@ -92,6 +92,19 @@ = + + = + + + + + + + + = + = = --===============7717987640442784465==-- From jbosstools-commits at lists.jboss.org Wed May 5 12:15:13 2010 Content-Type: multipart/mixed; boundary="===============2549939738868187774==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21911 - branches/modular_build/build. Date: Wed, 05 May 2010 12:15:13 -0400 Message-ID: <201005051615.o45GFDNl006244@svn01.web.mwc.hst.phx2.redhat.com> --===============2549939738868187774== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 12:15:12 -0400 (Wed, 05 May 2010) New Revision: 21911 Modified: branches/modular_build/build/build.xml Log: fix purge task so it doesn't fail to run the pom Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-05 15:56:49 UTC (rev 219= 10) +++ branches/modular_build/build/build.xml 2010-05-05 16:15:12 UTC (rev 219= 11) @@ -92,19 +92,22 @@ = - - = + + + + + + - + + + - = + - = + = @@ -650,7 +653,9 @@ = - + @@ -742,18 +747,19 @@ = - + = - - + + - - <project xsi:schemaLocatio= n=3D"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.= 0.0.xsd" xmlns=3D"http://maven.apache.org/POM/4.0.0" xmlns:xsi=3D"http://ww= w.w3.org/2001/XMLSchema-instance"> + + + <project xsi:schemaLocation=3D"http:= //maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" x= mlns=3D"http://maven.apache.org/POM/4.0.0" xmlns:xsi=3D"http://www.w3.org/2= 001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> = <parent> <relativePath>../../parent-pom.xml</relativePath> @@ -764,7 +770,7 @@ <groupId>org.jboss.tools</groupId> <artifactId>${COMPONENT}.site</artifactId> = <version>0.0.1-SNAPSHOT</version> - <packaging>eclipse-update-site</packaging> + <packaging>${packaging}</packaging> </project> = --===============2549939738868187774==-- From jbosstools-commits at lists.jboss.org Wed May 5 12:17:45 2010 Content-Type: multipart/mixed; boundary="===============4618573991403862313==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21912 - branches/modular_build/build. Date: Wed, 05 May 2010 12:17:45 -0400 Message-ID: <201005051617.o45GHjlK006449@svn01.web.mwc.hst.phx2.redhat.com> --===============4618573991403862313== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 12:17:45 -0400 (Wed, 05 May 2010) New Revision: 21912 Modified: branches/modular_build/build/build.xml Log: update doc Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-05 16:15:12 UTC (rev 219= 11) +++ branches/modular_build/build/build.xml 2010-05-05 16:17:45 UTC (rev 219= 12) @@ -51,9 +51,11 @@ or ant -Dnotests=3Dtrue = -or, to purge the local repo before building: +or, to purge the local repo (or purge then build): cd /home/nboldt/workspace36/jbosstools-modular_build; \ - ant clean-run + ant purge -q + or + ant clean-run = or, to build specific module(s): = cd /home/nboldt/workspace36/jbosstools-modular_build; \ --===============4618573991403862313==-- From jbosstools-commits at lists.jboss.org Wed May 5 12:25:17 2010 Content-Type: multipart/mixed; boundary="===============7443595231282392294==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21913 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console: viewers/xpl and 1 other directory. Date: Wed, 05 May 2010 12:25:17 -0400 Message-ID: <201005051625.o45GPHPx007342@svn01.web.mwc.hst.phx2.redhat.com> --===============7443595231282392294== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-05 12:25:16 -0400 (Wed, 05 May 2010) New Revision: 21913 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber= nate/eclipse/console/actions/CloseConfigAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber= nate/eclipse/console/viewers/xpl/MTreeViewer.java Log: https://jira.jboss.org/jira/browse/JBIDE-5909 - fix Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/or= g/hibernate/eclipse/console/actions/CloseConfigAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/actions/CloseConfigAction.java 2010-05-05 16:17:45 UT= C (rev 21912) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/actions/CloseConfigAction.java 2010-05-05 16:25:16 UT= C (rev 21913) @@ -49,7 +49,7 @@ continue; } ConsoleConfiguration config =3D (ConsoleConfiguration) node; - ((MTreeViewer)viewer).clearChildren(null); + ((MTreeViewer)viewer).clearChildren(config); config.reset(); viewer.refresh(node); } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/or= g/hibernate/eclipse/console/viewers/xpl/MTreeViewer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/viewers/xpl/MTreeViewer.java 2010-05-05 16:17:45 UTC = (rev 21912) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/viewers/xpl/MTreeViewer.java 2010-05-05 16:25:16 UTC = (rev 21913) @@ -48,7 +48,18 @@ } = public void clearChildren(Object node) { - Widget[] items =3D getChildren(node =3D=3D null ? getTree() : (Widget)no= de); + Widget widget =3D null; + if (node instanceof Widget) { + widget =3D (Widget)node; + } else if (node =3D=3D null) { + widget =3D getTree(); + } + Widget[] items =3D null; + if (widget =3D=3D null && node !=3D null) { + items =3D internalFindItems(node); + } else { + items =3D getChildren(widget); + } for (int j =3D 0; j < items.length; j++) { clearChildren(items[j]); if (items[j] instanceof TreeItem) { --===============7443595231282392294==-- From jbosstools-commits at lists.jboss.org Wed May 5 12:27:58 2010 Content-Type: multipart/mixed; boundary="===============0818140857873383014==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21914 - branches/modular_build/build. Date: Wed, 05 May 2010 12:27:58 -0400 Message-ID: <201005051627.o45GRwl7007445@svn01.web.mwc.hst.phx2.redhat.com> --===============0818140857873383014== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 12:27:58 -0400 (Wed, 05 May 2010) New Revision: 21914 Modified: branches/modular_build/build/build.xml Log: add more default flags per http://www.sonatype.com/people/2009/01/maven-con= tinuous-integration-best-practices/ advice Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-05 16:25:16 UTC (rev 219= 13) +++ branches/modular_build/build/build.xml 2010-05-05 16:27:58 UTC (rev 219= 14) @@ -413,7 +413,7 @@ = - + = --===============0818140857873383014==-- From jbosstools-commits at lists.jboss.org Wed May 5 12:29:29 2010 Content-Type: multipart/mixed; boundary="===============3432350335730841917==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21915 - branches/modular_build/build. Date: Wed, 05 May 2010 12:29:29 -0400 Message-ID: <201005051629.o45GTTVA007461@svn01.web.mwc.hst.phx2.redhat.com> --===============3432350335730841917== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 12:29:29 -0400 (Wed, 05 May 2010) New Revision: 21915 Modified: branches/modular_build/build/build.xml Log: add more default flags per http://www.sonatype.com/people/2009/01/maven-con= tinuous-integration-best-practices/ advice Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-05 16:27:58 UTC (rev 219= 14) +++ branches/modular_build/build/build.xml 2010-05-05 16:29:29 UTC (rev 219= 15) @@ -104,7 +104,7 @@ - + @@ -707,7 +707,7 @@ - + @@ -715,7 +715,7 @@ - + --===============3432350335730841917==-- From jbosstools-commits at lists.jboss.org Wed May 5 12:53:34 2010 Content-Type: multipart/mixed; boundary="===============7273273878494042764==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21916 - in trunk/jsf: plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action and 18 other directories. Date: Wed, 05 May 2010 12:53:34 -0400 Message-ID: <201005051653.o45GrYIB010620@svn01.web.mwc.hst.phx2.redhat.com> --===============7273273878494042764== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yzhishko Date: 2010-05-05 12:53:31 -0400 (Wed, 05 May 2010) New Revision: 21916 Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/JSF2AbstractProposal.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/JSF2CompositeAttrsProposal.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/JSF2CompositeComponentProposal.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/JSF2ResourcesFolderProposal.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/components/JSF2AbstractValidationComponent.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/.classpath trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/.project trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/.settings/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/.settings/.jsdtscope trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/.settings/org.eclipse.jdt.core.prefs trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/.settings/org.eclipse.wst.common.component trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/JavaSource/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/JavaSource/demo/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/JavaSource/demo/Person.java trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/JavaSource/resources.properties trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/META-INF/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/WEB-INF/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/WEB-INF/classes/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/WEB-INF/classes/demo/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/WEB-INF/classes/demo/Person.class trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/WEB-INF/classes/resources.properties trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/WEB-INF/faces-config.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/WEB-INF/lib/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/WEB-INF/lib/jbide2550.jar trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/WEB-INF/web.xml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/index.jsp trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/pages/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/pages/greeting.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/pages/inputname.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/templates/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/WebContent/templates/common.xhtml trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/ant/ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/ant/build.properties trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidato= r/ant/build.xml trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/va= lidation/ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/va= lidation/JSF2ComponentsValidatorTest.java Removed: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/CreateJSF2CompositeAttrs.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/CreateJSF2CompositeComponent.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/CreateJSF2ResourcesFolder.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/JSF2SourceValidator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/JSF2ComponentResolutionGenerator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/JSF2QuickFixProcessor.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/components/JSF2AttrTempComponent.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/components/JSF2CompositeTempComponent.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/components/JSF2URITempComponent.java trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/Js= fAllTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-5930 fixed Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/JSF2SourceValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2SourceValidator.java 2010-05-05 16:29:29 UTC (rev 21915) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2SourceValidator.java 2010-05-05 16:53:31 UTC (rev 21916) @@ -26,16 +26,12 @@ import org.eclipse.wst.validation.internal.provisional.core.IValidationCon= text; import org.eclipse.wst.validation.internal.provisional.core.IValidator; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; import org.jboss.tools.jsf.web.validation.jsf2.components.JSF2AttrTempComp= onent; import org.jboss.tools.jsf.web.validation.jsf2.components.JSF2CompositeTem= pComponent; import org.jboss.tools.jsf.web.validation.jsf2.components.JSF2URITempCompo= nent; import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentModelMana= ger; import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; = /** * = @@ -94,34 +90,6 @@ = public void validate(IRegion dirtyRegion, IValidationContext helper, IReporter reporter) { - if (document !=3D null) { - Element element =3D findNodeFromRegion(dirtyRegion); - if (element =3D=3D null) { - return; - } - if (helper instanceof IncrementalHelper) { - IncrementalHelper incrementalHelper =3D (IncrementalHelper) helper; - IProject project =3D incrementalHelper.getProject(); - if (project =3D=3D null) { - return; - } - String[] uris =3D helper.getURIs(); - if (uris =3D=3D null || uris.length < 1) { - return; - } - String filePath =3D uris[0]; - if (filePath =3D=3D null) { - return; - } - filePath =3D filePath.substring(filePath.indexOf('/') + 1); - IResource resource =3D project.findMember(filePath - .substring(filePath.indexOf('/') + 1)); - if (resource instanceof IFile) { - reportProblems(reporter, JSF2XMLValidator - .getValidationComponents(element, (IFile) resource)); - } - } - } } = private void reportProblems(IReporter reporter, @@ -207,31 +175,4 @@ = } = - private Element findNodeFromRegion(IRegion region) { - int offset =3D region.getOffset(); - Element[] elements =3D new Element[1]; - findElementAttOffSet(offset, document.getDocumentElement(), elements); - return elements[0]; - } - - private void findElementAttOffSet(int offSet, Node scanEl, - Element[] returnEl) { - if (scanEl instanceof IDOMElement) { - if (isElementAttOffset(offSet, (IDOMElement) scanEl)) { - returnEl[0] =3D (IDOMElement) scanEl; - return; - } - NodeList childNodes =3D scanEl.getChildNodes(); - if (childNodes !=3D null) { - for (int i =3D 0; i < childNodes.getLength(); i++) { - findElementAttOffSet(offSet, childNodes.item(i), returnEl); - } - } - } - } - - private boolean isElementAttOffset(int offSet, IDOMElement element) { - return element.getStartOffset() =3D=3D offSet; - } - } \ No newline at end of file Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/= validation/jsf2/action/CreateJSF2CompositeAttrs.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/CreateJSF2CompositeAttrs.java 2010-05-05 16:29:29 UTC (re= v 21915) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/CreateJSF2CompositeAttrs.java 2010-05-05 16:53:31 UTC (re= v 21916) @@ -1,141 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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.jsf.web.validation.jsf2.action; - -import java.util.Map; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jdt.internal.ui.JavaPluginImages; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; -import org.eclipse.ui.IMarkerResolution; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.ide.IDE; -import org.eclipse.wst.validation.ValidationFramework; -import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob; -import org.jboss.tools.jsf.JSFModelPlugin; -import org.jboss.tools.jsf.messages.JSFUIMessages; -import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; -import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; - -/** - * = - * @author yzhishko - * = - */ - -(a)SuppressWarnings("restriction") -public class CreateJSF2CompositeAttrs implements IMarkerResolution, - ICompletionProposal { - - private String componentPath =3D null; - private IResource validateResource =3D null; - private String[] attrs =3D null; - - public CreateJSF2CompositeAttrs() { - } - - public CreateJSF2CompositeAttrs(IResource validateResource, - String compPath, String[] attrs) { - this.validateResource =3D validateResource; - this.componentPath =3D compPath; - this.attrs =3D attrs; - } - - public String getLabel() { - return JSFUIMessages.Create_JSF_2_Interface_Attr; - } - - @SuppressWarnings("unchecked") - public void run(final IMarker marker) { - try { - if (marker !=3D null) { - validateResource =3D marker.getResource(); - Map attrsMap =3D marker.getAttributes(); - Object object =3D attrsMap - .get(JSF2ResourceUtil.COMPONENT_RESOURCE_PATH_KEY); - componentPath =3D (String) object; - attrs =3D new String[] { (String) marker - .getAttribute(IJSF2ValidationComponent.JSF2_ATTR_NAME_KEY) }; - } - final IFile createdFile =3D JSF2ResourceUtil - .createCompositeComponentFile( - validateResource.getProject(), new Path( - componentPath), attrs); - validateResource.getProject().deleteMarkers( - JSF2XMLValidator.JSF2_PROBLEM_ID, false, 1); - if (createdFile !=3D null) { - IDE.openEditor(PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage(), - createdFile); - } - Job validateJob =3D new Job("JSF 2 Components Validator") { //$NON-NLS-= 1$ - - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - ValidationFramework.getDefault() - .validate( - new IProject[] { validateResource - .getProject() }, false, false, - new NullProgressMonitor()); - } catch (CoreException e) { - return new Status(IStatus.CANCEL, - JSFModelPlugin.PLUGIN_ID, "Cancel"); //$NON-NLS-1$ - } - return IValidatorJob.OK_STATUS; - } - }; - validateJob.schedule(500); - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - } - } - - public void apply(IDocument document) { - run(null); - } - - public String getAdditionalProposalInfo() { - return null; - } - - public IContextInformation getContextInformation() { - return null; - } - - public String getDisplayString() { - return JSFUIMessages.Create_JSF_2_Interface_Attr; - } - - public Image getImage() { - return JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_ADD); - } - - public Point getSelection(IDocument document) { - return null; - } - -} Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/= validation/jsf2/action/CreateJSF2CompositeComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/CreateJSF2CompositeComponent.java 2010-05-05 16:29:29 UTC= (rev 21915) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/CreateJSF2CompositeComponent.java 2010-05-05 16:53:31 UTC= (rev 21916) @@ -1,160 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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.jsf.web.validation.jsf2.action; - -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.Map.Entry; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jdt.internal.ui.JavaPluginImages; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; -import org.eclipse.ui.IMarkerResolution; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.ide.IDE; -import org.eclipse.wst.validation.ValidationFramework; -import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob; -import org.jboss.tools.jsf.JSFModelPlugin; -import org.jboss.tools.jsf.messages.JSFUIMessages; -import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; -import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; - -/** - * = - * @author yzhishko - * = - */ - -(a)SuppressWarnings("restriction") -public class CreateJSF2CompositeComponent implements IMarkerResolution, - ICompletionProposal { - - private String componentPath =3D null; - private IResource validateResource =3D null; - private String[] attrs =3D null; - - public CreateJSF2CompositeComponent() { - } - - public CreateJSF2CompositeComponent(IResource validateResource, - String compPath, String[] attrs) { - this.validateResource =3D validateResource; - this.componentPath =3D compPath; - this.attrs =3D attrs; - } - - public String getLabel() { - return JSFUIMessages.Create_JSF_2_Composite_Component; - } - - @SuppressWarnings("unchecked") - public void run(final IMarker marker) { - try { - if (marker !=3D null) { - validateResource =3D marker.getResource(); - Map attrsMap =3D marker.getAttributes(); - Object object =3D attrsMap - .get(JSF2ResourceUtil.COMPONENT_RESOURCE_PATH_KEY); - componentPath =3D (String) object; - attrs =3D getAttributes(marker); - } - final IFile createdFile =3D JSF2ResourceUtil - .createCompositeComponentFile( - validateResource.getProject(), new Path( - componentPath), attrs); - validateResource.getProject().deleteMarkers(JSF2XMLValidator.JSF2_PROBL= EM_ID, - false, 1); - if (createdFile !=3D null) { - IDE.openEditor(PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage(), - createdFile); - } - Job validateJob =3D new Job("JSF 2 Components Validator") { //$NON-NLS-= 1$ - - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - ValidationFramework.getDefault() - .validate( - new IProject[] { validateResource - .getProject() }, false, false, - new NullProgressMonitor()); - } catch (CoreException e) { - return new Status(IStatus.CANCEL, - JSFModelPlugin.PLUGIN_ID, "Cancel"); //$NON-NLS-1$ - } - return IValidatorJob.OK_STATUS; - } - }; - validateJob.schedule(500); - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - } - } - - @SuppressWarnings("unchecked") - private String[] getAttributes(IMarker marker) throws CoreException { - Map attrsMap =3D marker.getAttributes(); - if (attrsMap !=3D null) { - Set set =3D new HashSet(0); - Set entries =3D attrsMap.entrySet(); - for (Entry entry : entries) { - String key =3D (String) entry.getKey(); - if (key.startsWith(IJSF2ValidationComponent.JSF2_ATTR_NAME_KEY)) { - set.add((String) entry.getValue()); - } - } - return set.toArray(new String[0]); - } - return null; - } - - public void apply(IDocument document) { - run(null); - } - - public String getAdditionalProposalInfo() { - return null; - } - - public IContextInformation getContextInformation() { - return null; - } - - public String getDisplayString() { - return JSFUIMessages.Create_JSF_2_Composite_Component; - } - - public Image getImage() { - return JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_ADD); - } - - public Point getSelection(IDocument document) { - return null; - } - -} Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/= validation/jsf2/action/CreateJSF2ResourcesFolder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/CreateJSF2ResourcesFolder.java 2010-05-05 16:29:29 UTC (r= ev 21915) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/CreateJSF2ResourcesFolder.java 2010-05-05 16:53:31 UTC (r= ev 21916) @@ -1,121 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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.jsf.web.validation.jsf2.action; - -import org.eclipse.core.resources.IMarker; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jdt.internal.ui.JavaPluginImages; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContextInformation; -import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.graphics.Point; -import org.eclipse.ui.IMarkerResolution; -import org.eclipse.wst.validation.ValidationFramework; -import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob; -import org.jboss.tools.jsf.JSFModelPlugin; -import org.jboss.tools.jsf.messages.JSFUIMessages; -import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; -import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; - -/** - * = - * @author yzhishko - * = - */ - -(a)SuppressWarnings("restriction") -public class CreateJSF2ResourcesFolder implements IMarkerResolution, - ICompletionProposal { - - private String componentPath =3D null; - private IResource validateResource =3D null; - - public String getLabel() { - return JSFUIMessages.Create_JSF_2_Resources_Folder; - } - - public CreateJSF2ResourcesFolder() { - } - - public CreateJSF2ResourcesFolder(IResource validateResource, String compP= ath) { - this.componentPath =3D compPath; - this.validateResource =3D validateResource; - } - - public void run(final IMarker marker) { - try { - if (marker !=3D null) { - componentPath =3D (String) marker - .getAttribute(IJSF2ValidationComponent.JSF2_URI_NAME_KEY); - validateResource =3D marker.getResource(); - } - JSF2ResourceUtil.createResourcesFolderByNameSpace(validateResource - .getProject(), componentPath); - validateResource.getProject().deleteMarkers( - JSF2XMLValidator.JSF2_PROBLEM_ID, false, 1); - Job validateJob =3D new Job("JSF 2 Components Validator") { //$NON-NLS-= 1$ - - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - ValidationFramework.getDefault() - .validate( - new IProject[] { validateResource - .getProject() }, false, false, - new NullProgressMonitor()); - } catch (CoreException e) { - return new Status(IStatus.CANCEL, - JSFModelPlugin.PLUGIN_ID, "Cancel"); //$NON-NLS-1$ - } - return IValidatorJob.OK_STATUS; - } - }; - validateJob.schedule(500); - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - } - } - - public void apply(IDocument document) { - run(null); - } - - public String getAdditionalProposalInfo() { - return null; - } - - public IContextInformation getContextInformation() { - return null; - } - - public String getDisplayString() { - return JSFUIMessages.Create_JSF_2_Resources_Folder; - } - - public Image getImage() { - return JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_ADD); - } - - public Point getSelection(IDocument document) { - return null; - } - -} Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/va= lidation/jsf2/action/JSF2AbstractProposal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2AbstractProposal.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2AbstractProposal.java 2010-05-05 16:53:31 UTC (rev 21= 916) @@ -0,0 +1,88 @@ +package org.jboss.tools.jsf.web.validation.jsf2.action; + +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jdt.internal.ui.JavaPluginImages; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.jface.text.contentassist.IContextInformation; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.eclipse.ui.IMarkerResolution; +import org.eclipse.wst.validation.ValidationFramework; +import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob; +import org.jboss.tools.jsf.JSFModelPlugin; + +(a)SuppressWarnings("restriction") +public abstract class JSF2AbstractProposal implements IMarkerResolution, + ICompletionProposal { + + protected JSF2AbstractProposal() { + + } + + protected JSF2AbstractProposal(IResource resource) { + validateResource =3D resource; + } + + protected IResource validateResource =3D null; + + public String getLabel() { + return getDisplayString(); + } + + public final void run(IMarker marker) { + try { + runWithMarker(marker); + Job validateJob =3D new Job("JSF 2 Components Validator") { //$NON-NLS-= 1$ + @Override + protected IStatus run(IProgressMonitor monitor) { + try { + if (validateResource !=3D null) { + ValidationFramework.getDefault().validate( + new IProject[] { validateResource + .getProject() }, false, false, + new NullProgressMonitor()); + } + } catch (CoreException e) { + return new Status(IStatus.CANCEL, + JSFModelPlugin.PLUGIN_ID, "Cancel"); //$NON-NLS-1$ + } + return IValidatorJob.OK_STATUS; + } + }; + validateJob.schedule(500); + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } + } + + public void apply(IDocument document) { + run(null); + } + + public String getAdditionalProposalInfo() { + return null; + } + + public IContextInformation getContextInformation() { + return null; + } + + public Image getImage() { + return JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_ADD); + } + + public Point getSelection(IDocument document) { + return null; + } + + protected abstract void runWithMarker(IMarker marker) throws CoreExceptio= n; +} Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/action/JSF2ComponentResolutionGenerator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2ComponentResolutionGenerator.java 2010-05-05 16:29:29= UTC (rev 21915) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2ComponentResolutionGenerator.java 2010-05-05 16:53:31= UTC (rev 21916) @@ -40,14 +40,14 @@ if (fixType !=3D null) { if (fixType .equals(IJSF2ValidationComponent.JSF2_COMPOSITE_COMPONENT_TYPE)) { - return new IMarkerResolution[] { new CreateJSF2CompositeComponent() }; + return new IMarkerResolution[] { new JSF2CompositeComponentProposal()= }; } if (fixType .equals(IJSF2ValidationComponent.JSF2_FIXABLE_ATTR_TYPE)) { - return new IMarkerResolution[] { new CreateJSF2CompositeAttrs() }; + return new IMarkerResolution[] { new JSF2CompositeAttrsProposal() }; } if (fixType.equals(IJSF2ValidationComponent.JSF2_URI_TYPE)) { - return new IMarkerResolution[] { new CreateJSF2ResourcesFolder() }; + return new IMarkerResolution[] { new JSF2ResourcesFolderProposal() }; } } } catch (CoreException e) { Copied: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/v= alidation/jsf2/action/JSF2CompositeAttrsProposal.java (from rev 21901, trun= k/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/js= f2/action/CreateJSF2CompositeAttrs.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2CompositeAttrsProposal.java (= rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2CompositeAttrsProposal.java 2010-05-05 16:53:31 UTC (= rev 21916) @@ -0,0 +1,75 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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.jsf.web.validation.jsf2.action; + +import java.util.Map; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.Path; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; +import org.jboss.tools.jsf.messages.JSFUIMessages; +import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; +import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; +import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; + +/** + * = + * @author yzhishko + * = + */ + +public class JSF2CompositeAttrsProposal extends JSF2AbstractProposal { + + private String componentPath =3D null; + private String[] attrs =3D null; + + public JSF2CompositeAttrsProposal() { + super(); + } + + public JSF2CompositeAttrsProposal(IResource validateResource, + String compPath, String[] attrs) { + super(validateResource); + this.componentPath =3D compPath; + this.attrs =3D attrs; + } + + public String getDisplayString() { + return JSFUIMessages.Create_JSF_2_Interface_Attr; + } + + @Override + protected void runWithMarker(IMarker marker) throws CoreException { + if (marker !=3D null) { + validateResource =3D marker.getResource(); + Map attrsMap =3D marker.getAttributes(); + Object object =3D attrsMap + .get(JSF2ResourceUtil.COMPONENT_RESOURCE_PATH_KEY); + componentPath =3D (String) object; + attrs =3D new String[] { (String) marker + .getAttribute(IJSF2ValidationComponent.JSF2_ATTR_NAME_KEY) }; + } + final IFile createdFile =3D JSF2ResourceUtil + .createCompositeComponentFile(validateResource.getProject(), + new Path(componentPath), attrs); + validateResource.getProject().deleteMarkers( + JSF2XMLValidator.JSF2_PROBLEM_ID, false, 1); + if (createdFile !=3D null) { + IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getActivePage(), createdFile); + } + } + +} Copied: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/v= alidation/jsf2/action/JSF2CompositeComponentProposal.java (from rev 21901, = trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validatio= n/jsf2/action/CreateJSF2CompositeComponent.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2CompositeComponentProposal.java = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2CompositeComponentProposal.java 2010-05-05 16:53:31 U= TC (rev 21916) @@ -0,0 +1,96 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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.jsf.web.validation.jsf2.action; + +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.Map.Entry; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.Path; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; +import org.jboss.tools.jsf.messages.JSFUIMessages; +import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; +import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; +import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; + +/** + * = + * @author yzhishko + * = + */ + +public class JSF2CompositeComponentProposal extends JSF2AbstractProposal { + + private String componentPath =3D null; + private String[] attrs =3D null; + + public JSF2CompositeComponentProposal() { + super(); + } + + public JSF2CompositeComponentProposal(IResource validateResource, + String compPath, String[] attrs) { + super(validateResource); + this.componentPath =3D compPath; + this.attrs =3D attrs; + } + + @SuppressWarnings("unchecked") + private String[] getAttributes(IMarker marker) throws CoreException { + Map attrsMap =3D marker.getAttributes(); + if (attrsMap !=3D null) { + Set set =3D new HashSet(0); + Set entries =3D attrsMap.entrySet(); + for (Entry entry : entries) { + String key =3D (String) entry.getKey(); + if (key.startsWith(IJSF2ValidationComponent.JSF2_ATTR_NAME_KEY)) { + set.add((String) entry.getValue()); + } + } + return set.toArray(new String[0]); + } + return null; + } + + public String getDisplayString() { + return JSFUIMessages.Create_JSF_2_Composite_Component; + } + + @SuppressWarnings("unchecked") + @Override + protected void runWithMarker(IMarker marker) throws CoreException { + if (marker !=3D null) { + validateResource =3D marker.getResource(); + Map attrsMap =3D marker.getAttributes(); + Object object =3D attrsMap + .get(JSF2ResourceUtil.COMPONENT_RESOURCE_PATH_KEY); + componentPath =3D (String) object; + attrs =3D getAttributes(marker); + } + final IFile createdFile =3D JSF2ResourceUtil + .createCompositeComponentFile(validateResource.getProject(), + new Path(componentPath), attrs); + validateResource.getProject().deleteMarkers( + JSF2XMLValidator.JSF2_PROBLEM_ID, false, 1); + if (createdFile !=3D null) { + IDE.openEditor(PlatformUI.getWorkbench().getActiveWorkbenchWindow() + .getActivePage(), createdFile); + } + + } + +} Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/action/JSF2QuickFixProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2QuickFixProcessor.java 2010-05-05 16:29:29 UTC (rev 2= 1915) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2QuickFixProcessor.java 2010-05-05 16:53:31 UTC (rev 2= 1916) @@ -56,18 +56,18 @@ if (type.equals(IJSF2ValidationComponent.JSF2_FIXABLE_ATTR_TYPE)) { String[] attrs =3D new String[] { (String) context .getAttribute(IJSF2ValidationComponent.JSF2_ATTR_NAME_KEY) }; - ICompletionProposal proposal =3D new CreateJSF2CompositeAttrs( + ICompletionProposal proposal =3D new JSF2CompositeAttrsProposal( resource, compPath, attrs); return new ICompletionProposal[] { proposal }; } else if (type .equals(IJSF2ValidationComponent.JSF2_COMPOSITE_COMPONENT_TYPE)) { - ICompletionProposal proposal =3D new CreateJSF2CompositeAttrs( + ICompletionProposal proposal =3D new JSF2CompositeAttrsProposal( resource, compPath, retriveAttrsFromContext(context)); return new ICompletionProposal[] { proposal }; } else if (type.equals(IJSF2ValidationComponent.JSF2_URI_TYPE)) { String uriPath =3D (String) context .getAttribute(IJSF2ValidationComponent.JSF2_URI_NAME_KEY); - ICompletionProposal proposal =3D new CreateJSF2ResourcesFolder( + ICompletionProposal proposal =3D new JSF2ResourcesFolderProposal( resource, uriPath); return new ICompletionProposal[] { proposal }; } Copied: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/v= alidation/jsf2/action/JSF2ResourcesFolderProposal.java (from rev 21901, tru= nk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/j= sf2/action/CreateJSF2ResourcesFolder.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2ResourcesFolderProposal.java = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2ResourcesFolderProposal.java 2010-05-05 16:53:31 UTC = (rev 21916) @@ -0,0 +1,58 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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.jsf.web.validation.jsf2.action; + +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.jsf.messages.JSFUIMessages; +import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; +import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; +import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; + +/** + * = + * @author yzhishko + * = + */ + +public class JSF2ResourcesFolderProposal extends JSF2AbstractProposal { + + private String componentPath =3D null; + + public JSF2ResourcesFolderProposal() { + super(); + } + + public JSF2ResourcesFolderProposal(IResource validateResource, String com= pPath) { + super(validateResource); + this.componentPath =3D compPath; + } + + public String getDisplayString() { + return JSFUIMessages.Create_JSF_2_Resources_Folder; + } + + @Override + protected void runWithMarker(IMarker marker) throws CoreException { + if (marker !=3D null) { + componentPath =3D (String) marker + .getAttribute(IJSF2ValidationComponent.JSF2_URI_NAME_KEY); + validateResource =3D marker.getResource(); + } + JSF2ResourceUtil.createResourcesFolderByNameSpace(validateResource + .getProject(), componentPath); + validateResource.getProject().deleteMarkers( + JSF2XMLValidator.JSF2_PROBLEM_ID, false, 1); + } + +} Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/va= lidation/jsf2/components/JSF2AbstractValidationComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2AbstractValidationComponent.java = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2AbstractValidationComponent.java 2010-05-05 16:53= :31 UTC (rev 21916) @@ -0,0 +1,51 @@ +package org.jboss.tools.jsf.web.validation.jsf2.components; + +import org.eclipse.wst.validation.internal.provisional.core.IMessage; + +public abstract class JSF2AbstractValidationComponent implements + IJSF2ValidationComponent { + + private int length; + private int startOffSet; + private int line; + private Object[] messageParams; + + public int getLength() { + return length; + } + + public void setLength(int length) { + this.length =3D length; + } + + public int getLine() { + return line; + } + + public void setLine(int lineNumber) { + this.line =3D lineNumber; + } + = + public int getStartOffSet() { + return startOffSet; + } + + public void setStartOffSet(int startOffSet) { + this.startOffSet =3D startOffSet; + } + + public Object[] getMessageParams() { + return messageParams; + } + + public int getSeverity() { + return IMessage.NORMAL_SEVERITY; + } + = + public abstract void createValidationMessage(); + = + public void createMessageParams() { + this.messageParams =3D new Object[] { this }; + } + +} Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/components/JSF2AttrTempComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2AttrTempComponent.java 2010-05-05 16:29:29 UTC (r= ev 21915) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2AttrTempComponent.java 2010-05-05 16:53:31 UTC (r= ev 21916) @@ -12,8 +12,6 @@ package org.jboss.tools.jsf.web.validation.jsf2.components; = import java.text.MessageFormat; - -import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.jboss.tools.jsf.messages.JSFUIMessages; @@ -26,13 +24,9 @@ */ = @SuppressWarnings("restriction") -public class JSF2AttrTempComponent implements IJSF2ValidationComponent { +public class JSF2AttrTempComponent extends JSF2AbstractValidationComponent= { = - private int length; - private int startOffSet; - private int line; private String validationMessage =3D ""; //$NON-NLS-1$ - private Object[] messageParams; private String type =3D JSF2_UNFIXABLE_ATTR_TYPE; private ElementImpl parentEl; private IDOMAttr attr; @@ -43,31 +37,7 @@ this.parentEl =3D parentEl; } = - public int getLength() { - return length; - } - - void setLength(int length) { - this.length =3D length; - } - - public int getLine() { - return line; - } - - void setLine(int lineNumber) { - this.line =3D lineNumber; - } - - public int getStartOffSet() { - return startOffSet; - } - - void setStartOffSet(int startOffSet) { - this.startOffSet =3D startOffSet; - } - - void createValidationMessage() { + public void createValidationMessage() { String nodeName =3D parentEl.getLocalName(); this.validationMessage =3D MessageFormat.format( JSFUIMessages.Missing_JSF_2_Component_Attr, attr.getName(), @@ -78,15 +48,7 @@ return validationMessage; } = - void createMessageParams() { - this.messageParams =3D new Object[] { this }; - } - - public Object[] getMessageParams() { - return messageParams; - } - - void setType(String type) { + public void setType(String type) { this.type =3D type; } = @@ -109,8 +71,4 @@ return componentResLocation; } = - public int getSeverity() { - return IMessage.NORMAL_SEVERITY; - } - } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/components/JSF2CompositeTempComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2CompositeTempComponent.java 2010-05-05 16:29:29 U= TC (rev 21915) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2CompositeTempComponent.java 2010-05-05 16:53:31 U= TC (rev 21916) @@ -14,7 +14,6 @@ import java.text.MessageFormat; import java.util.ArrayList; import java.util.List; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.jboss.tools.jsf.messages.JSFUIMessages; @@ -24,16 +23,13 @@ /** * = * @author yzhishko - * + * = */ = @SuppressWarnings("restriction") -public class JSF2CompositeTempComponent implements IJSF2ValidationComponen= t { - private int length; - private int startOffSet; - private int line; +public class JSF2CompositeTempComponent extends JSF2AbstractValidationComp= onent { + private String validationMessage =3D ""; //$NON-NLS-1$ - private Object[] messageParams; private List attrNames =3D new ArrayList(0); private ElementImpl element; private String componentResLoc; @@ -42,31 +38,7 @@ this.element =3D element; } = - public int getLength() { - return length; - } - - void setLength(int length) { - this.length =3D length; - } - - public int getLine() { - return line; - } - - void setLine(int lineNumber) { - this.line =3D lineNumber; - } - - public int getStartOffSet() { - return startOffSet; - } - - void setStartOffSet(int startOffSet) { - this.startOffSet =3D startOffSet; - } - - void createValidationMessage() { + public void createValidationMessage() { String nodeName =3D element.getLocalName(); this.validationMessage =3D MessageFormat.format( JSFUIMessages.Missing_JSF_2_Composite_Component, nodeName); @@ -76,7 +48,8 @@ return validationMessage; } = - void createMessageParams() { + @Override + public void createMessageParams() { NamedNodeMap attrsMap =3D element.getAttributes(); if (attrsMap !=3D null && attrsMap.getLength() !=3D 0) { for (int i =3D 0; i < attrsMap.getLength(); i++) { @@ -84,13 +57,9 @@ attrNames.add(attr.getName()); } } - this.messageParams =3D new Object[] { this }; + super.createMessageParams(); } = - public Object[] getMessageParams() { - return messageParams; - } - public String[] getAttrNames() { return attrNames.toArray(new String[0]); } @@ -110,8 +79,4 @@ return componentResLoc; } = - public int getSeverity() { - return IMessage.NORMAL_SEVERITY; - } - } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/components/JSF2URITempComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2URITempComponent.java 2010-05-05 16:29:29 UTC (re= v 21915) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2URITempComponent.java 2010-05-05 16:53:31 UTC (re= v 21916) @@ -12,7 +12,6 @@ package org.jboss.tools.jsf.web.validation.jsf2.components; = import java.text.MessageFormat; -import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.jboss.tools.jsf.messages.JSFUIMessages; import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; = @@ -22,44 +21,16 @@ * = */ = -public class JSF2URITempComponent implements IJSF2ValidationComponent { +public class JSF2URITempComponent extends JSF2AbstractValidationComponent { = - private int length; - private int startOffSet; - private int line; private String validationMessage =3D ""; //$NON-NLS-1$ - private Object[] messageParams; private String URI; = public JSF2URITempComponent(String URI) { this.URI =3D URI; } = - public int getLength() { - return length; - } - - void setLength(int length) { - this.length =3D length; - } - - public int getLine() { - return line; - } - - void setLine(int lineNumber) { - this.line =3D lineNumber; - } - - public int getStartOffSet() { - return startOffSet; - } - - void setStartOffSet(int startOffSet) { - this.startOffSet =3D startOffSet; - } - - void createValidationMessage() { + public void createValidationMessage() { String mesParam =3D "/resources" + URI.replaceAll(JSF2ResourceUtil.JSF2_= URI_PREFIX, ""); //$NON-NLS-1$ //$NON-NLS-2$ this.validationMessage =3D MessageFormat.format( JSFUIMessages.Missing_JSF_2_Resources_Folder, mesParam); @@ -69,14 +40,6 @@ return validationMessage; } = - public Object[] getMessageParams() { - return messageParams; - } - - void createMessageParams() { - messageParams =3D new Object[] { this }; - } - public String getType() { return JSF2_URI_TYPE; } @@ -85,10 +48,6 @@ return ""; //$NON-NLS-1$ } = - public int getSeverity() { - return IMessage.NORMAL_SEVERITY; - } - public String getURI() { return URI; } Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-05-0= 5 16:29:29 UTC (rev 21915) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-05-0= 5 16:53:31 UTC (rev 21916) @@ -21,7 +21,8 @@ org.jboss.tools.jst.web.ui, org.jboss.tools.common.model.ui, org.eclipse.ui.ide, - org.eclipse.ltk.core.refactoring;bundle-version=3D"3.5.0" + org.eclipse.ltk.core.refactoring;bundle-version=3D"3.5.0", + org.eclipse.wst.validation;bundle-version=3D"1.2.104" Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.classpath (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.classpath 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.project (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.project 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,43 @@ + + + JSF2ComponentsValidator + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.jboss.tools.jst.web.kb.kbbuilder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.jboss.tools.jsf.jsfnature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.jsdt.core.jsNature + org.jboss.tools.jst.web.kb.kbnature + + Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/.settings/.jsdtscope =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.settings/.jsdtscope (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.settings/.jsdtscope 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,11 @@ + + + + + + + + + + + Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/.settings/org.eclipse.jdt.core.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.settings/org.eclipse.jdt.core.prefs 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,7 @@ +#Wed May 05 14:06:47 EEST 2010 +eclipse.preferences.version=3D1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5 +org.eclipse.jdt.core.compiler.compliance=3D1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror +org.eclipse.jdt.core.compiler.problem.enumIdentifier=3Derror +org.eclipse.jdt.core.compiler.source=3D1.5 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/.settings/org.eclipse.wst.common.component =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.settings/org.eclipse.wst.common.component (rev = 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.settings/org.eclipse.wst.common.component 2010-05-05 16:53:31 UTC (rev = 21916) @@ -0,0 +1,9 @@ + + + + + + + + + Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/.settings/org.eclipse.wst.common.project.facet.core.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.settings/org.eclipse.wst.common.project.facet.core.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-05-05 16:53= :31 UTC (rev 21916) @@ -0,0 +1,8 @@ + + + + + + + + Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/.settings/org.eclipse.wst.jsdt.ui.superType.container =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.settings/org.eclipse.wst.jsdt.ui.superType.container = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-05-05 16:53:3= 1 UTC (rev 21916) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/.settings/org.eclipse.wst.jsdt.ui.superType.name =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.settings/org.eclipse.wst.jsdt.ui.superType.name = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-05-05 16:53:31 UTC= (rev 21916) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/JavaSource/demo/Person.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/JavaSource/demo/Person.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/JavaSource/demo/Person.java 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,29 @@ +/*************************************************************************= ****** + * Copyright (c) 2007 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ = +package demo; + +/** + * Created by JBoss Tools + */ +public class Person { + private String name; + + public Person() { + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name =3D name; + } +} \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/JavaSource/resources.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/JavaSource/resources.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/JavaSource/resources.properties 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,2 @@ +prompt=3DYour Name\: +greeting=3DHello Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/WebContent/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/META-INF/MANIFEST.MF 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: = + Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/WebContent/WEB-INF/classes/demo/Person.class =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2= ComponentsValidator/WebContent/WEB-INF/classes/demo/Person.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/WebContent/WEB-INF/classes/resources.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/WEB-INF/classes/resources.properties = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/WEB-INF/classes/resources.properties 2010-05-05 16:53:31 UTC = (rev 21916) @@ -0,0 +1,2 @@ +prompt=3DYour Name\: +greeting=3DHello Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/WebContent/WEB-INF/faces-config.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/WEB-INF/faces-config.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/WEB-INF/faces-config.xml 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,27 @@ + + + + person + demo.Person + request + + name + + + + + /pages/inputname.xhtml + + greeting + /pages/greeting.xhtml + + + + com.sun.facelets.FaceletViewHandler + + + + + \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/WebContent/WEB-INF/lib/jbide2550.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2= ComponentsValidator/WebContent/WEB-INF/lib/jbide2550.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/WebContent/WEB-INF/web.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/WEB-INF/web.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/WEB-INF/web.xml 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,38 @@ + + + Facelets StarterKit + JSF2ComponentsValidator + + com.sun.faces.validateXml + true + + + com.sun.faces.verifyObjects + true + + + facelets.DEVELOPMENT + true + + + facelets.REFRESH_PERIOD + 2 + + + javax.faces.DEFAULT_SUFFIX + .xhtml + + + javax.faces.STATE_SAVING_METHOD + client + + + Faces Servlet + javax.faces.webapp.FacesServlet + 1 + + + Faces Servlet + *.jsf + + \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/WebContent/index.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/index.jsp (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/index.jsp 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/WebContent/pages/greeting.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/pages/greeting.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/pages/greeting.xhtml 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,15 @@ + + + + + + Greeting to User + Greeting Page + + #{msg.greeting} #{person.name}! + + + \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/WebContent/pages/inputname.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/pages/inputname.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/pages/inputname.xhtml 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,29 @@ + + + + + + + + Input User Name + + Facelets Hello Application + + + +
+ + + + + + +
+ + Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/WebContent/templates/common.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/templates/common.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/WebContent/templates/common.xhtml 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,65 @@ + + + = + + + <ui:insert name=3D"pageTitle">Page Title</ui:insert> + + + + + + + + + + + + + = + + + + = + = + + + + +
+ Page Header +
+ + + + + + +
+ = + Page Body + = +
+
+ + = + \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/ant/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/ant/build.properties (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/ant/build.properties 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,3 @@ +# +#Wed May 05 14:06:46 EEST 2010 +classpath.external=3D Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsVali= dator/ant/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/ant/build.xml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JSF2ComponentsValidat= or/ant/build.xml 2010-05-05 16:53:31 UTC (rev 21916) @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/= test/JsfAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/J= sfAllTests.java 2010-05-05 16:29:29 UTC (rev 21915) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/J= sfAllTests.java 2010-05-05 16:53:31 UTC (rev 21916) @@ -7,7 +7,7 @@ * * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ = + *************************************************************************= *****/ package org.jboss.tools.jsf.test; = import junit.extensions.TestSetup; @@ -17,33 +17,44 @@ import org.eclipse.jdt.internal.core.JavaModelManager; import org.jboss.tools.jsf.model.pv.test.JSFPromptingProviderTest; import org.jboss.tools.jsf.test.refactoring.ELVariableRefactoringTest; +import org.jboss.tools.jsf.test.validation.JSF2ComponentsValidatorTest; import org.jboss.tools.test.util.ProjectImportTestSetup; = public class JsfAllTests { -// public static final String PLUGIN_ID =3D "org.jboss.tools.jsf"; + // public static final String PLUGIN_ID =3D "org.jboss.tools.jsf"; = public static Test suite() { - TestSuite suite =3D new TestSuite("Test model loading for JSF projects"); - TestSuite old =3D new TestSuite("Tests are using JSFKickStartOldFormat"); + TestSuite suite =3D new TestSuite("Test model loading for JSF projects")= ; //$NON-NLS-1$ + TestSuite old =3D new TestSuite("Tests are using JSFKickStartOldFormat")= ; //$NON-NLS-1$ old.addTestSuite(JSFModelTest.class); old.addTestSuite(ModelFormat_2_0_0_Test.class); old.addTestSuite(JSFBeansTest.class); - suite.addTest(new ProjectImportTestSetup(old,"org.jboss.tools.jsf.test",= "projects/JSFKickStartOldFormat","JSFKickStartOldFormat")); - suite.addTest(new ProjectImportTestSetup(new TestSuite(JSFPromptingProvi= derTest.class),"org.jboss.tools.jsf.test", JSFPromptingProviderTest.TEST_PR= OJECT_PATH, JSFPromptingProviderTest.TEST_PROJECT_NAME)); - = - suite.addTest(new ProjectImportTestSetup(new TestSuite(ELVariableRefacto= ringTest.class), - "org.jboss.tools.jsf.test", - new String[]{"projects/JSFKickStartOldFormat"}, - new String[]{"JSFKickStartOldFormat"})); + suite.addTest(new ProjectImportTestSetup(old, + "org.jboss.tools.jsf.test", "projects/JSFKickStartOldFormat", //$NON-N= LS-1$ //$NON-NLS-2$ + "JSFKickStartOldFormat")); //$NON-NLS-1$ + suite.addTest(new ProjectImportTestSetup(new TestSuite( + JSFPromptingProviderTest.class), + "org.jboss.tools.jsf.test", //$NON-NLS-1$ + JSFPromptingProviderTest.TEST_PROJECT_PATH, + JSFPromptingProviderTest.TEST_PROJECT_NAME)); + + suite.addTest(new ProjectImportTestSetup(new TestSuite( + ELVariableRefactoringTest.class), "org.jboss.tools.jsf.test", //$NON-N= LS-1$ + new String[] { "projects/JSFKickStartOldFormat" }, //$NON-NLS-1$ + new String[] { "JSFKickStartOldFormat" })); //$NON-NLS-1$ + suite.addTest(new ProjectImportTestSetup(new TestSuite( + JSF2ComponentsValidatorTest.class), "org.jboss.tools.jsf.test", //$NON= -NLS-1$ + new String[] { "projects/JSF2ComponentsValidator" }, //$NON-NLS-1$ + new String[] { "JSF2ComponentsValidator" })); //$NON-NLS-1$ return new DisableJavaIndexingSetup(suite); } - = + public static class DisableJavaIndexingSetup extends TestSetup { = public DisableJavaIndexingSetup(Test test) { super(test); } - = + @Override protected void setUp() throws Exception { JavaModelManager.getIndexManager().disable(); Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/tes= t/validation/JSF2ComponentsValidatorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/v= alidation/JSF2ComponentsValidatorTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/v= alidation/JSF2ComponentsValidatorTest.java 2010-05-05 16:53:31 UTC (rev 219= 16) @@ -0,0 +1,78 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2010 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ + +package org.jboss.tools.jsf.test.validation; + +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.wst.validation.ValidationFramework; +import org.jboss.tools.test.util.ProjectImportTestSetup; + +import junit.framework.TestCase; + +/** + * = + * @author yzhishko + * + */ + +public class JSF2ComponentsValidatorTest extends TestCase { + + private static String projectName =3D "JSF2ComponentsValidator"; //$NON-N= LS-1$ + private static IProject project; + + public JSF2ComponentsValidatorTest() { + super("JSF 2 Components Validator Test"); //$NON-NLS-1$ + } + + protected void setUp() throws Exception { + project =3D ProjectImportTestSetup.loadProject(projectName); + project.build(IncrementalProjectBuilder.FULL_BUILD, + new NullProgressMonitor()); + } + + public void testJSF2ComponentsValidator() throws Exception { + ValidationFramework.getDefault().validate(new IProject[] { project }, + false, false, new NullProgressMonitor()); + IResource resource =3D project + .findMember("/WebContent/pages/inputname.xhtml"); //$NON-NLS-1$ + assertNotNull(resource); + IMarker[] markers =3D resource.findMarkers( + "org.jboss.tools.jsf.jsf2problemmarker", false, 1); //$NON-NLS-1$ + assertNotNull(markers); + assertTrue(markers.length =3D=3D 4); + assertTrue(isMarkerExist(markers, + "Composite component \"echo\" was not found in a project resources dir= ectory")); //$NON-NLS-1$ + assertTrue(isMarkerExist(markers, + "Attribute \"anknownAttr\" is not defined for \"echo\" composite compo= nent")); //$NON-NLS-1$ + assertTrue(isMarkerExist( + markers, + "Resources folder \"/resources/jarPage1\" is missing in a project root= directory")); //$NON-NLS-1$ + assertTrue(isMarkerExist(markers, + "Composite component \"echo1\" was not found in a project resources di= rectory")); //$NON-NLS-1$ + } + + private boolean isMarkerExist(IMarker[] markers, String markerMesssage) + throws CoreException { + for (int i =3D 0; i < markers.length; i++) { + if (markerMesssage.equals((String) markers[i] + .getAttribute("message"))) { //$NON-NLS-1$ + return true; + } + } + return false; + } + +} --===============7273273878494042764==-- From jbosstools-commits at lists.jboss.org Wed May 5 13:02:39 2010 Content-Type: multipart/mixed; boundary="===============2748129669896230259==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21917 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation. Date: Wed, 05 May 2010 13:02:39 -0400 Message-ID: <201005051702.o45H2dtg011844@svn01.web.mwc.hst.phx2.redhat.com> --===============2748129669896230259== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-05 13:02:38 -0400 (Wed, 05 May 2010) New Revision: 21917 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java Log: https://jira.jboss.org/jira/browse/JBIDE-6255 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-05 16:53:31 UTC (rev 219= 16) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-05 17:02:38 UTC (rev 219= 17) @@ -208,11 +208,11 @@ ContextValidationHelper validationHelper, ValidatorManager manager, IReporter reporter) throws ValidationException { init(project, validationHelper, manager, reporter); - displaySubtask(CDIValidationMessages.VALIDATING_PROJECT, new String[]{pr= ojectName}); - removeAllMessagesFromResource(cdiProject.getNature().getProject()); if(cdiProject =3D=3D null) { return OK_STATUS; } + displaySubtask(CDIValidationMessages.VALIDATING_PROJECT, new String[]{pr= ojectName}); + removeAllMessagesFromResource(cdiProject.getNature().getProject()); IBean[] beans =3D cdiProject.getBeans(); for (IBean bean : beans) { validateBean(bean); --===============2748129669896230259==-- From jbosstools-commits at lists.jboss.org Wed May 5 13:22:48 2010 Content-Type: multipart/mixed; boundary="===============2620561838140093612==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21918 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action. Date: Wed, 05 May 2010 13:22:48 -0400 Message-ID: <201005051722.o45HMmuK020246@svn01.web.mwc.hst.phx2.redhat.com> --===============2620561838140093612== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yzhishko Date: 2010-05-05 13:22:47 -0400 (Wed, 05 May 2010) New Revision: 21918 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/JSF2QuickFixProcessor.java Log: https://jira.jboss.org/jira/browse/JBIDE-5930 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/action/JSF2QuickFixProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2QuickFixProcessor.java 2010-05-05 17:02:38 UTC (rev 2= 1917) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2QuickFixProcessor.java 2010-05-05 17:22:47 UTC (rev 2= 1918) @@ -61,7 +61,7 @@ return new ICompletionProposal[] { proposal }; } else if (type .equals(IJSF2ValidationComponent.JSF2_COMPOSITE_COMPONENT_TYPE)) { - ICompletionProposal proposal =3D new JSF2CompositeAttrsProposal( + ICompletionProposal proposal =3D new JSF2CompositeComponentProposal( resource, compPath, retriveAttrsFromContext(context)); return new ICompletionProposal[] { proposal }; } else if (type.equals(IJSF2ValidationComponent.JSF2_URI_TYPE)) { --===============2620561838140093612==-- From jbosstools-commits at lists.jboss.org Wed May 5 13:31:12 2010 Content-Type: multipart/mixed; boundary="===============8286415871117716105==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21919 - branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images. Date: Wed, 05 May 2010 13:31:12 -0400 Message-ID: <201005051731.o45HVCkQ021191@svn01.web.mwc.hst.phx2.redhat.com> --===============8286415871117716105== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-05 13:31:12 -0400 (Wed, 05 May 2010) New Revision: 21919 Modified: branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse.c= onsole/icons/images/unknowntypeproperty.gif Log: https://jira.jboss.org/jira/browse/JBIDE-6030 - fix Modified: branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.ec= lipse.console/icons/images/unknowntypeproperty.gif =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============8286415871117716105==-- From jbosstools-commits at lists.jboss.org Wed May 5 13:33:21 2010 Content-Type: multipart/mixed; boundary="===============3306145540919134865==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21920 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images. Date: Wed, 05 May 2010 13:33:21 -0400 Message-ID: <201005051733.o45HXLB4021345@svn01.web.mwc.hst.phx2.redhat.com> --===============3306145540919134865== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-05 13:33:20 -0400 (Wed, 05 May 2010) New Revision: 21920 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/images/= unknowntypeproperty.gif Log: https://jira.jboss.org/jira/browse/JBIDE-6030 - fix Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/icons/= images/unknowntypeproperty.gif =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============3306145540919134865==-- From jbosstools-commits at lists.jboss.org Wed May 5 14:02:28 2010 Content-Type: multipart/mixed; boundary="===============3775517893508259411==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21921 - branches/modular_build/build. Date: Wed, 05 May 2010 14:02:28 -0400 Message-ID: <201005051802.o45I2SOo025139@svn01.web.mwc.hst.phx2.redhat.com> --===============3775517893508259411== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 14:02:28 -0400 (Wed, 05 May 2010) New Revision: 21921 Modified: branches/modular_build/build/build.xml Log: improve update site generation Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-05 17:33:20 UTC (rev 219= 20) +++ branches/modular_build/build/build.xml 2010-05-05 18:02:28 UTC (rev 219= 21) @@ -286,8 +286,16 @@ = + + + + + + + + + - @@ -402,6 +410,7 @@ </testsuite> + The following components' sources have changed= and will be built: @@ -517,7 +526,7 @@ rm -fr /tmp/.X3-lock fi /usr/bin/Xvfb :3 -ac 2>&1 1>/dev/null & = -DISPLAY=3D:3 /opt/maven3/bin/mvn $* = +DISPLAY=3D:3 /opt/maven3/bin/mvn $* kill -9 `cat /tmp/.X3-lock` rm -fr /tmp/.X3-lock @@ -645,43 +654,51 @@ = - + + + + All components up to date: nothing to do! +To force a build of unchanged components, use -Dbuild.if.sources.unchanged= =3Dtrue + + + = - - - - - - + + + + + = - - - - - - - - + + + + + + + + = - - - - - + + + + + = - - - - - - - - - - - + + + + + + + + + + + + + = @@ -700,6 +717,7 @@ /> + = @@ -724,32 +742,56 @@ = - - - - - - - - - - + + + + - - - + + + + + + + + + + + + + + + + + + + + + + Overall update site zip is empty! + + + Update site zip for ${COMPONENTS.to.build} is e= mpty! + + + = - + + + --===============3775517893508259411==-- From jbosstools-commits at lists.jboss.org Wed May 5 14:20:21 2010 Content-Type: multipart/mixed; boundary="===============7128260007055966535==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21922 - trunk/jmx/docs/reference/en-US. Date: Wed, 05 May 2010 14:20:19 -0400 Message-ID: <201005051820.o45IKJUi000995@svn01.web.mwc.hst.phx2.redhat.com> --===============7128260007055966535== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-05 14:20:19 -0400 (Wed, 05 May 2010) New Revision: 21922 Modified: trunk/jmx/docs/reference/en-US/introduction.xml Log: TOOLSDOC-68-Broken "IntsallingJBossTools" in jmx ref guide - fixed = Modified: trunk/jmx/docs/reference/en-US/introduction.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/docs/reference/en-US/introduction.xml 2010-05-05 18:02:28 UTC= (rev 21921) +++ trunk/jmx/docs/reference/en-US/introduction.xml 2010-05-05 18:20:19 UTC= (rev 21922) @@ -1,133 +1,133 @@ - - - - - Introduction - JBoss Tools' JMX project is a fork of eclipse-jmx, a p= roject by Jeff Mesnil. - It was forked with permission. - = -
- What is JMX? - -The Java Management Extensions (JMX) technology is a standard part of the = Java Platform, Standard Edition (Java SE platform). The JMX technology was = added to the platform in the Java 2 Platform, Standard Edition (J2SE) 5.0 r= elease. - - -The JMX technology provides a simple, standard way of managing resources s= uch as applications, devices, and services. Because the JMX technology is d= ynamic, you can use it to monitor and manage resources as they are created,= installed and implemented. You can also use the JMX technology to monitor = and manage the Java Virtual Machine (Java VM). - - -The JMX specification defines the architecture, design patterns, APIs, and= services in the Java programming language for management and monitoring of= applications and networks. - - -Using the JMX technology, a given resource is instrumented by one or more = Java objects known as Managed Beans, or MBeans. These MBeans are registered= in a core-managed object server, known as an MBean server. The MBean serve= r acts as a management agent and can run on most devices that have been ena= bled for the Java programming language. = - - - -The specifications define JMX agents that you use to manage any resources = that have been correctly configured for management. A JMX agent consists of= an MBean server, in which MBeans are registered, and a set of services for= handling the MBeans. In this way, JMX agents directly control resources an= d make them available to remote management applications. - - -The way in which resources are instrumented is completely independent from= the management infrastructure. Resources can therefore be rendered managea= ble regardless of how their management applications are implemented. - - -The JMX technology defines standard connectors (known as JMX connectors) t= hat enable you to access JMX agents from remote management applications. JM= X connectors using different protocols provide the same management interfac= e. Consequently, a management application can manage resources transparentl= y, regardless of the communication protocol used. JMX agents can also be us= ed by systems or applications that are not compliant with the JMX specifica= tion, as long as those systems or applications support JMX agents. = - -Read more about JMX. -
- = -
- What is JMX Tools? - JBoss JMX Tools allow to setup multiple JMX = connections and provide view - for exploring the JMX tree and execute operations directly from Eclips= e. - - This chapter covers the basics of working with JMX plugi= n, which is - used to manage Java applications through JMX and its RMI Connector. - -
- JMX Tools - - - - - -
-
- -
Key Features of JMX Tools - For a start, we propose you to look through the table of main fe= atures of JMX Tools: - - = - Key Functionality for JMX Tools - - = - - - - = - - - Feature - Benefit - Chapter - - - = - - = - - MBean Explorer - MBean Explorer is a useful view with a text filte= r that displays domains, mbeans, attributes, and operations inside a connec= tion. - - MBean Explorer - - - = - - MBean Editor - MBean Editor is a multi-page editor to manage MBe= ans. - - MBean Editor - - - - -
-
- = -
- Requirements and Installation -
- Requirements - Requirements to use JMX Tools are the follo= wing: - = - - - JMX Tools is developed on Eclipse 3.4.x= milestones - - - JMX Tools requires that Eclipse is run = on a JDK 1.5.0 or above - (due to dependencies on JMX packages which were introduced in Ja= va 1.5.0) - - -
-
- Installation - Here, we are going to explain how to install the JMX p= lugin into - Eclipse. - - JMX Tools is one module of the JB= oss Tools - project. JMX Tools has no dependency on any oth= er part of JBoss - Tools, and can be downloaded standalone. Even though th= e JMX - Tools have no dependencies, other plugins, such as AS Tools, - do depend on the JMX Tooling and even extend it. - - You can find the JBoss Tools plugins over a= t the download pages. The only - package you'll need to get is the JMX Tooling, however the AS - Tools would give you a more full experience when using = JMX with JBoss Servers. - You can find further download and installation instructions on the J= Boss Wiki in the Installing= JBossTools - section. -
-
- + + + + + Introduction + JBoss Tools' JMX project is a fork of eclipse-jmx, a p= roject by Jeff Mesnil. + It was forked with permission. + = +
+ What is JMX? + +The Java Management Extensions (JMX) technology is a standard part of the = Java Platform, Standard Edition (Java SE platform). The JMX technology was = added to the platform in the Java 2 Platform, Standard Edition (J2SE) 5.0 r= elease. + + +The JMX technology provides a simple, standard way of managing resources s= uch as applications, devices, and services. Because the JMX technology is d= ynamic, you can use it to monitor and manage resources as they are created,= installed and implemented. You can also use the JMX technology to monitor = and manage the Java Virtual Machine (Java VM). + + +The JMX specification defines the architecture, design patterns, APIs, and= services in the Java programming language for management and monitoring of= applications and networks. + + +Using the JMX technology, a given resource is instrumented by one or more = Java objects known as Managed Beans, or MBeans. These MBeans are registered= in a core-managed object server, known as an MBean server. The MBean serve= r acts as a management agent and can run on most devices that have been ena= bled for the Java programming language. = + + + +The specifications define JMX agents that you use to manage any resources = that have been correctly configured for management. A JMX agent consists of= an MBean server, in which MBeans are registered, and a set of services for= handling the MBeans. In this way, JMX agents directly control resources an= d make them available to remote management applications. + + +The way in which resources are instrumented is completely independent from= the management infrastructure. Resources can therefore be rendered managea= ble regardless of how their management applications are implemented. + + +The JMX technology defines standard connectors (known as JMX connectors) t= hat enable you to access JMX agents from remote management applications. JM= X connectors using different protocols provide the same management interfac= e. Consequently, a management application can manage resources transparentl= y, regardless of the communication protocol used. JMX agents can also be us= ed by systems or applications that are not compliant with the JMX specifica= tion, as long as those systems or applications support JMX agents. = + +Read more about JMX. +
+ = +
+ What is JMX Tools? + JBoss JMX Tools allow to setup multiple JMX = connections and provide view + for exploring the JMX tree and execute operations directly from Eclips= e. + + This chapter covers the basics of working with JMX plugi= n, which is + used to manage Java applications through JMX and its RMI Connector. + +
+ JMX Tools + + + + + +
+
+ +
Key Features of JMX Tools + For a start, we propose you to look through the table of main fe= atures of JMX Tools: + + = + Key Functionality for JMX Tools + + = + + + + = + + + Feature + Benefit + Chapter + + + = + + = + + MBean Explorer + MBean Explorer is a useful view with a text filte= r that displays domains, mbeans, attributes, and operations inside a connec= tion. + + MBean Explorer + + + = + + MBean Editor + MBean Editor is a multi-page editor to manage MBe= ans. + + MBean Editor + + + + +
+
+ = +
+ Requirements and Installation +
+ Requirements + Requirements to use JMX Tools are the follo= wing: + = + + + JMX Tools is developed on Eclipse 3.4.x= milestones + + + JMX Tools requires that Eclipse is run = on a JDK 1.5.0 or above + (due to dependencies on JMX packages which were introduced in Ja= va 1.5.0) + + +
+
+ Installation + Here, we are going to explain how to install the JMX p= lugin into + Eclipse. + + JMX Tools is one module of the JB= oss Tools + project. JMX Tools has no dependency on any oth= er part of JBoss + Tools, and can be downloaded standalone. Even though th= e JMX + Tools have no dependencies, other plugins, such as AS Tools, + do depend on the JMX Tooling and even extend it. + + You can find the JBoss Tools plugins over a= t the download pages. The only + package you'll need to get is the JMX Tooling, however the AS + Tools would give you a more full experience when using = JMX with JBoss Servers. + You can find further download and installation instructions on the J= Boss Wiki in the Installin= gJBossTools + section. +
+
+ \ No newline at end of file --===============7128260007055966535==-- From jbosstools-commits at lists.jboss.org Wed May 5 14:24:41 2010 Content-Type: multipart/mixed; boundary="===============8154569752068856445==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21923 - in trunk/drools/docs/reference/en-US: images/debugging_rules and 1 other directory. Date: Wed, 05 May 2010 14:24:41 -0400 Message-ID: <201005051824.o45IOfv3001155@svn01.web.mwc.hst.phx2.redhat.com> --===============8154569752068856445== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-05 14:24:41 -0400 (Wed, 05 May 2010) New Revision: 21923 Modified: trunk/drools/docs/reference/en-US/debugging_rules.xml trunk/drools/docs/reference/en-US/images/debugging_rules/debugging_rules= 1.png Log: TOOLSDOC-65-drools ref guide should mention which file to open/use - done = Modified: trunk/drools/docs/reference/en-US/debugging_rules.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/reference/en-US/debugging_rules.xml 2010-05-05 18:20:= 19 UTC (rev 21922) +++ trunk/drools/docs/reference/en-US/debugging_rules.xml 2010-05-05 18:24:= 41 UTC (rev 21923) @@ -1,137 +1,141 @@ - - - - - JBoss Tools - Drools Tools - - - - Debugging rules - = - This chapter describes how to debug rules during the execution of y= our Drools application. - -
- Creating Breakpoints - = - At first, we'll focus on how to add - breakpoints in the consequences of your rules. - = - Whenever such a breakpoint is uncounted - during the execution of the rules, the execution is halted. It's p= ossible then inspect the - variables known at that point and use any of the default debugging acti= ons to decide what - should happen next (step over, continue, etc). To inspect - the content of the working memory and agenda the Debug views can be use= d. - - You can add/remove rule breakpoints in - .drl - files in two ways, similar to adding breakpoints to Java fi= les: - - - - Double-click the ruler in the Rule editor a= t the line - where you want to add a breakpoint. - - Tip: - Note that rule breakpoints can only be created in the consequen= ce of a - rule. Double-clicking on a line where no breakpoint is allowed will = do - nothing. - - A breakpoint can be removed by double-clicking the ruler once mo= re. - - - - Right-click the ruler. Select - Toggle Breakpoint - action in the appeared popup menu. Clicking the action wi= ll add a - breakpoint at the selected line or remove it if there is one already.= - - - -
- Adding Breakpoints - - - - - -
- - The Debug perspective contains a Br= eakpoints - view which can be used to see all defined breakpoints, get = their - properties, enable/disable or remove them, etc. You can switch to it by= navigating to - Window > Perspective > Others > Debug.= -
- -
- Debugging - - Drools breakpoints are only enabled if you debug your application = as a Drools - Application. To do this you should perform one of the actions: - - - - Select the main class of your application. Right click it and se= lect - Debug As > Drools Application. - - -
- Debugging Drools Application - - - - - -
- - - - Alternatively, you can also go to - Debug As > Debug Configuration - to open a new dialog for creating, managing and running d= ebug - configurations. - - Select the - Drools Application - item in the left tree and click the - New launch configuration - button (leftmost icon in the toolbar above the tree). Thi= s will - create a new configuration and already fill in some of the properties= (like the - Project and Main class) based on main class you selected in the begin= ning. All - properties shown here are the same as any standard Java program. - - - -
- New Debug Configuration - - - - - -
- - - Tip: - Remember to change the name of your debug configuration to someth= ing meaningful. - - = - Next - click the - Debug - button on the bottom to start debugging your application. <= /para> - - After enabling the debugging, the application starts executing and= will halt if - any breakpoint is encountered. This can be a Drools rule breakpoint, or= any other - standard Java breakpoint. Whenever a Drools rule breakpoint is encounte= red, the - corresponding - .drl file is opened and the active lin= e is highlighted. The Variables view - also contains all rule parameters and their value. You can then use the= default Java - debug actions to decide what to do next (resume, terminate, step over, = etc.). The debug - views can also be used to determine the contents of the working memory = and agenda at - that time as well (you don't have to select a working memory now, the c= urrent executing - working memory is automatically shown). - = - = -
- + + + + + JBoss Tools + Drools Tools + + + + Debugging rules + = + This chapter describes how to debug rules during the execution of y= our Drools application. + +
+ Creating Breakpoints + = + At first, we'll focus on how to add + breakpoints in the consequences of your rules. + = + Whenever such a breakpoint is uncounted + during the execution of the rules, the execution is halted. It's p= ossible then inspect the + variables known at that point and use any of the default debugging acti= ons to decide what + should happen next (step over, continue, etc). To inspect + the content of the working memory and agenda the Debug views can be use= d. + + To create breakpoints in the Package Explorer view or Navigator vi= ew of the Drools perspective, double-click the selected = + .drl file to open it in the editor. In the exam= ple below we opened Sample.drl file. + + = + You can add/remove rule breakpoints in the + .drl + files in two ways, similar to adding breakpoints to Java fi= les: + + + + Double-click the ruler in the Rule editor a= t the line + where you want to add a breakpoint. + + Tip: + Note that rule breakpoints can only be created in the consequen= ce of a + rule. Double-clicking on a line where no breakpoint is allowed will = do + nothing. + + A breakpoint can be removed by double-clicking the ruler once mo= re. + + + + Right-click the ruler. Select + Toggle Breakpoint + action in the appeared popup menu. Clicking the action wi= ll add a + breakpoint at the selected line or remove it if there is one already.= + + + +
+ Adding Breakpoints + + + + + +
+ + The Debug perspective contains a Br= eakpoints + view which can be used to see all defined breakpoints, get = their + properties, enable/disable or remove them, etc. You can switch to it by= navigating to + Window > Perspective > Others > Debug.= +
+ +
+ Debugging + + Drools breakpoints are only enabled if you debug your application = as a Drools + Application. To do this you should perform one of the actions: + + + + Select the main class of your application. Right click it and se= lect + Debug As > Drools Application. + + +
+ Debugging Drools Application + + + + + +
+ + + + Alternatively, you can also go to + Debug As > Debug Configuration + to open a new dialog for creating, managing and running d= ebug + configurations. + + Select the + Drools Application + item in the left tree and click the + New launch configuration + button (leftmost icon in the toolbar above the tree). Thi= s will + create a new configuration and already fill in some of the properties= (like the + Project and Main class) based on main class you selected in the begin= ning. All + properties shown here are the same as any standard Java program. + + + +
+ New Debug Configuration + + + + + +
+ + + Tip: + Remember to change the name of your debug configuration to someth= ing meaningful. + + = + Next + click the + Debug + button on the bottom to start debugging your application. <= /para> + + After enabling the debugging, the application starts executing and= will halt if + any breakpoint is encountered. This can be a Drools rule breakpoint, or= any other + standard Java breakpoint. Whenever a Drools rule breakpoint is encounte= red, the + corresponding + .drl file is opened and the active lin= e is highlighted. The Variables view + also contains all rule parameters and their value. You can then use the= default Java + debug actions to decide what to do next (resume, terminate, step over, = etc.). The debug + views can also be used to determine the contents of the working memory = and agenda at + that time as well (you don't have to select a working memory now, the c= urrent executing + working memory is automatically shown). + = + = +
+ \ No newline at end of file Modified: trunk/drools/docs/reference/en-US/images/debugging_rules/debuggin= g_rules1.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============8154569752068856445==-- From jbosstools-commits at lists.jboss.org Wed May 5 15:30:56 2010 Content-Type: multipart/mixed; boundary="===============8988437676897378212==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21924 - branches/modular_build/build. Date: Wed, 05 May 2010 15:30:56 -0400 Message-ID: <201005051930.o45JUudN015602@svn01.web.mwc.hst.phx2.redhat.com> --===============8988437676897378212== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 15:30:56 -0400 (Wed, 05 May 2010) New Revision: 21924 Modified: branches/modular_build/build/build.xml Log: add plugin.id method and tests; refactor feature.id tests; reorg file; add = hook to run external per-component build.xml (eg., for Drools) Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-05 18:24:41 UTC (rev 219= 23) +++ branches/modular_build/build/build.xml 2010-05-05 19:30:56 UTC (rev 219= 24) @@ -454,6 +454,17 @@ = + + + + + Run custom @{COMPONENT}/build.xml + + + + + + @@ -860,83 +871,57 @@ = - + + + + + + + + + + + + + + + + + + + - - - - + = - - - - - - - - - - - - - - - - - - - Test @{featureJar} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - = + + + + + + + + + + = + + = + + + + + + + + + + + + + + + + + Test feature.ids for @{COMPONENT} + + + + + + Test @{artifactJar} + + + + + + + + + + + + + + + + + + + + + + + Test plugin.ids for @{COMPONENT} + + + + + + [1] Test @{artifactJar} + + + + + + + + + + + + + + + + [2] Test @{artifactJar} + + + + + + + + + + + + + + + + + + + + --===============6356440002119426217== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 15:38:18 -0400 (Wed, 05 May 2010) New Revision: 21925 Modified: branches/modular_build/build/build.xml Log: fix checkout tests; suppress log info Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-05 19:30:56 UTC (rev 219= 24) +++ branches/modular_build/build/build.xml 2010-05-05 19:38:18 UTC (rev 219= 25) @@ -1214,13 +1214,13 @@ - Test feature.ids for @{COMPONENT} + Test feature.ids for @{COMPONENT} - Test @{artifactJar} + Test @{artifactJar} @@ -1251,13 +1251,13 @@ - Test plugin.ids for @{COMPONENT} + Test plugin.ids for @{COMPONENT} - [1] Test @{artifactJar} + [1] Test @{artifactJar} @@ -1279,7 +1279,7 @@ = - [2] Test @{artifactJar} + [2] Test @{artifactJar} @@ -1390,6 +1390,7 @@ + @@ -1428,6 +1429,7 @@ = 5/6: Test info w/o update + --===============6356440002119426217==-- From jbosstools-commits at lists.jboss.org Wed May 5 17:13:30 2010 Content-Type: multipart/mixed; boundary="===============6900283814339645803==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21926 - branches/modular_build/drools/plugins/org.jboss.tools.flow.ruleflow/META-INF. Date: Wed, 05 May 2010 17:13:29 -0400 Message-ID: <201005052113.o45LDTgl007303@svn01.web.mwc.hst.phx2.redhat.com> --===============6900283814339645803== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 17:13:29 -0400 (Wed, 05 May 2010) New Revision: 21926 Modified: branches/modular_build/drools/plugins/org.jboss.tools.flow.ruleflow/META= -INF/MANIFEST.MF Log: add .qualifier to manifest Modified: branches/modular_build/drools/plugins/org.jboss.tools.flow.rulefl= ow/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/plugins/org.jboss.tools.flow.ruleflow/MET= A-INF/MANIFEST.MF 2010-05-05 19:38:18 UTC (rev 21925) +++ branches/modular_build/drools/plugins/org.jboss.tools.flow.ruleflow/MET= A-INF/MANIFEST.MF 2010-05-05 21:13:29 UTC (rev 21926) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.flow.ruleflow;singleton:=3Dtrue -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.jboss.tools.process.ruleflow.Activator Bundle-Vendor: %Bundle-Vendor.0 Require-Bundle: = --===============6900283814339645803==-- From jbosstools-commits at lists.jboss.org Wed May 5 17:19:31 2010 Content-Type: multipart/mixed; boundary="===============2942415148431551730==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21927 - in trunk/ws/plugins/org.jboss.tools.ws.ui: META-INF and 5 other directories. Date: Wed, 05 May 2010 17:19:31 -0400 Message-ID: <201005052119.o45LJVw5007887@svn01.web.mwc.hst.phx2.redhat.com> --===============2942415148431551730== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-05 17:19:30 -0400 (Wed, 05 May 2010) New Revision: 21927 Added: trunk/ws/plugins/org.jboss.tools.ws.ui/icons/obj16/ws_tester.gif trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/W= STestUtils.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/D= elimitedStringList.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/J= AXRSWSTestView.java Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.xml trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/message= s/JBossWSUI.properties trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/message= s/JBossWSUIMessages.java Log: OPEN - issue JBIDE-6253: Need a web service tester (JAX-WS and JAX-RS) in t= he tooling = https://jira.jboss.org/jira/browse/JBIDE-6253 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-05-05 = 21:13:29 UTC (rev 21926) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-05-05 = 21:19:30 UTC (rev 21927) @@ -18,7 +18,11 @@ org.eclipse.wst.common.frameworks, org.eclipse.wst.common.emfworkbench.integration, org.jboss.tools.common.ui, - org.eclipse.core.filesystem + org.eclipse.core.filesystem, + com.ibm.icu, + org.apache.axis, + javax.xml.soap, + javax.xml.rpc Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.ui, org.jboss.tools.ws.ui.messages, Added: trunk/ws/plugins/org.jboss.tools.ws.ui/icons/obj16/ws_tester.gif =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/icons/obj16/ws_= tester.gif ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties 2010-05-05 21:= 13:29 UTC (rev 21926) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.properties 2010-05-05 21:= 19:30 UTC (rev 21927) @@ -3,4 +3,6 @@ JBOSSWS_GENERATEACTION_LABEL=3DCreate a Sample Web Service PLUGIN_NAME=3DJBoss WebServices Tools PLUGIN_PROVIDER=3DJBoss by Red Hat -JBOSSWS_WIZARD_DESC=3DCreate a sample web service \ No newline at end of file +JBOSSWS_WIZARD_DESC=3DCreate a sample web service +test.view.category.name =3D JBoss Tools Web Services +test.view.name =3D Web Service Tester \ No newline at end of file Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.xml 2010-05-05 21:13:29 U= TC (rev 21926) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.xml 2010-05-05 21:19:30 U= TC (rev 21927) @@ -38,4 +38,18 @@ + + + + + + Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= messages/JBossWSUI.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUI.properties 2010-05-05 21:13:29 UTC (rev 21926) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUI.properties 2010-05-05 21:19:30 UTC (rev 21927) @@ -62,4 +62,19 @@ Error_JBossWS_GenerateWizard_PackageExists=3DPackage already exists Error_JBossWS_GenerateWizard_PackageNotShown=3DPackage already exists. Not= e: Views might filter empty parent packages Error_JBossWS_GenerateWizard_PackageExistsDifferentCase=3DPackage already = exists with a different case -Error_JBossWS_GenerateWizard_NoSrcInProject=3DThe project misses JAVA Sour= ce folders \ No newline at end of file +Error_JBossWS_GenerateWizard_NoSrcInProject=3DThe project misses JAVA Sour= ce folders + +JBossWS_DelimitedStringList_EditValue_Dialog_Title=3DEdit Value +JBossWS_DelimitedStringList_EditValue_Dialog_Message=3DSpecify the updated= value below. + +JAXRSWSTestView_Action_URL_Label=3DAction URL: +JAXRSWSTestView_HTTP_Method_Label=3DHTTP Method: +JAXRSWSTestView_Invoke_Label=3DInvoke +JAXRSWSTestView_Request_Body_Label=3DRequest Body +JAXRSWSTestView_Request_Header_Label=3DRequest Header +JAXRSWSTestView_Request_Parameters_Label=3DRequest Parameters +JAXRSWSTestView_Results_Body_Label=3DResults Body +JAXRSWSTestView_Results_Header_Label=3DResults Header +JAXRSWSTestView_Service_URL_Label=3DService URL: +JAXRSWSTestView_Set_Sample_Data_Label=3DSet Sample Data +JAXRSWSTestView_Web_Service_Type_Label=3DWeb Service Type: Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= messages/JBossWSUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUIMessages.java 2010-05-05 21:13:29 UTC (rev 21926) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUIMessages.java 2010-05-05 21:19:30 UTC (rev 21927) @@ -88,6 +88,20 @@ public static String Error_JBossWS_GenerateWizard_PackageExistsDifferentC= ase; public static String Error_JBossWS_GenerateWizard_NoSrcInProject; = + public static String JBossWS_DelimitedStringList_EditValue_Dialog_Title; + public static String JBossWS_DelimitedStringList_EditValue_Dialog_Message; + public static String JAXRSWSTestView_Action_URL_Label; + public static String JAXRSWSTestView_HTTP_Method_Label; + public static String JAXRSWSTestView_Invoke_Label; + public static String JAXRSWSTestView_Request_Body_Label; + public static String JAXRSWSTestView_Request_Header_Label; + public static String JAXRSWSTestView_Request_Parameters_Label; + public static String JAXRSWSTestView_Results_Body_Label; + public static String JAXRSWSTestView_Results_Header_Label; + public static String JAXRSWSTestView_Service_URL_Label; + public static String JAXRSWSTestView_Set_Sample_Data_Label; + public static String JAXRSWSTestView_Web_Service_Type_Label; + = static { NLS.initializeMessages(BUNDLE_NAME, JBossWSUIMessages.class); } Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/uti= ls/WSTestUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= WSTestUtils.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= WSTestUtils.java 2010-05-05 21:19:30 UTC (rev 21927) @@ -0,0 +1,186 @@ +/*************************************************************************= ****** = + * Copyright (c) 2010 Red Hat, Inc. = + * Distributed under license by Red Hat, Inc. All rights reserved. = + * This program is made available under the terms of the = + * Eclipse Public License v1.0 which accompanies this distribution, = + * and is available at http://www.eclipse.org/legal/epl-v10.html = + * = + * Contributors: = + * Red Hat, Inc. - initial API and implementation = + *************************************************************************= *****/ +package org.jboss.tools.ws.ui.utils; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.net.HttpURLConnection; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.URL; +import java.net.URLEncoder; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +import org.apache.axis.Message; +import org.apache.axis.client.Call; +import org.apache.axis.client.Service; +import org.apache.axis.message.SOAPEnvelope; + +/** + * Static utility methods for testing JAX-RS and JAX-WS web services + * @author bfitzpat + * + */ +public class WSTestUtils { + = + private static Map resultHeaders =3D null; + private static String EMPTY_STRING =3D ""; //$NON-NLS-1$ + + public static Map getResultHeaders() { + return WSTestUtils.resultHeaders; + } + = + /* + * Start building the web query. Append parameters to URL + */ + private static String buildWebQuery(Map parameters) throw= s Exception { + if (!parameters.isEmpty()) { + StringBuilder sb =3D new StringBuilder(); + for (Map.Entry entry : parameters.entrySet()) { + String key =3D URLEncoder.encode(entry.getKey(), "UTF-8"); //= $NON-NLS-1$ + String value =3D URLEncoder.encode(entry.getValue(), "UTF-8")= ; //$NON-NLS-1$ + sb.append(key).append("=3D").append(value).append("&"); //$NO= N-NLS-1$ //$NON-NLS-2$ + } + return sb.toString().substring(0, sb.length() - 1); + } + return EMPTY_STRING; + } + + // static simple call, pass in url, parms, and headers + public static String callRestfulWebService(String address, Map parameters, Map headers) throws Exception { + return callRestfulWebService(address, parameters, headers, "GET", = null, null, 0); //$NON-NLS-1$ + } + + // static call - provide url, parms, headers, the method type, and req= uest body + public static String callRestfulWebService(String address, Map parameters, Map headers, String methodType, String= requestBody) throws Exception { + return callRestfulWebService(address, parameters, headers, methodT= ype, requestBody, null, 0); + } + + // static call - provide url, parms, headers, the method type, request= body, proxy string, and port # as string + public static String callRestfulWebService(String address, Map parameters, Map headers, String methodType, String= requestBody, String proxy, String port) throws Exception { + return callRestfulWebService(address, parameters, headers, methodT= ype, requestBody, proxy, Integer.parseInt(port)); + } + + // static call - provide url, parms, headers, the method type, request= body, proxy string, port # + public static String callRestfulWebService(String address, Map parameters, Map headers, String methodType, String= requestBody, String proxy, int port) throws Exception { + + // handle the proxy + Proxy proxyObject =3D null; + if (proxy !=3D null && proxy.length() > 0 && port > 0) { + InetSocketAddress proxyAddress =3D new InetSocketAddress(proxy= , port); + proxyObject =3D new Proxy(Proxy.Type.HTTP, proxyAddress); + } + + // clear the returned results + String response =3D EMPTY_STRING; + = + // get the parms string + String query =3D buildWebQuery(parameters); + + // build the complete URL + URL url =3D null; + if (query !=3D null) { + // add parms to the url if we have some + url =3D new URL(address + query); + } else { + url =3D new URL(address); + } + + // make connection + HttpURLConnection httpurlc =3D null; + if (proxyObject =3D=3D null) { + httpurlc =3D (HttpURLConnection) url.openConnection(); + } else { + // if have proxy, pass it along + httpurlc =3D (HttpURLConnection) url.openConnection(proxyObjec= t); + } + = + // since we are expecting output back, set to true + httpurlc.setDoOutput(true); + = + // not sure what this does - may be used for authentication? + httpurlc.setAllowUserInteraction(false); + = + // set whether this is a GET or POST + httpurlc.setRequestMethod(methodType); + = + // if we are sending/receiving XML, make sure the connection knows + if (headers !=3D null && !headers.isEmpty()) { + Iterator iter =3D headers.entrySet().iterator(); + while (iter.hasNext()) { + Entry entry =3D (Entry)iter.next(); + if (entry.getKey() !=3D null && entry.getKey() instanceof String) + httpurlc.addRequestProperty((String) entry.getKey(), (String) e= ntry.getValue()); + } + } + = + // CONNECT! + httpurlc.connect(); + + // If we are doing a POST and we have some request body to pass al= ong, do it + if (requestBody !=3D null && ( methodType.equalsIgnoreCase("POST")= //$NON-NLS-1$ + || methodType.equalsIgnoreCase("PUT"))) { //$NON-NLS-1$ + OutputStreamWriter out =3D new OutputStreamWriter(httpurlc.getOut= putStream()); + out.write(requestBody); + out.close(); + } + + // retrieve result and put string results into the response + InputStream is =3D (InputStream) httpurlc.getInputStream(); + BufferedReader br =3D new BufferedReader(new InputStreamReader(is,= "UTF-8"));//$NON-NLS-1$ + StringBuilder sb =3D new StringBuilder(); + String line; + while ((line =3D br.readLine()) !=3D null) { + sb.append(line); + sb.append("\n");//$NON-NLS-1$ + } + br.close(); + response =3D sb.toString(); + = + WSTestUtils.resultHeaders =3D httpurlc.getHeaderFields(); + = + // disconnect explicitly (may not be necessary) + httpurlc.disconnect(); + + return response; + } = + + /* + * Invokes the WS and returns a result + */ + public static String invokeWS( String endpointurl, String actionurl, Stri= ng body ) throws Exception { + = + /* = + * the endpoint & action urls + the soap in are what we + * need to invoke the WS + */ + String endpoint =3D endpointurl; + String action =3D actionurl; + String soapIn =3D body; = + + /* Use AXIS to call the WS */ + String document =3D soapIn; + Service service =3D new Service(); + Call call=3D (Call) service.createCall(); + call.setTargetEndpointAddress( new java.net.URL(endpoint) ); + call.setOperationStyle( org.apache.axis.constants.Style.MESSAGE ); + if ( action !=3D null ) { + call.setProperty(Call.SOAPACTION_USE_PROPERTY,Boolean.TRUE); + call.setProperty(Call.SOAPACTION_URI_PROPERTY,action); + } + SOAPEnvelope envelope =3D call.invoke( new Message(document) ); + return envelope.getBody().toString().replaceAll("><",">\n<");//$NON-NLS-= 1$ //$NON-NLS-2$ + } +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/t= ools/ws/ui/utils/WSTestUtils.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/vie= ws/DelimitedStringList.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= DelimitedStringList.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= DelimitedStringList.java 2010-05-05 21:19:30 UTC (rev 21927) @@ -0,0 +1,567 @@ +/*************************************************************************= ****** = + * 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: = + * Sybase, Inc./Eclipse - DTP - initial API and implementation = + * Red Hat, Inc. - added Edit button + *************************************************************************= *****/ +package org.jboss.tools.ws.ui.views; + +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; + +import org.eclipse.core.runtime.ListenerList; +import org.eclipse.jface.dialogs.InputDialog; +import org.eclipse.jface.window.Window; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.List; +import org.eclipse.swt.widgets.Text; +import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; + +import com.ibm.icu.util.StringTokenizer; + +/** + * Composite that provides a method of managing a delimited list of string= s. + * = + * @author brianf + */ +public class DelimitedStringList extends Composite { + + // delimiter used + private static final String DELIMITER =3D ",";//$NON-NLS-1$ + + // ui elements + private Button mAddButton; + private Button mClearAllButton; + private Button mRemoveButton; + private Button mDownButton; + private Button mUpButton; + private Button mEditButton; + private List mPropsList; + private Text mAddText; + private Text mHiddenText; + private boolean isReadOnly =3D false; + + // current delimiter + private String mDelimiter =3D DELIMITER; + + // Warning + private String mWarning =3D null; + + // change listeners + private ListenerList changeListeners; + + private class AddTextModifyListener implements ModifyListener { + + private DelimitedStringList parent; + + public AddTextModifyListener(DelimitedStringList parent) { + this.parent =3D parent; + } + + public void modifyText(ModifyEvent e) { + updatePropertyButtons(); + fireChangedEvent(parent); + } + } + + /** + * Constructor + * = + * @param parent + * @param style + */ + public DelimitedStringList(Composite parent, int style) { + this(parent, style, false); + } + = + /** + * Constructor + * = + * @param parent + * @param style + */ + public DelimitedStringList(Composite parent, int style, boolean isReadOnl= y) { + super(parent, style); + this.isReadOnly =3D isReadOnly; + this.changeListeners =3D new ListenerList(); + = + int additionalStyles =3D SWT.NONE; + if (isReadOnly){ + additionalStyles =3D SWT.READ_ONLY; + } + = + final GridLayout gridLayout =3D new GridLayout(); + gridLayout.marginWidth =3D 0; + gridLayout.marginHeight =3D 0; + gridLayout.numColumns =3D 2; + setLayout(gridLayout); + { + this.mAddText =3D new Text(this, SWT.BORDER | additionalStyles); + this.mAddText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + this.mAddText.addModifyListener(new AddTextModifyListener(this)); + } + { + this.mAddButton =3D new Button(this, SWT.NONE); + this.mAddButton.setLayoutData(new GridData( + GridData.HORIZONTAL_ALIGN_FILL)); + this.mAddButton.setText("Add");//$NON-NLS-1$ + this.mAddButton.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + addStringToList(); + fireChangedEvent(e.getSource()); + } + }); + = + this.mAddButton.setEnabled(false); + } + { + final Composite mSpacerComposite =3D new Composite(this, SWT.NONE); + final GridData gridData =3D new GridData(); + gridData.heightHint =3D 10; + gridData.horizontalSpan =3D 2; + mSpacerComposite.setLayoutData(gridData); + mSpacerComposite.setLayout(new GridLayout()); + } + { + this.mPropsList =3D new List(this, SWT.BORDER); + final GridData gridData =3D new GridData( + GridData.HORIZONTAL_ALIGN_FILL + | GridData.VERTICAL_ALIGN_FILL); + gridData.verticalSpan =3D 5; + this.mPropsList.setLayoutData(gridData); + this.mPropsList.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + updatePropertyButtons(); + } + }); + } + { + this.mUpButton =3D new Button(this, SWT.NONE); + this.mUpButton.setLayoutData(new GridData( + GridData.HORIZONTAL_ALIGN_FILL)); + this.mUpButton.setText("Up");//$NON-NLS-1$ + this.mUpButton.setEnabled(false); + this.mUpButton.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + moveUpInList(); + } + }); + } + { + this.mDownButton =3D new Button(this, SWT.NONE); + this.mDownButton.setLayoutData(new GridData( + GridData.HORIZONTAL_ALIGN_FILL)); + this.mDownButton.setText("Down");//$NON-NLS-1$ + this.mDownButton.setEnabled(false); + this.mDownButton.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + moveDownInList(); + } + }); + } + { + this.mEditButton =3D new Button(this, SWT.NONE); + this.mEditButton.setLayoutData(new GridData( + GridData.HORIZONTAL_ALIGN_FILL)); + this.mEditButton.setText("Edit");//$NON-NLS-1$ + this.mEditButton.setEnabled(false); + this.mEditButton.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + editInList(); + } + }); + } + { + this.mRemoveButton =3D new Button(this, SWT.NONE); + this.mRemoveButton.setLayoutData(new GridData( + GridData.HORIZONTAL_ALIGN_FILL)); + this.mRemoveButton.setText("Remove");//$NON-NLS-1$ + this.mRemoveButton.setEnabled(false); + this.mRemoveButton.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + removeFromList(); + } + }); + } + { + this.mClearAllButton =3D new Button(this, SWT.NONE); + this.mClearAllButton.setEnabled(false); + this.mClearAllButton.setLayoutData(new GridData( + GridData.HORIZONTAL_ALIGN_FILL)); + this.mClearAllButton.setText("Clear All");//$NON-NLS-1$ + this.mClearAllButton.addSelectionListener(new SelectionAdapter() { + + public void widgetSelected(SelectionEvent e) { + DelimitedStringList.this.mPropsList.removeAll(); + DelimitedStringList.this.mHiddenText.setText(DelimitedStringList.this= .getSelection().trim()); + updatePropertyButtons(); + } + }); + } + { + this.mHiddenText =3D new Text(this, SWT.BORDER); + final GridData gridData =3D new GridData(); + gridData.horizontalSpan =3D 2; + this.mHiddenText.setLayoutData(gridData); + this.mHiddenText.setVisible(false); + } + updatePropertyButtons(); + } + + /** + * Add a listener to receive notifications when the property list is + * modified. + * = + * @param listener + */ + public void addModifyListener(ModifyListener listener) { + this.mHiddenText.addModifyListener(listener); + } + + public void removeModifyListener(ModifyListener listener) { + this.mHiddenText.removeModifyListener(listener); + } + + public void dispose() { + super.dispose(); + } + + protected void checkSubclass() { + // empty + } + + /** + * Add a new string to the list + */ + private void addStringToList() { + if (this.mAddText.getText().length() > 0) { + this.mPropsList.add(this.mAddText.getText().trim()); + if (!isReadOnly){ + this.mClearAllButton.setEnabled(true); + } + String selected =3D getSelection(); + this.mHiddenText.setText(selected.trim()); + this.mAddText.setSelection(0, this.mAddText.getText().length()); + this.mAddText.setFocus(); + } + } + = + private void editInList() { + if (this.mPropsList.getSelectionCount() =3D=3D 1) { + int index =3D this.mPropsList.getSelectionIndex(); + String toEdit =3D this.mPropsList.getItem(index); + = + InputDialog editDialog =3D new InputDialog(getShell(), = + JBossWSUIMessages.JBossWS_DelimitedStringList_EditValue_Dialog_Title, = + JBossWSUIMessages.JBossWS_DelimitedStringList_EditValue_Dialog_Messag= e, = + toEdit, null); + int rtn_code =3D editDialog.open(); + if (rtn_code =3D=3D Window.OK) { + this.mPropsList.remove(index); + this.mPropsList.add(editDialog.getValue(), index); + } + } + + this.mPropsList.setFocus(); + + updatePropertyButtons(); + } + + /** + * Remove a string from the list + */ + private void removeFromList() { + if (this.mPropsList.getSelectionCount() =3D=3D 1) { + int index =3D this.mPropsList.getSelectionIndex(); + this.mPropsList.remove(index); + String selected =3D getSelection(); + this.mHiddenText.setText(selected.trim()); + + try { + if (this.mPropsList.getItem(index) !=3D null) { + this.mPropsList.select(index); + } + } + catch (IllegalArgumentException e) { + // do nothing + } + } + + this.mPropsList.setFocus(); + + updatePropertyButtons(); + } + + /** + * Move a string up in the list + */ + private void moveUpInList() { + if (this.mPropsList.getSelectionCount() =3D=3D 1) { + int selection =3D this.mPropsList.getSelectionIndex(); + int destination =3D -1; + if (selection > 0) { + destination =3D selection - 1; + String value_a =3D this.mPropsList.getItem(destination); + String value_b =3D this.mPropsList.getItem(selection); + + String[] items =3D this.mPropsList.getItems(); + this.mPropsList.removeAll(); + + int counter =3D 0; + while (counter < items.length) { + if (counter =3D=3D destination) { + this.mPropsList.add(value_b); + this.mPropsList.add(value_a); + counter =3D counter + 2; + } + else { + this.mPropsList.add(items[counter]); + counter++; + } + } + + String selected =3D getSelection(); + this.mHiddenText.setText(selected.trim()); + this.mPropsList.setSelection(destination); + } + } + this.mPropsList.setFocus(); + updatePropertyButtons(); + } + + /** + * Move a string down in the list + */ + private void moveDownInList() { + if (this.mPropsList.getSelectionCount() =3D=3D 1) { + int selection =3D this.mPropsList.getSelectionIndex(); + int destination =3D -1; + if (selection < this.mPropsList.getItemCount() - 1) { + + destination =3D selection + 1; + + String value_a =3D this.mPropsList.getItem(destination); + String value_b =3D this.mPropsList.getItem(selection); + + String[] items =3D this.mPropsList.getItems(); + this.mPropsList.removeAll(); + + int counter =3D 0; + while (counter < items.length) { + if (counter =3D=3D selection) { + this.mPropsList.add(value_a); + this.mPropsList.add(value_b); + } + else if (counter =3D=3D destination) { + // empty + } + else { + this.mPropsList.add(items[counter]); + } + counter++; + } + + String selected =3D getSelection(); + this.mHiddenText.setText(selected.trim()); + this.mPropsList.setSelection(destination); + + } + } + this.mPropsList.setFocus(); + updatePropertyButtons(); + } + + /** + * Return the current selection + */ + public String getSelection() { + String selectString =3D ""; //$NON-NLS-1$ + for (int i =3D 0; i < this.mPropsList.getItems().length; i++) { + String testitem =3D this.mPropsList.getItem(i).trim(); + selectString =3D selectString + testitem; + if (i < this.mPropsList.getItems().length - 1) { + selectString =3D selectString + this.mDelimiter; + } + } + return selectString; + } + + /** + * Update button state based on what's selected + */ + public void updatePropertyButtons() { + if (!isReadOnly){ + this.mDownButton.setEnabled(false); + this.mUpButton.setEnabled(false); + this.mRemoveButton.setEnabled(false); + this.mEditButton.setEnabled(false); + this.mClearAllButton.setEnabled(false); + = + if (this.mPropsList.getItemCount() > 0) { + = + this.mClearAllButton.setEnabled(true); + = + if(this.mPropsList.getSelectionCount() =3D=3D 1){ + int selection =3D this.mPropsList.getSelectionIndex(); + = + this.mRemoveButton.setEnabled(true); + this.mEditButton.setEnabled(true); + = + if (selection - 1 >=3D 0) + this.mUpButton.setEnabled(true); + = + if (selection + 1 < this.mPropsList.getItemCount()) + this.mDownButton.setEnabled(true); + } + } + = + String value =3D ""; //$NON-NLS-1$ + value =3D this.mAddText.getText(); + boolean flag =3D value !=3D null && value.trim().length() > 0; + boolean valid =3D validateText(value); + this.mAddButton.setEnabled(flag && valid); + } = + } + + private boolean validateText(String text) { + if (text !=3D null && text.trim().length() > 0 && text.indexOf(",") > -1= ) { //$NON-NLS-1$ + this.mWarning =3D "There are no commas delimiting the name and value fo= r this key/value pair."; //$NON-NLS-1$ + return false; + } + this.mWarning =3D null; + return true; + } + + /** + * Set focus to the add text box + */ + public boolean setFocus() { + if (this.mAddText !=3D null) + return this.mAddText.setFocus(); + return false; + } + + /** + * Set the initial delimited list + * = + * @param str_list + */ + public void setSelection(String str_list) { + String[] str_array =3D parseString(str_list); + this.mPropsList.setItems(str_array); + updatePropertyButtons(); + } + + /** + * Parse the list + * = + * @param str_list + * @return + */ + private String[] parseString(String str_list) { + StringTokenizer tk =3D new StringTokenizer(str_list, this.mDelimiter); + String[] pieces =3D new String[tk.countTokens()]; + int index =3D 0; + while (tk.hasMoreTokens()) + pieces[index++] =3D tk.nextToken(); + return pieces; + } + + public static String[] parseString(String str_list, String delimiter) { + StringTokenizer tk =3D new StringTokenizer(str_list, delimiter); + String[] pieces =3D new String[tk.countTokens()]; + int index =3D 0; + while (tk.hasMoreTokens()) + pieces[index++] =3D tk.nextToken(); + return pieces; + } + + /** + * Change the delimiter + * = + * @param delimiter + */ + public void setDelimiter(String delimiter) { + this.mDelimiter =3D delimiter; + } + + /** + * Return the delimiter + * = + * @return + */ + public String getDelimiter() { + return this.mDelimiter; + } + + public String getWarning() { + return this.mWarning; + } + + /** + * If we changed, fire a changed event. + * = + * @param source + */ + private void fireChangedEvent(Object source) { + ChangeEvent e =3D new ChangeEvent(source); + // inform any listeners of the resize event + Object[] listeners =3D this.changeListeners.getListeners(); + for (int i =3D 0; i < listeners.length; ++i) { + ((ChangeListener) listeners[i]).stateChanged(e); + } + } + + /** + * Add a change listener + * = + * @param listener + */ + public void addChangeListener(ChangeListener listener) { + this.changeListeners.add(listener); + } + + /** + * Remove a change listener. + * = + * @param listener + */ + public void removeChangeListener(ChangeListener listener) { + this.changeListeners.remove(listener); + } + = + @Override + public void setEnabled(boolean enabled) { + super.setEnabled(enabled); + mAddButton.setEnabled(enabled); + mAddText.setEnabled(enabled); + mClearAllButton.setEnabled(enabled); + mDownButton.setEnabled(enabled); + mEditButton.setEnabled(enabled); + mPropsList.setEnabled(enabled); + mRemoveButton.setEnabled(enabled); + mUpButton.setEnabled(enabled); + if (enabled) + updatePropertyButtons(); + } + +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/t= ools/ws/ui/views/DelimitedStringList.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/vie= ws/JAXRSWSTestView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-05 21:19:30 UTC (rev 21927) @@ -0,0 +1,400 @@ +/*************************************************************************= ****** = + * 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.views; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map.Entry; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.List; +import org.eclipse.swt.widgets.TabFolder; +import org.eclipse.swt.widgets.TabItem; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.part.ViewPart; +import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; +import org.jboss.tools.ws.ui.utils.WSTestUtils; + +public class JAXRSWSTestView extends ViewPart { + + private static final String DELETE =3D "DELETE";//$NON-NLS-1$ + private static final String PUT =3D "PUT";//$NON-NLS-1$ + private static final String POST =3D "POST";//$NON-NLS-1$ + private static final String GET =3D "GET";//$NON-NLS-1$ + private static final String JAX_WS =3D "JAX-WS"; //$NON-NLS-1$ + private static final String JAX_RS =3D "JAX-RS"; //$NON-NLS-1$ + private static final String EMPTY_STRING =3D ""; //$NON-NLS-1$ + + /** + * The ID of the view as specified by the extension. + */ + public static final String ID =3D "org.jboss.tools.ws.ui.tester.views.Tes= tWSView";//$NON-NLS-1$ + + /* UI controls */ + private Button testButton =3D null; + private Text actionText; + private Text resultsText; + private Combo urlCombo; + private DelimitedStringList dlsList; + private Combo methodCombo; + private Combo wsTypeCombo; + private Text bodyText; + private TabFolder tabGroup; + private TabItem bodyTab; + private TabItem headerTab; + private List resultHeadersList; + private TabItem resultHeadersTab; + private TabItem resultTab; + private TabFolder resultTabGroup; + + private TabItem parmsTab; + + private DelimitedStringList parmsList; + = + /** + * The constructor. + */ + public JAXRSWSTestView() { + } + + /** + * This is a callback that will allow us + * to create the viewer and initialize it. + */ + public void createPartControl(Composite parent) { + + Composite innerComposite =3D new Composite (parent, SWT.NONE); + innerComposite.setLayout(new GridLayout(2, false)); + = + Label typeLabel =3D new Label(innerComposite, SWT.NONE); + typeLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Web_Service_Type_Lab= el); + typeLabel.setLayoutData(new GridData()); + = + wsTypeCombo =3D new Combo(innerComposite, SWT.DROP_DOWN | SWT.READ_ONLY); + wsTypeCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); + wsTypeCombo.add(JAX_WS); + wsTypeCombo.add(JAX_RS); + wsTypeCombo.addSelectionListener(new SelectionListener() { + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + public void widgetSelected(SelectionEvent e) { + setControlsForWSType(wsTypeCombo.getText()); + } + }); + = + Label methodLabel =3D new Label(innerComposite, SWT.NONE); + methodLabel.setText(JBossWSUIMessages.JAXRSWSTestView_HTTP_Method_Label); + methodLabel.setLayoutData(new GridData()); + = + methodCombo =3D new Combo(innerComposite, SWT.DROP_DOWN | SWT.READ_ONLY); + methodCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); + methodCombo.add(GET); + methodCombo.add(POST); + methodCombo.add(PUT); + methodCombo.add(DELETE); + methodCombo.setText(GET); + = + Label urlLabel =3D new Label(innerComposite, SWT.NONE); + urlLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Service_URL_Label); + urlLabel.setLayoutData(new GridData()); + = +// urlText =3D new Text(innerComposite, SWT.BORDER); +// urlText.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); + = + urlCombo =3D new Combo(innerComposite, SWT.BORDER | SWT.DROP_DOWN); + urlCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); + + Label actionLabel =3D new Label(innerComposite, SWT.NONE); + actionLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Action_URL_Label); + actionLabel.setLayoutData(new GridData()); + = + actionText =3D new Text(innerComposite, SWT.BORDER); + actionText.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); + + tabGroup =3D new TabFolder(innerComposite, SWT.BORDER); + + bodyTab =3D new TabItem(tabGroup, SWT.NONE, 0); + bodyTab.setText(JBossWSUIMessages.JAXRSWSTestView_Request_Body_Label); + + parmsTab =3D new TabItem(tabGroup, SWT.NONE, 1); + parmsTab.setText(JBossWSUIMessages.JAXRSWSTestView_Request_Parameters_La= bel); + + parmsList =3D new DelimitedStringList(tabGroup, SWT.None); + parmsTab.setControl(parmsList); + GridData parmsListGD =3D new GridData(SWT.FILL, SWT.FILL, true, true); + parmsListGD.horizontalSpan =3D 2; + parmsList.setLayoutData(parmsListGD); + = + headerTab =3D new TabItem(tabGroup, SWT.NONE, 2); + bodyText =3D new Text(tabGroup, SWT.BORDER | SWT.WRAP | SWT.V_SCROLL); + GridData btGridData =3D new GridData(SWT.FILL, SWT.FILL, true, true); + bodyText.setLayoutData(btGridData); + bodyTab.setControl(bodyText); + = + headerTab.setText(JBossWSUIMessages.JAXRSWSTestView_Request_Header_Label= ); + GridData hgGridData =3D new GridData(SWT.FILL, SWT.NONE, true, false); + hgGridData.horizontalSpan =3D 2; + tabGroup.setLayoutData(hgGridData); + = + dlsList =3D new DelimitedStringList(tabGroup, SWT.None); + headerTab.setControl(dlsList); + GridData dlsListGD =3D new GridData(SWT.FILL, SWT.FILL, true, true); + dlsListGD.horizontalSpan =3D 2; + dlsList.setLayoutData(dlsListGD); + +// Button sampleButton =3D new Button(innerComposite, SWT.PUSH); +// sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data= _Label); +// sampleButton.setLayoutData(new GridData()); +// = +// sampleButton.addSelectionListener(new SelectionListener() { +// public void widgetSelected(SelectionEvent e) { +// setupSample(); +// } +// public void widgetDefaultSelected(SelectionEvent e) { +// widgetSelected(e); +// } +// }); + = + GridData buttonGD =3D new GridData(SWT.BEGINNING, SWT.NONE, false, false= ); + testButton =3D new Button (innerComposite, SWT.PUSH); + testButton.setText(JBossWSUIMessages.JAXRSWSTestView_Invoke_Label); + testButton.setLayoutData(buttonGD); + = + testButton.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + handleTest(); + } + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); + = + resultTabGroup =3D new TabFolder(innerComposite, SWT.BORDER); + GridData rtGridData =3D new GridData(SWT.FILL, SWT.FILL, true, true); + rtGridData.horizontalSpan =3D 2; + resultTabGroup.setLayoutData(rtGridData); + + resultTab =3D new TabItem(resultTabGroup, SWT.NONE, 0); + resultTab.setText(JBossWSUIMessages.JAXRSWSTestView_Results_Body_Label); + resultsText =3D new Text(resultTabGroup, SWT.BORDER | SWT.V_SCROLL | SWT= .WRAP | SWT.READ_ONLY ); + resultsText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + resultTab.setControl(resultsText); + = + resultHeadersTab =3D new TabItem(resultTabGroup, SWT.NONE, 1); + resultHeadersTab.setText(JBossWSUIMessages.JAXRSWSTestView_Results_Heade= r_Label); + resultHeadersList =3D new List(resultTabGroup, SWT.V_SCROLL); + resultHeadersTab.setControl(resultHeadersList); + GridData rdlsListGD =3D new GridData(SWT.FILL, SWT.FILL, true, true); + rdlsListGD.horizontalSpan =3D 2; + resultHeadersList.setLayoutData(dlsListGD); + + wsTypeCombo.setText(JAX_WS); + setControlsForWSType(wsTypeCombo.getText()); + } + = + private void setControlsForWSType ( String wsType ) { + if (wsType.equalsIgnoreCase(JAX_WS)) { + actionText.setEnabled(true); + bodyText.setEnabled(true); + methodCombo.setEnabled(false); + parmsList.setEnabled(false); + dlsList.setEnabled(false); + parmsTab.getControl().setEnabled(false); + headerTab.getControl().setEnabled(false); + } + else if (wsType.equalsIgnoreCase(JAX_RS)) { + actionText.setEnabled(false); + bodyText.setEnabled(true); + methodCombo.setEnabled(true); + parmsList.setEnabled(true); + dlsList.setEnabled(true); + parmsTab.getControl().setEnabled(true); + headerTab.getControl().setEnabled(true); + } + } + = + /* + * Sets up the controls to call a public sample RESTful WS that does + * a postal code lookup. = + */ + private void setupSample() { + // go to http://www.geonames.org/export/web-services.html for example + //http://ws.geonames.org/postalCodeSearch?postalcode=3D9011&maxRows=3D10 + if (wsTypeCombo.getText().equalsIgnoreCase(JAX_RS)) { + urlCombo.setText("http://ws.geonames.org/postalCodeSearch?"); //$NON-NL= S-1$ + parmsList.setSelection("postalcode=3D80920,maxRows=3D10"); //$NON-NLS-1$ + dlsList.setSelection("content-type=3Dapplication/xml"); //$NON-NLS-1$ + methodCombo.setText(GET); + tabGroup.setSelection(parmsTab); + bodyText.setText(EMPTY_STRING); + } + else if (wsTypeCombo.getText().equalsIgnoreCase(JAX_WS)) { + String soapIn =3D "" + /= /$NON-NLS-1$ + "" + //$NON-NLS-1$ + "" + //$NON-NLS-1$ + "" + //$NON-NLS-1$ + "slings and arrows"+ //$NON-NLS-1$ + ""+ //$NON-NLS-1$ + "" + //$NON-NLS-1$ + ""; //$NON-NLS-1$ + = + urlCombo.setText("http://www.xmlme.com/WSShakespeare.asmx"); //$NON-NLS= -1$ + actionText.setText("http://xmlme.com/WebServices/GetSpeech"); //$NON-NL= S-1$ + bodyText.setText(soapIn); + parmsList.setSelection(EMPTY_STRING); + dlsList.setSelection(EMPTY_STRING); + tabGroup.setSelection(bodyTab); + } + } + + private void handleTest() { + if (urlCombo.getItemCount() > 0) { + java.util.List aList =3D Arrays.asList(urlCombo.getItems()); + if (!aList.contains(urlCombo.getText())) { + urlCombo.add(urlCombo.getText()); + } + } else { + urlCombo.add(urlCombo.getText()); + } + = + if (wsTypeCombo.getText().equalsIgnoreCase(JAX_RS)) { + handleRSTest(); + } + else if (wsTypeCombo.getText().equalsIgnoreCase(JAX_WS)) { + handleWSTest(); + } + } + = + /* + * Actually call the WS and displays the result = + */ + private void handleWSTest() { + try { + String result =3D WSTestUtils.invokeWS(urlCombo.getText(), actionText.g= etText(), bodyText.getText()); + resultsText.setText(result); + + resultHeadersList.removeAll(); + if (WSTestUtils.getResultHeaders() !=3D null) { + Iterator iter =3D WSTestUtils.getResultHeaders().entrySet().iterato= r(); + while (iter.hasNext()) { + String text =3D EMPTY_STRING; + Entry entry =3D (Entry) iter.next(); + if (entry.getKey() =3D=3D null) = + text =3D entry.getValue().toString(); + else + text =3D text + entry.toString(); + resultHeadersList.add(text); + } + } + } catch (Exception e) { + resultsText.setText(e.toString()); + e.printStackTrace(); + } + } + + /* + * Actually call the RESTful WS to test it + */ + private void handleRSTest() { + = + // Get the service URL + String address =3D urlCombo.getText(); + = + // Is this a GET or POST activity? + String method =3D methodCombo.getText(); + = + // What's the Request body text? + String body =3D bodyText.getText(); + = + // if no actual text in the request body, set to null + if (body.trim().length() =3D=3D 0) body =3D null; + = + // Process parameters for web service call + HashMap parameters =3D new HashMap(); + if (!parmsList.isDisposed() && parmsList.getSelection() !=3D null && par= msList.getSelection().length() > 0) { + String[] parsedList =3D DelimitedStringList.parseString(parmsList.getSe= lection() , ","); //$NON-NLS-1$ + if (parsedList !=3D null && parsedList.length > 0) { + for (int i =3D 0; i < parsedList.length; i++) { + String nameValuePair =3D parsedList[i]; + String[] nameAndValue =3D DelimitedStringList.parseString(nameValuePa= ir, "=3D"); //$NON-NLS-1$ + if (nameAndValue !=3D null && nameAndValue.length =3D=3D 2) { + parameters.put(nameAndValue[0], nameAndValue[1]); + } + } + } + } + = + // Process headers for web service call + HashMap headers =3D new HashMap(); + if (!dlsList.isDisposed() && dlsList.getSelection() !=3D null && dlsList= .getSelection().length() > 0) { + String[] parsedList =3D DelimitedStringList.parseString(dlsList.getSele= ction() , ","); //$NON-NLS-1$ + if (parsedList !=3D null && parsedList.length > 0) { + for (int i =3D 0; i < parsedList.length; i++) { + String nameValuePair =3D parsedList[i]; + String[] nameAndValue =3D DelimitedStringList.parseString(nameValuePa= ir, "=3D"); //$NON-NLS-1$ + if (nameAndValue !=3D null && nameAndValue.length =3D=3D 2) { + headers.put(nameAndValue[0], nameAndValue[1]); + } + } + } + } + = + // now actually call it + try { + // clear the results text + resultsText.setText(EMPTY_STRING); + = + // call the service + String result =3D + WSTestUtils.callRestfulWebService(address, parameters, headers, method= , body); + = + // put the results in the result text field + resultsText.setText(result); + + resultHeadersList.removeAll(); + Iterator iter =3D WSTestUtils.getResultHeaders().entrySet().iterator= (); + while (iter.hasNext()) { + String text =3D EMPTY_STRING; + Entry entry =3D (Entry) iter.next(); + if (entry.getKey() =3D=3D null) = + text =3D entry.getValue().toString(); + else + text =3D text + entry.toString(); + resultHeadersList.add(text); + } + = + } catch (Exception e) { + = + // if we hit an error, put it in the results text + resultsText.setText(e.toString()); + e.printStackTrace(); + } + } + = + /** + * Passing the focus request to the control. + */ + public void setFocus() { + // set initial focus to the URL text combo + urlCombo.setFocus(); + } +} \ No newline at end of file Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/t= ools/ws/ui/views/JAXRSWSTestView.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============2942415148431551730==-- From jbosstools-commits at lists.jboss.org Wed May 5 18:05:36 2010 Content-Type: multipart/mixed; boundary="===============6637679381553471902==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21928 - branches/modular_build. Date: Wed, 05 May 2010 18:05:36 -0400 Message-ID: <201005052205.o45M5aqF020041@svn01.web.mwc.hst.phx2.redhat.com> --===============6637679381553471902== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 18:05:36 -0400 (Wed, 05 May 2010) New Revision: 21928 Modified: branches/modular_build/genpom.xml Log: add more tests Modified: branches/modular_build/genpom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/genpom.xml 2010-05-05 21:19:30 UTC (rev 21927) +++ branches/modular_build/genpom.xml 2010-05-05 22:05:36 UTC (rev 21928) @@ -327,10 +327,10 @@ - + - - + + @@ -772,7 +772,9 @@ = - + @@ -782,6 +784,7 @@ + = @@ -805,6 +808,9 @@ + = @@ -822,6 +828,7 @@ + = @@ -849,7 +856,7 @@ = - + = --===============6637679381553471902==-- From jbosstools-commits at lists.jboss.org Wed May 5 18:41:28 2010 Content-Type: multipart/mixed; boundary="===============2295044430483762542==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21929 - in branches/modular_build: drools and 1 other directories. Date: Wed, 05 May 2010 18:41:27 -0400 Message-ID: <201005052241.o45MfRTc024201@svn01.web.mwc.hst.phx2.redhat.com> --===============2295044430483762542== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 18:41:27 -0400 (Wed, 05 May 2010) New Revision: 21929 Added: branches/modular_build/drools/build.xml Modified: branches/modular_build/build/build.xml branches/modular_build/site/category.JBDS.xml branches/modular_build/site/category.JBossTools.xml Log: JBDS-486 add Drools as sourced from http://hudson.qa.jboss.com/hudson/job/d= rools/lastStableBuild/artifact/trunk/target/drools-5.1.0.SNAPSHOT-eclipse-a= ll.zip Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-05 22:05:36 UTC (rev 219= 28) +++ branches/modular_build/build/build.xml 2010-05-05 22:41:27 UTC (rev 219= 29) @@ -410,7 +410,7 @@ </testsuite> - + The following components' sources have changed= and will be built: @@ -448,12 +448,15 @@ - Build @{COMPONENT} - - - - - + + + + Build overall update @{COMPONENT} + + + Build @{COMPONENT} component + + @@ -465,6 +468,11 @@ = + + + + + @@ -664,9 +672,9 @@ = - + - + All components up to date: nothing to do! To force a build of unchanged components, use -Dbuild.if.sources.unchanged= =3Dtrue @@ -674,8 +682,7 @@ = - - + @@ -715,6 +722,9 @@ = + + + @@ -922,6 +932,66 @@ = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bin.includes =3D feat= ure.*, ., plugin.*, about.*, META-INF/, .options/, lib/, help/, icons/, org= /, src/ + + + + + + + + + + + + + = + + + + + + + + + + + + + + + + + + + Property changes on: branches/modular_build/drools/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/modular_build/site/category.JBDS.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/site/category.JBDS.xml 2010-05-05 22:05:36 UTC (= rev 21928) +++ branches/modular_build/site/category.JBDS.xml 2010-05-05 22:41:27 UTC (= rev 21929) @@ -101,14 +101,22 @@ - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + --===============0379257134484057167== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 20:32:22 -0400 (Wed, 05 May 2010) New Revision: 21930 Modified: branches/modular_build/build/build.xml Log: add task to audit features in update site zips (eg., why does common includ= e org.eclipse.wst.common_{core,ui}.feature? why does vpe include org.jboss.= tools.xulrunner.feature?) Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-05 22:41:27 UTC (rev 219= 29) +++ branches/modular_build/build/build.xml 2010-05-06 00:32:22 UTC (rev 219= 30) @@ -112,7 +112,7 @@ = = = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @{COMPONENT} :: ${updateZip} + + + + + + + + + :: @{featureJar} + + + + + + + @{COMPONENT} :: ${updateZip} + + + + + + + + + + No update site found for @{COMPONENT}. + + + + + + + + + --===============0379257134484057167==-- From jbosstools-commits at lists.jboss.org Wed May 5 20:46:59 2010 Content-Type: multipart/mixed; boundary="===============1561837739392214520==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21931 - branches/modular_build/build. Date: Wed, 05 May 2010 20:46:59 -0400 Message-ID: <201005060046.o460kxHO019009@svn01.web.mwc.hst.phx2.redhat.com> --===============1561837739392214520== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-05 20:46:59 -0400 (Wed, 05 May 2010) New Revision: 21931 Modified: branches/modular_build/build/build.xml Log: add a more extreme purge step Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-06 00:32:22 UTC (rev 219= 30) +++ branches/modular_build/build/build.xml 2010-05-06 00:46:59 UTC (rev 219= 31) @@ -108,6 +108,7 @@ + = --===============6090169946862391562== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2010-05-06 03:45:29 -0400 (Thu, 06 May 2010) New Revision: 21932 Added: trunk/xulrunner/plugins/org.mozilla.xpcom/.classpath Log: .classpath file has been added to the org.mozilla.xpcom plugin. Added: trunk/xulrunner/plugins/org.mozilla.xpcom/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/xulrunner/plugins/org.mozilla.xpcom/.classpath = (rev 0) +++ trunk/xulrunner/plugins/org.mozilla.xpcom/.classpath 2010-05-06 07:45:2= 9 UTC (rev 21932) @@ -0,0 +1,7 @@ + + + + + + + --===============6090169946862391562==-- From jbosstools-commits at lists.jboss.org Thu May 6 05:47:17 2010 Content-Type: multipart/mixed; boundary="===============8773833368422304160==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21933 - in trunk: jst/plugins/org.jboss.tools.jst.web.ui and 1 other directories. Date: Thu, 06 May 2010 05:47:17 -0400 Message-ID: <201005060947.o469lHwX008011@svn01.web.mwc.hst.phx2.redhat.com> --===============8773833368422304160== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-06 05:47:16 -0400 (Thu, 06 May 2010) New Revision: 21933 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.properties trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web= /ui/editor/pref/template/contentassist/XHTMLContentAssistProcessor.java trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web= /ui/editor/pref/template/contentassist/XHTMLTemplateCompletionProcessor.java Log: https://jira.jboss.org/jira/browse/JBIDE-6131 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.properties 2010-05-06 0= 7:45:29 UTC (rev 21932) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.properties 2010-05-06 0= 9:47:16 UTC (rev 21933) @@ -25,7 +25,6 @@ PreferencePage_JSFFlowTabbed=3DJSF Flow Diagram PreferencePage_Validator=3DValidator PreferencePage_JSFValidator=3DJSF Validator -VPE_Templates=3DTemplates = NewWizardCat_JBossTools=3DJBoss Tools NewWizardCat_JSF=3DJSF @@ -38,12 +37,3 @@ ImportWizardCat_Struts=3DStruts ImportWizardDescription_JSFProject=3DCreate a new Project from a JSF proje= ct in the file system. This does not copy the project to the workspace. ImportWizardDescription_JSFWar=3DCreate a new Project from a JSF project i= n a WAR file. The content of WAR file will be copied to the workspace. - -All_XHTML_context_type_Extension_Element.name=3DAll XHTML -XHTML_New_context_type_Extension_Element.name=3DNew XHTML -XHTML_Tag_context_type_Extension_Element.name=3DXHTML Tag -XHTML_Attribute_context_type_Extension_Element.name=3DXHTML Attribute -XHTML_Attribute_value_context_type_Extension_Element.name=3DXHTML Attribut= e value - -NewXHTMLPage =3D XHTML Page -NewXHTMLPageDescription =3D Create a New XHTML Page \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2010-05-06 07:45:29= UTC (rev 21932) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2010-05-06 09:47:16= UTC (rev 21933) @@ -8,13 +8,6 @@ id=3D"org.jboss.tools.jsf.ui" = name=3D"%PreferencePage_JSF"> - - - + + + result =3D new ArrayList(= ); + List fContextTypes =3D getContentTypes(textViewer, documentPosit= ion); + addTemplates(textViewer, result, fContextTypes, + documentPosition); + return result.toArray(new ICompletionProposal[0]); + } + /** + * Function for culculation content type depending on position + * @param textViewer + * @param documentPosition + * @return List of content types + * = + * @author mareshkau + */ + private List getContentTypes(ITextViewer textViewer, int document= Position){ List fContextTypes =3D new ArrayList(); + IDocument document =3D textViewer.getDocument(); + IStructuredModel model =3D null; + try { + // gets source model for read, model should be released see + // JBIDE-2219 + model =3D StructuredModelManager.getModelManager() + .getExistingModelForRead(document); + IndexedRegion node =3D model.getIndexedRegion(documentPosition); + } + finally{ + if (model !=3D null) { + model.releaseFromRead(); + } + } //TODO Maksim Areshkau, analize and position here fContextTypes.add(TemplateContextTypeIdsXHTML.ALL); fContextTypes.add(TemplateContextTypeIdsXHTML.TAG); fContextTypes.add(TemplateContextTypeIdsXHTML.NEW); fContextTypes.add(TemplateContextTypeIdsXHTML.ATTRIBUTE); fContextTypes.add(TemplateContextTypeIdsXHTML.ATTRIBUTE_VALUE); - addTemplates(textViewer, result, fContextTypes, - documentPosition); - return result.toArray(new ICompletionProposal[0]); + return fContextTypes; } - + = protected String getEmptyTagCloseString() { if (isXHTML) return " />"; //$NON-NLS-1$ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/= jst/web/ui/editor/pref/template/contentassist/XHTMLTemplateCompletionProces= sor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/we= b/ui/editor/pref/template/contentassist/XHTMLTemplateCompletionProcessor.ja= va 2010-05-06 07:45:29 UTC (rev 21932) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/we= b/ui/editor/pref/template/contentassist/XHTMLTemplateCompletionProcessor.ja= va 2010-05-06 09:47:16 UTC (rev 21933) @@ -122,10 +122,12 @@ return null; } = + @Override protected ICompletionProposal createProposal(Template template, TemplateC= ontext context, IRegion region, int relevance) { return new TemplateProposal(template, context, region, getImage(template= ), relevance); } = + @Override protected TemplateContextType getContextType(ITextViewer viewer, IRegion = region) { TemplateContextType type =3D null; = @@ -145,6 +147,7 @@ return WebUiPlugin.getDefault().getTemplateContextRegistry(); } = + @Override protected Template[] getTemplates(String contextTypeId) { Template templates[] =3D null; = @@ -160,7 +163,7 @@ } = void setContextType(String contextTypeId) { - fContextTypeId =3D contextTypeId; + this.fContextTypeId =3D contextTypeId; } = @Override --===============8773833368422304160==-- From jbosstools-commits at lists.jboss.org Thu May 6 09:27:45 2010 Content-Type: multipart/mixed; boundary="===============8838111981313795161==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21934 - in trunk: jst/plugins/org.jboss.tools.jst.web.ui and 1 other directories. Date: Thu, 06 May 2010 09:27:45 -0400 Message-ID: <201005061327.o46DRjWS025992@svn01.web.mwc.hst.phx2.redhat.com> --===============8838111981313795161== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-06 09:27:44 -0400 (Thu, 06 May 2010) New Revision: 21934 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml trunk/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web= /ui/editor/pref/template/contentassist/XHTMLContentAssistProcessor.java Log: https://jira.jboss.org/jira/browse/JBIDE-6131 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2010-05-06 09:47:16= UTC (rev 21933) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/plugin.xml 2010-05-06 13:27:44= UTC (rev 21934) @@ -128,20 +128,6 @@ - - %NewXHTMLPageDescription - - - - - + + %NewXHTMLPageDescription + + + + + getContentTypes(ITextViewer textViewer, int document= Position){ List fContextTypes =3D new ArrayList(); + //this should be added in any case + fContextTypes.add(TemplateContextTypeIdsXHTML.ALL); IDocument document =3D textViewer.getDocument(); IStructuredModel model =3D null; try { - // gets source model for read, model should be released see - // JBIDE-2219 model =3D StructuredModelManager.getModelManager() .getExistingModelForRead(document); - IndexedRegion node =3D model.getIndexedRegion(documentPosition); + Node node =3D (Node) model.getIndexedRegion(documentPosition); + = + if(node=3D=3Dnull||node.getNodeType()=3D=3DNode.DOCUMENT_NODE){ + fContextTypes.add(TemplateContextTypeIdsXHTML.NEW); + } + //commented by Maksim Areshkau, because even on attribute we get type E= LEMENT_NODE +// else if(node.getNodeType()=3D=3DNode.ATTRIBUTE_NODE){ +// fContextTypes.add(TemplateContextTypeIdsXHTML.ATTRIBUTE); +// fContextTypes.add(TemplateContextTypeIdsXHTML.ATTRIBUTE_VALUE); +// } + else if(node.getNodeType()=3D=3DNode.ELEMENT_NODE ||node.getNodeType()= =3D=3DNode.TEXT_NODE) { + fContextTypes.add(TemplateContextTypeIdsXHTML.ATTRIBUTE); + fContextTypes.add(TemplateContextTypeIdsXHTML.ATTRIBUTE_VALUE); + fContextTypes.add(TemplateContextTypeIdsXHTML.TAG); + } + = } finally{ if (model !=3D null) { model.releaseFromRead(); } } - //TODO Maksim Areshkau, analize and position here - fContextTypes.add(TemplateContextTypeIdsXHTML.ALL); - fContextTypes.add(TemplateContextTypeIdsXHTML.TAG); - fContextTypes.add(TemplateContextTypeIdsXHTML.NEW); - fContextTypes.add(TemplateContextTypeIdsXHTML.ATTRIBUTE); - fContextTypes.add(TemplateContextTypeIdsXHTML.ATTRIBUTE_VALUE); +// fContextTypes.add(TemplateContextTypeIdsXHTML.TAG); +// fContextTypes.add(TemplateContextTypeIdsXHTML.NEW); +// fContextTypes.add(TemplateContextTypeIdsXHTML.ATTRIBUTE); +// fContextTypes.add(TemplateContextTypeIdsXHTML.ATTRIBUTE_VALUE); return fContextTypes; } = --===============8838111981313795161==-- From jbosstools-commits at lists.jboss.org Thu May 6 10:08:47 2010 Content-Type: multipart/mixed; boundary="===============9073491630008516891==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21935 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test: wizard and 1 other directory. Date: Thu, 06 May 2010 10:08:47 -0400 Message-ID: <201005061408.o46E8lTu004959@svn01.web.mwc.hst.phx2.redhat.com> --===============9073491630008516891== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-06 10:08:46 -0400 (Thu, 06 May 2010) New Revision: 21935 Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/= ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/= ui/bot/test/VPEAllBotTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-6131, simple test case in which pr= ef page are opened has been added Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/too= ls/vpe/ui/bot/test/VPEAllBotTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/VPEAllBotTests.java 2010-05-06 13:27:44 UTC (rev 21934) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/VPEAllBotTests.java 2010-05-06 14:08:46 UTC (rev 21935) @@ -25,6 +25,7 @@ import org.jboss.tools.vpe.ui.bot.test.smoke.XHTMLPageCreationTest; import org.jboss.tools.vpe.ui.bot.test.wizard.ImportUnknownTagsWizardTest; import org.jboss.tools.vpe.ui.bot.test.wizard.NewXHTMLPageWizardTest; +import org.jboss.tools.vpe.ui.bot.test.wizard.VPESourceCodeTemplatesPrefer= encePageTest; = public class VPEAllBotTests extends SWTBotTestCase{ public static Test suite(){ @@ -51,6 +52,7 @@ suite.addTestSuite(RenameXHTMLFileTest.class); suite.addTestSuite(ImportUnknownTagsWizardTest.class); suite.addTestSuite(NewXHTMLPageWizardTest.class); + suite.addTestSuite(VPESourceCodeTemplatesPreferencePageTest.class); return new TestSetup(suite); } } Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/= vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java = (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-05-0= 6 14:08:46 UTC (rev 21935) @@ -0,0 +1,39 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.vpe.ui.bot.test.wizard; + +import org.eclipse.swtbot.swt.finder.SWTBotTestCase; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; + +/** + * This test class open vpe preference page + * Window->Preferences->JBoss Tools->Web->Editors->Visual Page Editor->Tem= plates + * = + * @author mareshkau + * + */ +public class VPESourceCodeTemplatesPreferencePageTest extends SWTBotTestCa= se{ + + //just open a VPE Source Code templates preference test page + public void testSourceCodeTemplatesPreferencePage() { + this.bot.menu("Window").menu("Preferences").click(); //$NON-NLS-1$ //$NO= N-NLS-2$ + SWTBotTree preferenceTree =3D this.bot.tree(); + preferenceTree + .expandNode("JBoss Tools") //$NON-NLS-1$ + .expandNode("Web") //$NON-NLS-1$ + .expandNode("Editors") //$NON-NLS-1$ + .expandNode("Visual Page Editor") //$NON-NLS-1$ + .select("Templates").click(); //$NON-NLS-1$ + this.bot.button("New...").click(); //$NON-NLS-1$ + this.bot.button("Cancel").click(); //$NON-NLS-1$ + System.out.println(this.bot.activeShell().getText()); + } +} --===============9073491630008516891==-- From jbosstools-commits at lists.jboss.org Thu May 6 10:21:22 2010 Content-Type: multipart/mixed; boundary="===============3149698566957028880==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21936 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test and 1 other directories. Date: Thu, 06 May 2010 10:21:21 -0400 Message-ID: <201005061421.o46ELL0x006490@svn01.web.mwc.hst.phx2.redhat.com> --===============3149698566957028880== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-06 10:21:19 -0400 (Thu, 06 May 2010) New Revision: 21936 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/= ui/bot/test/VPEAllBotTests.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/= ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6131, test has been adjusted Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-06 14:0= 8:46 UTC (rev 21935) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-06 14:2= 1:19 UTC (rev 21936) @@ -47,7 +47,7 @@ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/too= ls/vpe/ui/bot/test/VPEAllBotTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/VPEAllBotTests.java 2010-05-06 14:08:46 UTC (rev 21935) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/VPEAllBotTests.java 2010-05-06 14:21:19 UTC (rev 21936) @@ -31,27 +31,27 @@ public static Test suite(){ TestSuite suite =3D new TestSuite("VPE All Tests"); //$NON-NLS-1$ = - suite.addTestSuite(CancelTagLibDefenitionTest.class); - suite.addTestSuite(ImportTagsFromTLDFileTest.class); - suite.addTestSuite(ToggleCommentTest.class); - suite.addTestSuite(BlockCommentTest.class); - suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class); - suite.addTestSuite(JBIDE4556Test.class); - suite.addTestSuite(VerificationOfNameSpacesTest.class); - suite.addTestSuite(BorderForUnknownTagsTest.class); - suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class); - suite.addTestSuite(ShowSelectionTagBarTest.class); - suite.addTestSuite(AlwaysHideSelectionBarWithoutPromptTest.class); - suite.addTestSuite(ShowNonVisualTagsTest.class); - suite.addTestSuite(AddSubstitutedELExpressionFolderScopeTest.class); - suite.addTestSuite(EditorSynchronizationTest.class); - suite.addTestSuite(JSPPageCreationTest.class); - suite.addTestSuite(XHTMLPageCreationTest.class); - suite.addTestSuite(RenameFacesConfigFileTest.class); - suite.addTestSuite(RenameJSPFileTest.class); - suite.addTestSuite(RenameXHTMLFileTest.class); - suite.addTestSuite(ImportUnknownTagsWizardTest.class); - suite.addTestSuite(NewXHTMLPageWizardTest.class); +// suite.addTestSuite(CancelTagLibDefenitionTest.class); +// suite.addTestSuite(ImportTagsFromTLDFileTest.class); +// suite.addTestSuite(ToggleCommentTest.class); +// suite.addTestSuite(BlockCommentTest.class); +// suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class); +// suite.addTestSuite(JBIDE4556Test.class); +// suite.addTestSuite(VerificationOfNameSpacesTest.class); +// suite.addTestSuite(BorderForUnknownTagsTest.class); +// suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class); +// suite.addTestSuite(ShowSelectionTagBarTest.class); +// suite.addTestSuite(AlwaysHideSelectionBarWithoutPromptTest.class); +// suite.addTestSuite(ShowNonVisualTagsTest.class); +// suite.addTestSuite(AddSubstitutedELExpressionFolderScopeTest.class); +// suite.addTestSuite(EditorSynchronizationTest.class); +// suite.addTestSuite(JSPPageCreationTest.class); +// suite.addTestSuite(XHTMLPageCreationTest.class); +// suite.addTestSuite(RenameFacesConfigFileTest.class); +// suite.addTestSuite(RenameJSPFileTest.class); +// suite.addTestSuite(RenameXHTMLFileTest.class); +// suite.addTestSuite(ImportUnknownTagsWizardTest.class); +// suite.addTestSuite(NewXHTMLPageWizardTest.class); suite.addTestSuite(VPESourceCodeTemplatesPreferencePageTest.class); return new TestSetup(suite); } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/too= ls/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-05-0= 6 14:08:46 UTC (rev 21935) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-05-0= 6 14:21:19 UTC (rev 21936) @@ -11,7 +11,9 @@ package org.jboss.tools.vpe.ui.bot.test.wizard; = import org.eclipse.swtbot.swt.finder.SWTBotTestCase; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.test.WidgetVariables; = /** * This test class open vpe preference page @@ -32,8 +34,13 @@ .expandNode("Editors") //$NON-NLS-1$ .expandNode("Visual Page Editor") //$NON-NLS-1$ .select("Templates").click(); //$NON-NLS-1$ - this.bot.button("New...").click(); //$NON-NLS-1$ - this.bot.button("Cancel").click(); //$NON-NLS-1$ - System.out.println(this.bot.activeShell().getText()); + try{ + this.bot.button("New...").click(); //$NON-NLS-1$ + this.bot.button("Cancel").click(); //$NON-NLS-1$ + } catch(WidgetNotFoundException ex){ + fail("Preference Page has not been created"+ex);//$NON-NLS-1$ + }finally{ + this.bot.button(WidgetVariables.OK_BUTTON).click(); + } } } --===============3149698566957028880==-- From jbosstools-commits at lists.jboss.org Thu May 6 10:22:09 2010 Content-Type: multipart/mixed; boundary="===============7052175314468053180==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21937 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test. Date: Thu, 06 May 2010 10:22:09 -0400 Message-ID: <201005061422.o46EM9lW006515@svn01.web.mwc.hst.phx2.redhat.com> --===============7052175314468053180== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-06 10:22:07 -0400 (Thu, 06 May 2010) New Revision: 21937 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/= ui/bot/test/VPEAllBotTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-6131, test has been adjusted Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/too= ls/vpe/ui/bot/test/VPEAllBotTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/VPEAllBotTests.java 2010-05-06 14:21:19 UTC (rev 21936) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/VPEAllBotTests.java 2010-05-06 14:22:07 UTC (rev 21937) @@ -31,27 +31,27 @@ public static Test suite(){ TestSuite suite =3D new TestSuite("VPE All Tests"); //$NON-NLS-1$ = -// suite.addTestSuite(CancelTagLibDefenitionTest.class); -// suite.addTestSuite(ImportTagsFromTLDFileTest.class); -// suite.addTestSuite(ToggleCommentTest.class); -// suite.addTestSuite(BlockCommentTest.class); -// suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class); -// suite.addTestSuite(JBIDE4556Test.class); -// suite.addTestSuite(VerificationOfNameSpacesTest.class); -// suite.addTestSuite(BorderForUnknownTagsTest.class); -// suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class); -// suite.addTestSuite(ShowSelectionTagBarTest.class); -// suite.addTestSuite(AlwaysHideSelectionBarWithoutPromptTest.class); -// suite.addTestSuite(ShowNonVisualTagsTest.class); -// suite.addTestSuite(AddSubstitutedELExpressionFolderScopeTest.class); -// suite.addTestSuite(EditorSynchronizationTest.class); -// suite.addTestSuite(JSPPageCreationTest.class); -// suite.addTestSuite(XHTMLPageCreationTest.class); -// suite.addTestSuite(RenameFacesConfigFileTest.class); -// suite.addTestSuite(RenameJSPFileTest.class); -// suite.addTestSuite(RenameXHTMLFileTest.class); -// suite.addTestSuite(ImportUnknownTagsWizardTest.class); -// suite.addTestSuite(NewXHTMLPageWizardTest.class); + suite.addTestSuite(CancelTagLibDefenitionTest.class); + suite.addTestSuite(ImportTagsFromTLDFileTest.class); + suite.addTestSuite(ToggleCommentTest.class); + suite.addTestSuite(BlockCommentTest.class); + suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class); + suite.addTestSuite(JBIDE4556Test.class); + suite.addTestSuite(VerificationOfNameSpacesTest.class); + suite.addTestSuite(BorderForUnknownTagsTest.class); + suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class); + suite.addTestSuite(ShowSelectionTagBarTest.class); + suite.addTestSuite(AlwaysHideSelectionBarWithoutPromptTest.class); + suite.addTestSuite(ShowNonVisualTagsTest.class); + suite.addTestSuite(AddSubstitutedELExpressionFolderScopeTest.class); + suite.addTestSuite(EditorSynchronizationTest.class); + suite.addTestSuite(JSPPageCreationTest.class); + suite.addTestSuite(XHTMLPageCreationTest.class); + suite.addTestSuite(RenameFacesConfigFileTest.class); + suite.addTestSuite(RenameJSPFileTest.class); + suite.addTestSuite(RenameXHTMLFileTest.class); + suite.addTestSuite(ImportUnknownTagsWizardTest.class); + suite.addTestSuite(NewXHTMLPageWizardTest.class); suite.addTestSuite(VPESourceCodeTemplatesPreferencePageTest.class); return new TestSetup(suite); } --===============7052175314468053180==-- From jbosstools-commits at lists.jboss.org Thu May 6 10:23:45 2010 Content-Type: multipart/mixed; boundary="===============0796327222297098418==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21938 - trunk/jst/plugins/org.jboss.tools.jst.web.ui. Date: Thu, 06 May 2010 10:23:45 -0400 Message-ID: <201005061423.o46ENjCE006531@svn01.web.mwc.hst.phx2.redhat.com> --===============0796327222297098418== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-06 10:23:43 -0400 (Thu, 06 May 2010) New Revision: 21938 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml Log: class name mistake in plugin has been adjusted Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-06 14:2= 2:07 UTC (rev 21937) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-06 14:2= 3:43 UTC (rev 21938) @@ -47,7 +47,7 @@ --===============0796327222297098418==-- From jbosstools-commits at lists.jboss.org Thu May 6 10:54:04 2010 Content-Type: multipart/mixed; boundary="===============3714789687349028714==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21939 - branches/modular_build/build. Date: Thu, 06 May 2010 10:54:04 -0400 Message-ID: <201005061454.o46Es44v010333@svn01.web.mwc.hst.phx2.redhat.com> --===============3714789687349028714== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-06 10:54:04 -0400 (Thu, 06 May 2010) New Revision: 21939 Modified: branches/modular_build/build/build.xml Log: support using true/false/other path values of maven.repo.local Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-06 14:23:43 UTC (rev 219= 38) +++ branches/modular_build/build/build.xml 2010-05-06 14:54:04 UTC (rev 219= 39) @@ -108,7 +108,7 @@ - + = Exe: ${COMMON_TOOLS}/apache-maven-${maven.versio= n}/bin/${mvnExe} Pom: ${WORKINGDIR}/${COMPONENT}/pom.xml + + + + + + + + + + + + + + + + + + + + + + + + - + + --===============3714789687349028714==-- From jbosstools-commits at lists.jboss.org Thu May 6 11:03:08 2010 Content-Type: multipart/mixed; boundary="===============0777297441115572280==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21940 - branches/modular_build/build. Date: Thu, 06 May 2010 11:03:08 -0400 Message-ID: <201005061503.o46F38I5012040@svn01.web.mwc.hst.phx2.redhat.com> --===============0777297441115572280== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-06 11:03:07 -0400 (Thu, 06 May 2010) New Revision: 21940 Modified: branches/modular_build/build/build.xml Log: workaround for windows and svnant server suck Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-06 14:54:04 UTC (rev 219= 39) +++ branches/modular_build/build/build.xml 2010-05-06 15:03:07 UTC (rev 219= 40) @@ -163,9 +163,21 @@ - - - + + + + + + + + + + + @@ -774,7 +786,7 @@ - + --===============0777297441115572280==-- From jbosstools-commits at lists.jboss.org Thu May 6 11:30:32 2010 Content-Type: multipart/mixed; boundary="===============0725373240635469049==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21941 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: resources/jsfTest/WebContent/pages/JBIDE/6131 and 1 other directories. Date: Thu, 06 May 2010 11:30:32 -0400 Message-ID: <201005061530.o46FUW4Y020807@svn01.web.mwc.hst.phx2.redhat.com> --===============0725373240635469049== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-06 11:30:31 -0400 (Thu, 06 May 2010) New Revision: 21941 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/6131/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/6131/6131test.xhtml Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf= /vpe/jsf/test/jbide/JBIDE788Test.java Log: https://jira.jboss.org/jira/browse/JBIDE-6131, check for templates proposal= s in ca has been added Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/6131/6131test.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to= ols/jsf/vpe/jsf/test/jbide/JBIDE788Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/JBIDE788Test.java 2010-05-06 15:03:07 UTC (rev 21940) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/JBIDE788Test.java 2010-05-06 15:30:31 UTC (rev 21941) @@ -64,7 +64,30 @@ throw getException(); } } + //added by Maksim Areshkau, as test case for JBIE-6131. + //source code templates should be in ca proposals. + public void testCAforSourceCodeTemplatesProposals() throws Throwable { + // wait + TestUtil.waitForJobs(); + // set exception + setException(null); + ICompletionProposal[] results =3D checkOfCAByStartString(CA_NAME, "JBIDE= /6131/6131test.xhtml","Common",1,1,false); //$NON-NLS-1$ //$NON-NLS-2$ + boolean proposalExists=3Dfalse; + for (ICompletionProposal completionProposal : results) { + String displayString =3D ((ICompletionProposal) completionProposal).get= DisplayString(); = + if(displayString.contains("Common Facelet Page")) { //$NON-NLS-1$ + proposalExists =3D true; + break; + } = + } + assertTrue("Common " + " should be in proposals", proposalExists); = + // check exception + if (getException() !=3D null) { + + throw getException(); + } + } /** * Tests Path proposals of CA */ --===============0725373240635469049==-- From jbosstools-commits at lists.jboss.org Thu May 6 12:12:23 2010 Content-Type: multipart/mixed; boundary="===============1291909069330041918==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21942 - trunk/drools/docs/guvnor_ref/en-US. Date: Thu, 06 May 2010 12:12:23 -0400 Message-ID: <201005061612.o46GCNZE032309@svn01.web.mwc.hst.phx2.redhat.com> --===============1291909069330041918== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-06 12:12:23 -0400 (Thu, 06 May 2010) New Revision: 21942 Modified: trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml trunk/drools/docs/guvnor_ref/en-US/introduction.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-63 Eclipse Guvnor Tools Referen= ce Guide restructureing and update. The minor structure and text changes ha= ve been made. Modified: trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml 2010-05-0= 6 15:30:31 UTC (rev 21941) +++ trunk/drools/docs/guvnor_ref/en-US/functionality_overview.xml 2010-05-0= 6 16:12:23 UTC (rev 21942) @@ -28,10 +28,10 @@ = - Drag-and-drop from the Guvnor Repositories= view + Drag-and-drop from the Guvnor Repositories view - Using the Im= port from Guvnor + Using the Re= source from Guvnor wizard, as described further in this docume= nt @@ -234,14 +234,7 @@ If a local change is based on an older revision of a fil= e that is currently in the Guvnor repository (for example, someone else changed the s= ame file), then the Commit - action will
- Add to Guvnor Wizard - - - - - -
ask whether you wish to overwrite the current version in the + action will ask whether you wish to overwrite = the current version in the Guvnor repository with the local content. When such confli= cts occur, however, you should use the Eclipse Guvnor version tools, along with Ec= lipse standard tools, to determine the differences and merge content based on the c= urrent version in the Modified: trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml 2010-05-06 15= :30:31 UTC (rev 21941) +++ trunk/drools/docs/guvnor_ref/en-US/guvnor_preferences.xml 2010-05-06 16= :12:23 UTC (rev 21942) @@ -15,8 +15,8 @@ Guvnor Repository Exploring Perspective = The Guvnor Repository Exploring perspective contains two views - supplied by EGT =E2=80=93 Guvnor Repositories and - Guvnor Resource History<= /link>, that will be the center of most interactions + supplied by EGT =E2=80=93 Guvnor Repositories view and + Guvnor Resource History = view, that will be the center of most interactions with Guvnor, and Eclipse standard views such as Prop= erties and Resource Navigator that are also useful.<= /para> = @@ -163,7 +163,7 @@
=
- Import from Guvnor wizard + Resource from Guvnor Wizard = In addition to the single file drag-and-drop from the Guvnor Repositories view, the EGT also includes a = wizard for copying one @@ -350,7 +350,7 @@ Resource History view updates to show the r= evision history: =
- IGuvnor Resource History View + Guvnor Resource History View Modified: trunk/drools/docs/guvnor_ref/en-US/introduction.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/guvnor_ref/en-US/introduction.xml 2010-05-06 15:30:31= UTC (rev 21941) +++ trunk/drools/docs/guvnor_ref/en-US/introduction.xml 2010-05-06 16:12:23= UTC (rev 21942) @@ -74,15 +74,14 @@ = - Resources from Guvnor Wizard + Resource from Guvnor wizard The wizard helps to get local copies of = Guvnor repository resources. - Import= ing Guvnor Repository - Resources + Resour= ce from Guvnor wizard = @@ -98,7 +97,7 @@ and those not associated. - Actions for Local Gu= vnor Resources + Managing Guvnor Reso= urces = @@ -135,7 +134,7 @@ To have JBoss Server with Guvnor repository deployed, you sh= ould - download Guvnor. + download Drools Guvnor. When downloading you may choose either web based Guvnor to dep= loy to your JBoss Server or Standalone Guvnor with JBoss AS. = If you use a JBoss AS 5 and a Guvnor Tools doesn't work when deployed to the server, --===============1291909069330041918==-- From jbosstools-commits at lists.jboss.org Thu May 6 13:43:16 2010 Content-Type: multipart/mixed; boundary="===============3734037509299577735==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21943 - branches/modular_build. Date: Thu, 06 May 2010 13:43:16 -0400 Message-ID: <201005061743.o46HhGeX017628@svn01.web.mwc.hst.phx2.redhat.com> --===============3734037509299577735== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-06 13:43:16 -0400 (Thu, 06 May 2010) New Revision: 21943 Modified: branches/modular_build/parent-pom.xml Log: fix typos and add scm plugin - experimenting w/ bootstrapping sources from = mvn instead of svnant (windows support) Modified: branches/modular_build/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/parent-pom.xml 2010-05-06 16:12:23 UTC (rev 2194= 2) +++ branches/modular_build/parent-pom.xml 2010-05-06 17:43:16 UTC (rev 2194= 3) @@ -16,7 +16,7 @@ - org.codehaus.tycho + org.sonatype.tycho maven-osgi-packaging-plugin ${tychoVersion} @@ -32,6 +32,17 @@ = + org.apache.maven.plugins + maven-scm-plugin + 1.0 + + + true + sources + + + + org.sonatype.tycho target-platform-configuration ${tychoVersion} @@ -41,6 +52,11 @@ macosx cocoa + x86_64 + + + macosx + cocoa x86 @@ -134,7 +150,7 @@ scm:svn:http://anonsvn.jboss.org/repos/jbosstools/$= {scmBranch} - http://anonsvn.jboss.org/repos/jbosstools/branches/${scmBranch} + http://anonsvn.jboss.org/repos/jbosstools/${scmBranch} = @@ -248,6 +264,7 @@ = + galileo http://download.eclipse.org/releases/galileo/ @@ -365,7 +382,7 @@ tycho - http://repository.sonatype.org/content/repositories/snapshots/ + https://repository.sonatype.org/content/repositories/snapshots/ true --===============3734037509299577735==-- From jbosstools-commits at lists.jboss.org Thu May 6 14:17:19 2010 Content-Type: multipart/mixed; boundary="===============8196570443307342995==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21944 - branches/modular_build/build. Date: Thu, 06 May 2010 14:17:18 -0400 Message-ID: <201005061817.o46IHIHH027746@svn01.web.mwc.hst.phx2.redhat.com> --===============8196570443307342995== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-06 14:17:18 -0400 (Thu, 06 May 2010) New Revision: 21944 Modified: branches/modular_build/build/build.xml Log: add modeshape to list of default components to build Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-06 17:43:16 UTC (rev 219= 43) +++ branches/modular_build/build/build.xml 2010-05-06 18:17:18 UTC (rev 219= 44) @@ -8,7 +8,7 @@ value=3D"tests,common; flow,jbpm; jmx,archives,as; - drools,bpel,smooks,freemarker,profiler,portlet; + drools,bpel,smooks,freemarker,profiler,portlet,modeshape; xulrunner,jst,vpe,jsf; esb,tptp,ws; cdi,struts,hibernatetools,seam; --===============8196570443307342995==-- From jbosstools-commits at lists.jboss.org Thu May 6 14:19:08 2010 Content-Type: multipart/mixed; boundary="===============6769967450675312540==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21945 - in trunk/cdi: plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 2 other directories. Date: Thu, 06 May 2010 14:19:08 -0400 Message-ID: <201005061819.o46IJ8U2027780@svn01.web.mwc.hst.phx2.redhat.com> --===============6769967450675312540== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-06 14:19:08 -0400 (Thu, 06 May 2010) New Revision: 21945 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/implem= entation/producer/field/definition/broken/parameterizedReturnTypeWithWildca= rd/SpiderProducerWildCardType_Broken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : producer field type contains a wildcard type parameter. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-06 18:17:18 UTC (rev 219= 44) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-06 18:19:08 UTC (rev 219= 45) @@ -32,6 +32,7 @@ import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.Signature; import org.eclipse.wst.validation.internal.core.ValidationException; import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.jboss.tools.cdi.core.CDIConstants; @@ -521,6 +522,20 @@ } } } + /* + * 3.4. Producer fields + * - producer field type contains a wildcard type parameter + */ + Set typeDeclarations =3D producerField.getAllTypeDecl= arations(); + if(!typeDeclarations.isEmpty()) { + ITypeDeclaration typeDeclaration =3D typeDeclarations.iterator().next(= ); + String[] paramTypes =3D Signature.getTypeArguments(typeDeclaration.get= Signature()); + for (String paramType : paramTypes) { + if((paramType.length()=3D=3D1 && paramType.charAt(0) =3D=3D Signature= .C_STAR) || paramType.charAt(0) =3D=3D Signature.C_EXTENDS) { + addError(CDIValidationMessages.PRODUCER_FIELD_TYPE_HAS_WILDCARD, CDI= Preferences.PRODUCER_FIELD_TYPE_HAS_WILDCARD, typeDeclaration, producer.get= Resource()); + } + } + } } else { IProducerMethod producerMethod =3D (IProducerMethod)producer; List params =3D producerMethod.getParameters(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-06 18:17:18 UTC (rev 21944) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-06 18:19:08 UTC (rev 21945) @@ -43,7 +43,7 @@ CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_type, new String[][]{ {CDIPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_illegalTypeInTypedDeclaration_label}, -// {CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, CDIPreferen= cesMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWi= ldcard_label}, + {CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, CDIPreference= sMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWild= card_label}, // {CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, CDIPreferenc= esMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeIsVari= able_label}, // {CDIPreferences.PRODUCER_FIELD_TYPE_HAS_WILDCARD, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_producerFieldTypeHasWildcard_label}, // {CDIPreferences.PRODUCER_FIELD_TYPE_IS_VARIABLE, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_producerFieldTypeIsVariable_label}, Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests= /implementation/producer/field/definition/broken/parameterizedReturnTypeWit= hWildcard/SpiderProducerWildCardType_Broken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/imple= mentation/producer/field/definition/broken/parameterizedReturnTypeWithWildc= ard/SpiderProducerWildCardType_Broken.java 2010-05-06 18:17:18 UTC (rev 219= 44) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/imple= mentation/producer/field/definition/broken/parameterizedReturnTypeWithWildc= ard/SpiderProducerWildCardType_Broken.java 2010-05-06 18:19:08 UTC (rev 219= 45) @@ -18,8 +18,8 @@ = import javax.enterprise.inject.Produces; = -public class SpiderProducerWildCardType_Broken +public class SpiderProducerWildCardType_Broken { @Produces public FunnelWeaver getAnotherFunnelWeaver =3D new FunnelW= eaver(); - + @Produces public FunnelWeaver getAnotherFunnelWeaver2; } Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-06 18:17:18 UTC (rev 21944) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-06 18:19:08 UTC (rev 21945) @@ -261,6 +261,18 @@ } = /** + * 3.4. Producer fields + * - producer field type contains a wildcard type parameter + * = + * @throws Exception + */ + public void testParameterizedReturnTypeWithWildcard() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/field/definition/broken/parameterizedReturnTypeWit= hWildcard/SpiderProducerWildCardType_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, A= bstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD= _TYPE_HAS_WILDCARD, 23, 1008, 1033); + AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, A= bstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD= _TYPE_HAS_WILDCARD, 24, 10011, 1036); + } + + /** * 3.9.1. Declaring an initializer method * - an initializer method has a parameter annotated @Disposes * = --===============6769967450675312540==-- From jbosstools-commits at lists.jboss.org Thu May 6 22:07:58 2010 Content-Type: multipart/mixed; boundary="===============6232876793724771434==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21946 - in trunk/ws/plugins/org.jboss.tools.ws.ui: src/org/jboss/tools/ws/ui/messages and 2 other directories. Date: Thu, 06 May 2010 22:07:58 -0400 Message-ID: <201005070207.o4727wbB002273@svn01.web.mwc.hst.phx2.redhat.com> --===============6232876793724771434== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-06 22:07:57 -0400 (Thu, 06 May 2010) New Revision: 21946 Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/A= ddMonitorDialog.java Modified: 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/message= s/JBossWSUI.properties trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/message= s/JBossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/W= STestUtils.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/D= elimitedStringList.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/J= AXRSWSTestView.java Log: OPEN - issue JBIDE-6253: Need a web service tester (JAX-WS and JAX-RS) in t= he tooling = https://jira.jboss.org/jira/browse/JBIDE-6253 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-05-06 = 18:19:08 UTC (rev 21945) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-05-07 = 02:07:57 UTC (rev 21946) @@ -22,7 +22,9 @@ com.ibm.icu, org.apache.axis, javax.xml.soap, - javax.xml.rpc + javax.xml.rpc, + org.eclipse.wst.internet.monitor.core, + org.eclipse.wst.internet.monitor.ui Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.ui, org.jboss.tools.ws.ui.messages, Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= messages/JBossWSUI.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUI.properties 2010-05-06 18:19:08 UTC (rev 21945) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUI.properties 2010-05-07 02:07:57 UTC (rev 21946) @@ -68,13 +68,15 @@ JBossWS_DelimitedStringList_EditValue_Dialog_Message=3DSpecify the updated= value below. = JAXRSWSTestView_Action_URL_Label=3DAction URL: +JAXRSWSTestView_Configure_Monitor_Button=3DConfigure Monitor JAXRSWSTestView_HTTP_Method_Label=3DHTTP Method: JAXRSWSTestView_Invoke_Label=3DInvoke +JAXRSWSTestView_Open_Monitor_Button=3DOpen Monitor JAXRSWSTestView_Request_Body_Label=3DRequest Body JAXRSWSTestView_Request_Header_Label=3DRequest Header JAXRSWSTestView_Request_Parameters_Label=3DRequest Parameters -JAXRSWSTestView_Results_Body_Label=3DResults Body -JAXRSWSTestView_Results_Header_Label=3DResults Header +JAXRSWSTestView_Results_Body_Label=3DResponse Body +JAXRSWSTestView_Results_Header_Label=3DResponse Header JAXRSWSTestView_Service_URL_Label=3DService URL: JAXRSWSTestView_Set_Sample_Data_Label=3DSet Sample Data JAXRSWSTestView_Web_Service_Type_Label=3DWeb Service Type: Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= messages/JBossWSUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUIMessages.java 2010-05-06 18:19:08 UTC (rev 21945) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUIMessages.java 2010-05-07 02:07:57 UTC (rev 21946) @@ -91,8 +91,10 @@ public static String JBossWS_DelimitedStringList_EditValue_Dialog_Title; public static String JBossWS_DelimitedStringList_EditValue_Dialog_Message; public static String JAXRSWSTestView_Action_URL_Label; + public static String JAXRSWSTestView_Configure_Monitor_Button; public static String JAXRSWSTestView_HTTP_Method_Label; public static String JAXRSWSTestView_Invoke_Label; + public static String JAXRSWSTestView_Open_Monitor_Button; public static String JAXRSWSTestView_Request_Body_Label; public static String JAXRSWSTestView_Request_Header_Label; public static String JAXRSWSTestView_Request_Parameters_Label; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= utils/WSTestUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= WSTestUtils.java 2010-05-06 18:19:08 UTC (rev 21945) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= WSTestUtils.java 2010-05-07 02:07:57 UTC (rev 21946) @@ -35,6 +35,7 @@ */ public class WSTestUtils { = + private static Map requestHeaders =3D null; private static Map resultHeaders =3D null; private static String EMPTY_STRING =3D ""; //$NON-NLS-1$ = @@ -42,6 +43,10 @@ return WSTestUtils.resultHeaders; } = + public static Map getRequestHeaders() { + return WSTestUtils.requestHeaders; + } + = /* * Start building the web query. Append parameters to URL */ @@ -92,6 +97,10 @@ // build the complete URL URL url =3D null; if (query !=3D null) { + // add the ? if there are parameters + if (!address.endsWith("?") && methodType.equalsIgnoreCase("GET= ") ) { //$NON-NLS-1$//$NON-NLS-2$ + address =3D address + "?"; //$NON-NLS-1$ + } // add parms to the url if we have some url =3D new URL(address + query); } else { @@ -116,7 +125,7 @@ // set whether this is a GET or POST httpurlc.setRequestMethod(methodType); = - // if we are sending/receiving XML, make sure the connection knows + // if we have headers to add if (headers !=3D null && !headers.isEmpty()) { Iterator iter =3D headers.entrySet().iterator(); while (iter.hasNext()) { @@ -126,12 +135,15 @@ } } = + requestHeaders =3D httpurlc.getRequestProperties(); + = // CONNECT! httpurlc.connect(); = // If we are doing a POST and we have some request body to pass al= ong, do it if (requestBody !=3D null && ( methodType.equalsIgnoreCase("POST")= //$NON-NLS-1$ || methodType.equalsIgnoreCase("PUT"))) { //$NON-NLS-1$ + requestBody =3D stripNLsFromXML(requestBody); OutputStreamWriter out =3D new OutputStreamWriter(httpurlc.getOut= putStream()); out.write(requestBody); out.close(); @@ -149,7 +161,7 @@ br.close(); response =3D sb.toString(); = - WSTestUtils.resultHeaders =3D httpurlc.getHeaderFields(); + resultHeaders =3D httpurlc.getHeaderFields(); = // disconnect explicitly (may not be necessary) httpurlc.disconnect(); @@ -171,7 +183,7 @@ String soapIn =3D body; = = /* Use AXIS to call the WS */ - String document =3D soapIn; + String document =3D stripNLsFromXML(soapIn); Service service =3D new Service(); Call call=3D (Call) service.createCall(); call.setTargetEndpointAddress( new java.net.URL(endpoint) ); @@ -180,7 +192,31 @@ call.setProperty(Call.SOAPACTION_USE_PROPERTY,Boolean.TRUE); call.setProperty(Call.SOAPACTION_URI_PROPERTY,action); } - SOAPEnvelope envelope =3D call.invoke( new Message(document) ); - return envelope.getBody().toString().replaceAll("><",">\n<");//$NON-NLS-= 1$ //$NON-NLS-2$ + Message message =3D new Message(document); + SOAPEnvelope envelope =3D call.invoke( message ); + System.out.println(envelope.getHeaders().toString()); + = + String cleanedUp =3D stripNLsFromXML(envelope.getBody().toString()); + return cleanedUp; } + = + public static String addNLsToXML( String incoming ) { + String outgoing =3D null; + if (incoming !=3D null) { + outgoing =3D incoming.replaceAll("><",">\n<");//$NON-NLS-1$ //$NON-NLS-= 2$ + } + return outgoing; + } + = + public static String stripNLsFromXML ( String incoming ) { + String outgoing =3D null; + if (incoming !=3D null) { + outgoing =3D incoming.replaceAll(">\n<","><");//$NON-NLS-1$ //$NON-NLS-= 2$ + if (outgoing.contains("\n"))//$NON-NLS-1$ = + outgoing.replaceAll("\n"," ");//$NON-NLS-1$ //$NON-NLS-2$ + if (outgoing.contains("\r"))//$NON-NLS-1$ = + outgoing.replaceAll("\r"," ");//$NON-NLS-1$ //$NON-NLS-2$ + } + return outgoing; + } } Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/vie= ws/AddMonitorDialog.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= AddMonitorDialog.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= AddMonitorDialog.java 2010-05-07 02:07:57 UTC (rev 21946) @@ -0,0 +1,18 @@ +package org.jboss.tools.ws.ui.views; + +import org.eclipse.swt.widgets.Shell; +import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor= WorkingCopy; +import org.eclipse.wst.internet.monitor.ui.internal.MonitorDialog; + +(a)SuppressWarnings("restriction") +public class AddMonitorDialog extends MonitorDialog { + + public AddMonitorDialog(Shell parentShell) { + super(parentShell); + } + = + public IMonitorWorkingCopy getMonitor() { + return this.monitor; + } + +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/t= ools/ws/ui/views/AddMonitorDialog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/DelimitedStringList.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= DelimitedStringList.java 2010-05-06 18:19:08 UTC (rev 21945) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= DelimitedStringList.java 2010-05-07 02:07:57 UTC (rev 21946) @@ -51,12 +51,11 @@ private Button mEditButton; private List mPropsList; private Text mAddText; - private Text mHiddenText; private boolean isReadOnly =3D false; = // current delimiter private String mDelimiter =3D DELIMITER; - + = // Warning private String mWarning =3D null; = @@ -212,35 +211,13 @@ = public void widgetSelected(SelectionEvent e) { DelimitedStringList.this.mPropsList.removeAll(); - DelimitedStringList.this.mHiddenText.setText(DelimitedStringList.this= .getSelection().trim()); updatePropertyButtons(); } }); } - { - this.mHiddenText =3D new Text(this, SWT.BORDER); - final GridData gridData =3D new GridData(); - gridData.horizontalSpan =3D 2; - this.mHiddenText.setLayoutData(gridData); - this.mHiddenText.setVisible(false); - } updatePropertyButtons(); } = - /** - * Add a listener to receive notifications when the property list is - * modified. - * = - * @param listener - */ - public void addModifyListener(ModifyListener listener) { - this.mHiddenText.addModifyListener(listener); - } - - public void removeModifyListener(ModifyListener listener) { - this.mHiddenText.removeModifyListener(listener); - } - public void dispose() { super.dispose(); } @@ -258,8 +235,6 @@ if (!isReadOnly){ this.mClearAllButton.setEnabled(true); } - String selected =3D getSelection(); - this.mHiddenText.setText(selected.trim()); this.mAddText.setSelection(0, this.mAddText.getText().length()); this.mAddText.setFocus(); } @@ -293,9 +268,6 @@ if (this.mPropsList.getSelectionCount() =3D=3D 1) { int index =3D this.mPropsList.getSelectionIndex(); this.mPropsList.remove(index); - String selected =3D getSelection(); - this.mHiddenText.setText(selected.trim()); - try { if (this.mPropsList.getItem(index) !=3D null) { this.mPropsList.select(index); @@ -339,8 +311,6 @@ } } = - String selected =3D getSelection(); - this.mHiddenText.setText(selected.trim()); this.mPropsList.setSelection(destination); } } @@ -380,8 +350,6 @@ counter++; } = - String selected =3D getSelection(); - this.mHiddenText.setText(selected.trim()); this.mPropsList.setSelection(destination); = } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/JAXRSWSTestView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-06 18:19:08 UTC (rev 21945) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-07 02:07:57 UTC (rev 21946) @@ -10,16 +10,25 @@ *************************************************************************= *****/ package org.jboss.tools.ws.ui.views; = +import java.net.MalformedURLException; +import java.net.URL; import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; = +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.SashForm; +import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.KeyListener; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; @@ -28,12 +37,18 @@ import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; +import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor; +import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorC= ore; import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; import org.jboss.tools.ws.ui.utils.WSTestUtils; = +(a)SuppressWarnings("restriction") public class JAXRSWSTestView extends ViewPart { = + private static final String TCPIP_VIEW_ID =3D "org.eclipse.wst.internet.m= onitor.view";//$NON-NLS-1$ private static final String DELETE =3D "DELETE";//$NON-NLS-1$ private static final String PUT =3D "PUT";//$NON-NLS-1$ private static final String POST =3D "POST";//$NON-NLS-1$ @@ -67,6 +82,8 @@ private TabItem parmsTab; = private DelimitedStringList parmsList; + private Button openTCPIPMonitorButton; + private Button addTCPIPMonitorButton; = /** * The constructor. @@ -81,13 +98,19 @@ public void createPartControl(Composite parent) { = Composite innerComposite =3D new Composite (parent, SWT.NONE); - innerComposite.setLayout(new GridLayout(2, false)); + innerComposite.setLayout(new FillLayout()); = - Label typeLabel =3D new Label(innerComposite, SWT.NONE); + SashForm sashForm =3D new SashForm(innerComposite, SWT.BORDER); + sashForm.setOrientation(SWT.HORIZONTAL); + = + Composite topHalf =3D new Composite (sashForm, SWT.NONE); + topHalf.setLayout(new GridLayout(2, false)); + = + Label typeLabel =3D new Label(topHalf, SWT.NONE); typeLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Web_Service_Type_Lab= el); typeLabel.setLayoutData(new GridData()); = - wsTypeCombo =3D new Combo(innerComposite, SWT.DROP_DOWN | SWT.READ_ONLY); + wsTypeCombo =3D new Combo(topHalf, SWT.DROP_DOWN | SWT.READ_ONLY); wsTypeCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); wsTypeCombo.add(JAX_WS); wsTypeCombo.add(JAX_RS); @@ -97,39 +120,65 @@ } public void widgetSelected(SelectionEvent e) { setControlsForWSType(wsTypeCombo.getText()); + setControlsForMethodType(methodCombo.getText()); + setControlsForSelectedURL(); } }); = - Label methodLabel =3D new Label(innerComposite, SWT.NONE); + Label methodLabel =3D new Label(topHalf, SWT.NONE); methodLabel.setText(JBossWSUIMessages.JAXRSWSTestView_HTTP_Method_Label); methodLabel.setLayoutData(new GridData()); = - methodCombo =3D new Combo(innerComposite, SWT.DROP_DOWN | SWT.READ_ONLY); + methodCombo =3D new Combo(topHalf, SWT.DROP_DOWN | SWT.READ_ONLY); methodCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); methodCombo.add(GET); methodCombo.add(POST); methodCombo.add(PUT); methodCombo.add(DELETE); methodCombo.setText(GET); + methodCombo.addSelectionListener(new SelectionListener() { + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + public void widgetSelected(SelectionEvent e) { + setControlsForMethodType(methodCombo.getText()); + } + }); = - Label urlLabel =3D new Label(innerComposite, SWT.NONE); + Label urlLabel =3D new Label(topHalf, SWT.NONE); urlLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Service_URL_Label); urlLabel.setLayoutData(new GridData()); = -// urlText =3D new Text(innerComposite, SWT.BORDER); -// urlText.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); - = - urlCombo =3D new Combo(innerComposite, SWT.BORDER | SWT.DROP_DOWN); + urlCombo =3D new Combo(topHalf, SWT.BORDER | SWT.DROP_DOWN); urlCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); + urlCombo.addSelectionListener(new SelectionListener() { + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + public void widgetSelected(SelectionEvent e) { + setControlsForSelectedURL(); + } + }); + urlCombo.addKeyListener(new KeyListener() { + public void keyPressed(KeyEvent e) { + } = - Label actionLabel =3D new Label(innerComposite, SWT.NONE); + public void keyReleased(KeyEvent e) { + setControlsForSelectedURL(); + if (e.keyCode =3D=3D SWT.CR) { + handleTest(); + } + } + }); + = + Label actionLabel =3D new Label(topHalf, SWT.NONE); actionLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Action_URL_Label); actionLabel.setLayoutData(new GridData()); = - actionText =3D new Text(innerComposite, SWT.BORDER); + actionText =3D new Text(topHalf, SWT.BORDER); actionText.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); = - tabGroup =3D new TabFolder(innerComposite, SWT.BORDER); + tabGroup =3D new TabFolder(topHalf, SWT.BORDER); = bodyTab =3D new TabItem(tabGroup, SWT.NONE, 0); bodyTab.setText(JBossWSUIMessages.JAXRSWSTestView_Request_Body_Label); @@ -150,7 +199,7 @@ bodyTab.setControl(bodyText); = headerTab.setText(JBossWSUIMessages.JAXRSWSTestView_Request_Header_Label= ); - GridData hgGridData =3D new GridData(SWT.FILL, SWT.NONE, true, false); + GridData hgGridData =3D new GridData(SWT.FILL, SWT.FILL, true, true); hgGridData.horizontalSpan =3D 2; tabGroup.setLayoutData(hgGridData); = @@ -160,23 +209,14 @@ dlsListGD.horizontalSpan =3D 2; dlsList.setLayoutData(dlsListGD); = -// Button sampleButton =3D new Button(innerComposite, SWT.PUSH); -// sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data= _Label); -// sampleButton.setLayoutData(new GridData()); -// = -// sampleButton.addSelectionListener(new SelectionListener() { -// public void widgetSelected(SelectionEvent e) { -// setupSample(); -// } -// public void widgetDefaultSelected(SelectionEvent e) { -// widgetSelected(e); -// } -// }); + Composite buttonBar =3D new Composite ( topHalf, SWT.NONE); + GridData buttonBarGD =3D new GridData(SWT.FILL, SWT.NONE, true, false); + buttonBarGD.horizontalSpan =3D 2; + buttonBar.setLayoutData(buttonBarGD); + buttonBar.setLayout(new RowLayout()); = - GridData buttonGD =3D new GridData(SWT.BEGINNING, SWT.NONE, false, false= ); - testButton =3D new Button (innerComposite, SWT.PUSH); + testButton =3D new Button (buttonBar, SWT.PUSH); testButton.setText(JBossWSUIMessages.JAXRSWSTestView_Invoke_Label); - testButton.setLayoutData(buttonGD); = testButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { @@ -187,7 +227,47 @@ } }); = - resultTabGroup =3D new TabFolder(innerComposite, SWT.BORDER); + addTCPIPMonitorButton =3D new Button(buttonBar, SWT.PUSH); + addTCPIPMonitorButton.setText(JBossWSUIMessages.JAXRSWSTestView_Configur= e_Monitor_Button); + = + addTCPIPMonitorButton.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + configureMonitor(); + } + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); + + openTCPIPMonitorButton =3D new Button(buttonBar, SWT.PUSH); + openTCPIPMonitorButton.setText(JBossWSUIMessages.JAXRSWSTestView_Open_Mo= nitor_Button); + = + openTCPIPMonitorButton.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + openMonitor(); + } + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); + + Button sampleButton =3D new Button(buttonBar, SWT.PUSH); + sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_L= abel); + sampleButton.setVisible(false); + = + sampleButton.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + setupSample(); + } + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); + + Composite bottomHalf =3D new Composite (sashForm, SWT.NONE); + bottomHalf.setLayout(new GridLayout(2, false)); + + resultTabGroup =3D new TabFolder(bottomHalf, SWT.BORDER); GridData rtGridData =3D new GridData(SWT.FILL, SWT.FILL, true, true); rtGridData.horizontalSpan =3D 2; resultTabGroup.setLayoutData(rtGridData); @@ -208,8 +288,120 @@ = wsTypeCombo.setText(JAX_WS); setControlsForWSType(wsTypeCombo.getText()); + setControlsForMethodType(methodCombo.getText()); + setControlsForSelectedURL(); } = + private void setControlsForSelectedURL() { + if (urlCombo.getText().trim().length() > 0) { + testButton.setEnabled(true); + addTCPIPMonitorButton.setEnabled(true); + } else { + testButton.setEnabled(false); + addTCPIPMonitorButton.setEnabled(false); + } + } + = + /* + * Open the TCP/IP Monitor View = + */ + private void openMonitor() { + try { + PlatformUI.getWorkbench().getActiveWorkbenchWindow(). + getActivePage().showView(TCPIP_VIEW_ID); + } catch (PartInitException e) { + e.printStackTrace(); + } + } + = + private IMonitor findMonitor(String urlToCheck) { + IMonitor monitor =3D null; + + IMonitor[] monitors =3D MonitorCore.getMonitors(); + if (monitors !=3D null && monitors.length > 0) { + for (int i=3D 0; i < monitors.length; i++) { + if (urlToCheck.contains(monitors[i].getRemoteHost())) { + monitor =3D monitors[i]; + break; + } + } + } + return monitor; + } + = + /* + * Configure a TCP/IP Monitor entry so we can monitor it = + */ + private void configureMonitor() { + if (urlCombo.getText().trim().length() > 0) { + String oldUrl =3D urlCombo.getText(); + IMonitor monitor =3D findMonitor(oldUrl); + if (monitor =3D=3D null) { + = + URL tempURL =3D null; + try { + tempURL =3D new URL(oldUrl); + } catch (MalformedURLException e) { + // ignore + } + AddMonitorDialog dialog =3D new AddMonitorDialog(getSite().getShell()); + if (tempURL !=3D null) { + dialog.getMonitor().setRemoteHost(tempURL.getHost()); + if (tempURL.getPort() > 0) = + dialog.getMonitor().setRemotePort(tempURL.getPort()); + } + if (dialog.open() =3D=3D Window.CANCEL) + return; + monitor =3D dialog.getMonitor(); + } + = + if (monitor !=3D null) { + monitor =3D findMonitor(oldUrl); + if (monitor !=3D null) { + if (!monitor.isRunning()) { + try { + monitor.start(); + } catch (CoreException e) { + // if we hit an error, put it in the results text + resultsText.setText(e.toString()); + e.printStackTrace(); + } + } + = + int port =3D monitor.getLocalPort(); + int remotePort =3D monitor.getRemotePort(); + String host =3D monitor.getRemoteHost(); + String newUrl =3D null; + if (oldUrl.contains(host + ":" + remotePort)) { //$NON-NLS-1$ + newUrl =3D oldUrl.replace(host + ":" + remotePort, "localhost:" + po= rt); //$NON-NLS-1$ //$NON-NLS-2$ + } else { + newUrl =3D oldUrl.replace(host, "localhost:" + port); //$NON-NLS-1$ + } + urlCombo.setText(newUrl); + } + } + } = + } + + /* + * Enable/disable controls based on the WS technology type + * and the method. + * = + * @param methodType + */ + private void setControlsForMethodType ( String methodType ) { + if (wsTypeCombo.getText().equalsIgnoreCase(JAX_RS) && + methodType.equalsIgnoreCase(GET)) { + bodyText.setEnabled(false); + } else { + bodyText.setEnabled(true); + } + } + = + /* + * Enable/disable controls based on the WS technology type + * @param wsType + */ private void setControlsForWSType ( String wsType ) { if (wsType.equalsIgnoreCase(JAX_WS)) { actionText.setEnabled(true); @@ -219,6 +411,19 @@ dlsList.setEnabled(false); parmsTab.getControl().setEnabled(false); headerTab.getControl().setEnabled(false); + methodCombo.setText(POST); + + String emptySOAP =3D "" = + //$NON-NLS-1$ + "" + //$NON-NLS-1$ + "" + //$NON-NLS-1$ + "" + //$NON-NLS-1$ + ""; //$NON-NLS-1$ + emptySOAP =3D WSTestUtils.addNLsToXML(emptySOAP); + = + if (bodyText.getText().trim().length() =3D=3D 0) { + bodyText.setText(emptySOAP); + } } else if (wsType.equalsIgnoreCase(JAX_RS)) { actionText.setEnabled(false); @@ -228,12 +433,14 @@ dlsList.setEnabled(true); parmsTab.getControl().setEnabled(true); headerTab.getControl().setEnabled(true); + methodCombo.setText(GET); } } = /* * Sets up the controls to call a public sample RESTful WS that does - * a postal code lookup. = + * a postal code lookup or a JAX-WS service that does a = + * Shakespeare lookup. = */ private void setupSample() { // go to http://www.geonames.org/export/web-services.html for example @@ -256,6 +463,7 @@ ""+ //$NON-NLS-1$ "" + //$NON-NLS-1$ ""; //$NON-NLS-1$ + soapIn =3D WSTestUtils.addNLsToXML(soapIn); = urlCombo.setText("http://www.xmlme.com/WSShakespeare.asmx"); //$NON-NLS= -1$ actionText.setText("http://xmlme.com/WebServices/GetSpeech"); //$NON-NL= S-1$ @@ -264,8 +472,14 @@ dlsList.setSelection(EMPTY_STRING); tabGroup.setSelection(bodyTab); } + setControlsForWSType(wsTypeCombo.getText()); + setControlsForMethodType(methodCombo.getText()); + setControlsForSelectedURL(); } = + /* + * Actually perform the test based on which type of activity it is = + */ private void handleTest() { if (urlCombo.getItemCount() > 0) { java.util.List aList =3D Arrays.asList(urlCombo.getItems()); @@ -290,7 +504,8 @@ private void handleWSTest() { try { String result =3D WSTestUtils.invokeWS(urlCombo.getText(), actionText.g= etText(), bodyText.getText()); - resultsText.setText(result); + String cleanedUp =3D WSTestUtils.addNLsToXML(result); + resultsText.setText(cleanedUp); = resultHeadersList.removeAll(); if (WSTestUtils.getResultHeaders() !=3D null) { @@ -322,8 +537,10 @@ // Is this a GET or POST activity? String method =3D methodCombo.getText(); = - // What's the Request body text? - String body =3D bodyText.getText(); + // If it's a GET, what's the Request body text? + String body =3D EMPTY_STRING; + if (method.equalsIgnoreCase(GET)) + body =3D bodyText.getText(); = // if no actual text in the request body, set to null if (body.trim().length() =3D=3D 0) body =3D null; @@ -368,7 +585,8 @@ WSTestUtils.callRestfulWebService(address, parameters, headers, method= , body); = // put the results in the result text field - resultsText.setText(result); + String cleanedUp =3D WSTestUtils.addNLsToXML(result); + resultsText.setText(cleanedUp); = resultHeadersList.removeAll(); Iterator iter =3D WSTestUtils.getResultHeaders().entrySet().iterator= (); @@ -381,7 +599,7 @@ text =3D text + entry.toString(); resultHeadersList.add(text); } - = + } catch (Exception e) { = // if we hit an error, put it in the results text --===============6232876793724771434==-- From jbosstools-commits at lists.jboss.org Fri May 7 06:05:42 2010 Content-Type: multipart/mixed; boundary="===============8327034592787796380==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21947 - trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters. Date: Fri, 07 May 2010 06:05:42 -0400 Message-ID: <201005071005.o47A5g3E009711@svn01.web.mwc.hst.phx2.redhat.com> --===============8327034592787796380== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-07 06:05:41 -0400 (Fri, 07 May 2010) New Revision: 21947 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/= model/converters/ListConverter.java Log: https://jira.jboss.org/jira/browse/JBIDE-6260 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/es= b/core/model/converters/ListConverter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core= /model/converters/ListConverter.java 2010-05-07 02:07:57 UTC (rev 21946) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core= /model/converters/ListConverter.java 2010-05-07 10:05:41 UTC (rev 21947) @@ -14,6 +14,7 @@ import java.util.Map; = import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.meta.XChild; import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.impl.AnyElementObjectImpl; @@ -120,7 +121,17 @@ } = protected String getToChildEntity(XModelObject any, XModelEntity parent) { - return parent.getChildren()[0].getName(); + XChild[] cs =3D parent.getChildren(); + if(cs.length > 1) { + String tag =3D any.getAttributeValue("tag"); + if(tag !=3D null) for (XChild c: cs) { + XModelEntity e =3D c.getMetaModel().getEntity(c.getName()); + if(e !=3D null && tag.equals(e.getXMLSubPath())) { + return e.getName(); + } + } + } + return cs[0].getName(); } = protected boolean isRelevantTag(String tag, XModelObject object) { --===============8327034592787796380==-- From jbosstools-commits at lists.jboss.org Fri May 7 06:08:53 2010 Content-Type: multipart/mixed; boundary="===============8118386870880328460==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21948 - branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters. Date: Fri, 07 May 2010 06:08:53 -0400 Message-ID: <201005071008.o47A8rXg009763@svn01.web.mwc.hst.phx2.redhat.com> --===============8118386870880328460== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-07 06:08:52 -0400 (Fri, 07 May 2010) New Revision: 21948 Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/src/org/j= boss/tools/esb/core/model/converters/ListConverter.java Log: https://jira.jboss.org/jira/browse/JBIDE-6260 Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/sr= c/org/jboss/tools/esb/core/model/converters/ListConverter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/src/org/= jboss/tools/esb/core/model/converters/ListConverter.java 2010-05-07 10:05:4= 1 UTC (rev 21947) +++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/src/org/= jboss/tools/esb/core/model/converters/ListConverter.java 2010-05-07 10:08:5= 2 UTC (rev 21948) @@ -14,6 +14,7 @@ import java.util.Map; = import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.meta.XChild; import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.impl.AnyElementObjectImpl; @@ -120,7 +121,17 @@ } = protected String getToChildEntity(XModelObject any, XModelEntity parent) { - return parent.getChildren()[0].getName(); + XChild[] cs =3D parent.getChildren(); + if(cs.length > 1) { + String tag =3D any.getAttributeValue("tag"); + if(tag !=3D null) for (XChild c: cs) { + XModelEntity e =3D c.getMetaModel().getEntity(c.getName()); + if(e !=3D null && tag.equals(e.getXMLSubPath())) { + return e.getName(); + } + } + } + return cs[0].getName(); } = protected boolean isRelevantTag(String tag, XModelObject object) { --===============8118386870880328460==-- From jbosstools-commits at lists.jboss.org Fri May 7 06:20:47 2010 Content-Type: multipart/mixed; boundary="===============0954908313545315449==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21949 - in trunk/esb/tests/org.jboss.tools.esb.core.test: projects/Test/esb-1.2 and 1 other directories. Date: Fri, 07 May 2010 06:20:47 -0400 Message-ID: <201005071020.o47AKlZS011275@svn01.web.mwc.hst.phx2.redhat.com> --===============0954908313545315449== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-07 06:20:47 -0400 (Fri, 07 May 2010) New Revision: 21949 Added: trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/ trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jbos= s-esb-notifiers.xml Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/co= re/test/ESBModelTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6260 Added: trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/= jboss-esb-notifiers.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jbo= ss-esb-notifiers.xml (rev 0) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jbo= ss-esb-notifiers.xml 2010-05-07 10:20:47 UTC (rev 21949) @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + Property changes on: trunk/esb/tests/org.jboss.tools.esb.core.test/projects= /Test/esb-1.2/jboss-esb-notifiers.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools= /esb/core/test/ESBModelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/c= ore/test/ESBModelTest.java 2010-05-07 10:08:52 UTC (rev 21948) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/c= ore/test/ESBModelTest.java 2010-05-07 10:20:47 UTC (rev 21949) @@ -250,13 +250,39 @@ assertTrue(errorList.toString(), errorList.length() =3D=3D 0); } = + public void testNotifiers() { + XModelObject object =3D getFileObject("esb-1.2", "jboss-esb-notifiers.xm= l", ESBConstants.ENT_ESB_FILE_120); + = + StringBuffer errorList =3D new StringBuffer(); + = + String sendResponseNotifierPath =3D "Services/s/Actions/SendResponseNoti= fier"; + = + String[][] sendResponseNotifierAttrValues =3D { + {"name", "SendResponseNotifier"}, + {"ok method", "notifyOK"}, + {"exception method", "notifyError"}, + }; + checkAttributes(object, sendResponseNotifierPath, sendResponseNotifierAt= trValues, errorList); = + String errQueuePath =3D sendResponseNotifierPath + "/err/NotifyQueues/qu= eue#MincomJMS_reply"; + String[][] errQueueAttrValues =3D { + {"jndi name", "queue/MincomJMS_reply"}, + }; + checkAttributes(object, errQueuePath, errQueueAttrValues, errorList); + + assertTrue(errorList.toString(), errorList.length() =3D=3D 0); + } + XModelObject getFileObject(String parentPath, String xmlname) { + return getFileObject(parentPath, xmlname, ESBConstants.ENT_ESB_FILE_101); + } + + XModelObject getFileObject(String parentPath, String xmlname, String enti= ty) { IFile f =3D project.getFile(new Path(parentPath + "/" + xmlname)); assertTrue("Cannot find " + xmlname, f !=3D null); XModelObject object =3D EclipseResourceUtil.createObjectForResource(f); assertTrue("Cannot create model for " + xmlname, object !=3D null); - assertTrue("Wrong entity for " + xmlname, ESBConstants.ENT_ESB_FILE_101.= equals(object.getModelEntity().getName())); + assertTrue("Wrong entity for " + xmlname, entity.equals(object.getModelE= ntity().getName())); return object; } = --===============0954908313545315449==-- From jbosstools-commits at lists.jboss.org Fri May 7 07:09:42 2010 Content-Type: multipart/mixed; boundary="===============8600733367444481726==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21950 - branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test. Date: Fri, 07 May 2010 07:09:42 -0400 Message-ID: <201005071109.o47B9gle022628@svn01.web.mwc.hst.phx2.redhat.com> --===============8600733367444481726== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-07 07:09:41 -0400 (Fri, 07 May 2010) New Revision: 21950 Modified: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/or= g/jboss/tools/esb/core/test/ESBModelTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6260 Modified: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test= /src/org/jboss/tools/esb/core/test/ESBModelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/o= rg/jboss/tools/esb/core/test/ESBModelTest.java 2010-05-07 10:20:47 UTC (rev= 21949) +++ branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/o= rg/jboss/tools/esb/core/test/ESBModelTest.java 2010-05-07 11:09:41 UTC (rev= 21950) @@ -250,13 +250,39 @@ assertTrue(errorList.toString(), errorList.length() =3D=3D 0); } = + public void testNotifiers() { + XModelObject object =3D getFileObject("esb-1.2", "jboss-esb-notifiers.xm= l", ESBConstants.ENT_ESB_FILE_120); + = + StringBuffer errorList =3D new StringBuffer(); + = + String sendResponseNotifierPath =3D "Services/s/Actions/SendResponseNoti= fier"; + = + String[][] sendResponseNotifierAttrValues =3D { + {"name", "SendResponseNotifier"}, + {"ok method", "notifyOK"}, + {"exception method", "notifyError"}, + }; + checkAttributes(object, sendResponseNotifierPath, sendResponseNotifierAt= trValues, errorList); = + String errQueuePath =3D sendResponseNotifierPath + "/err/NotifyQueues/qu= eue#MincomJMS_reply"; + String[][] errQueueAttrValues =3D { + {"jndi name", "queue/MincomJMS_reply"}, + }; + checkAttributes(object, errQueuePath, errQueueAttrValues, errorList); + + assertTrue(errorList.toString(), errorList.length() =3D=3D 0); + } + XModelObject getFileObject(String parentPath, String xmlname) { + return getFileObject(parentPath, xmlname, ESBConstants.ENT_ESB_FILE_101); + } + + XModelObject getFileObject(String parentPath, String xmlname, String enti= ty) { IFile f =3D project.getFile(new Path(parentPath + "/" + xmlname)); assertTrue("Cannot find " + xmlname, f !=3D null); XModelObject object =3D EclipseResourceUtil.createObjectForResource(f); assertTrue("Cannot create model for " + xmlname, object !=3D null); - assertTrue("Wrong entity for " + xmlname, ESBConstants.ENT_ESB_FILE_101.= equals(object.getModelEntity().getName())); + assertTrue("Wrong entity for " + xmlname, entity.equals(object.getModelE= ntity().getName())); return object; } = --===============8600733367444481726==-- From jbosstools-commits at lists.jboss.org Fri May 7 07:11:57 2010 Content-Type: multipart/mixed; boundary="===============1264401119925543908==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21951 - in branches/jbosstools-3.1.x/jsf: tests/org.jboss.tools.jsf.text.ext.test/projects/numberguess/web and 1 other directories. Date: Fri, 07 May 2010 07:11:57 -0400 Message-ID: <201005071111.o47BBvD1023094@svn01.web.mwc.hst.phx2.redhat.com> --===============1264401119925543908== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-07 07:11:55 -0400 (Fri, 07 May 2010) New Revision: 21951 Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/o= rg/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/o= rg/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/pr= ojects/numberguess/web/giveup.jspx branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/sr= c/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/sr= c/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-6179 Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ex= t/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/= org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java 2010-05-07 = 11:09:41 UTC (rev 21950) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/= org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java 2010-05-07 = 11:11:55 UTC (rev 21951) @@ -40,7 +40,10 @@ ELInvocationExpression invocationExpression =3D JSPExprHyperlinkPartitio= ner.getInvocationExpression(eStructure.reference, eStructure.expression, of= fset); if(invocationExpression !=3D null){ for(ELResolver resolver : context.getElResolvers()){ - ELResolution resolution =3D resolver.resolve(context, invocationExpres= sion, invocationExpression.getStartPosition()); + ELResolution resolution =3D resolver.resolve(context, invocationExpres= sion, offset); + if(resolution=3D=3Dnull) { + return null; + } ELSegment segment =3D resolution.findSegmentByOffset(offset-eStructure= .reference.getStartPosition()); if(segment !=3D null){ if(segment instanceof JavaMemberELSegment){ Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ex= t/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/= org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 201= 0-05-07 11:09:41 UTC (rev 21950) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/= org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 201= 0-05-07 11:11:55 UTC (rev 21951) @@ -11,6 +11,7 @@ package org.jboss.tools.jsf.text.ext.hyperlink; = import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.jboss.tools.common.el.core.ELReference; import org.jboss.tools.common.el.core.model.ELExpression; @@ -26,6 +27,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecogn= izer; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitio= ner; import org.jboss.tools.jst.web.kb.PageContextFactory; = @@ -36,10 +38,18 @@ public class JSPExprHyperlinkPartitioner extends AbstractHyperlinkPartitio= ner implements IHyperlinkPartitionRecognizer, IExclusiblePartitionerRecogni= tion { public static final String JSP_EXPRESSION_PARTITION =3D "org.jboss.tools.= common.text.ext.jsp.JSP_EXPRESSION"; //$NON-NLS-1$ public static final String EXPRESSION_PARTITION =3D "org.jboss.tools.comm= on.text.ext.jsp.EXPRESSION"; //$NON-NLS-1$ + public static final String DOT_EXPRESSION_PARTITION =3D "org.jboss.tools.= common.text.ext.jsp.DOT_EXPRESSION"; //$NON-NLS-1$ = + private static final String DOT =3D "."; + = private boolean jspExpression =3D false; + = + private boolean dotExpression =3D false; = protected String getPartitionType() { + if(dotExpression) + return DOT_EXPRESSION_PARTITION; + = if(jspExpression) return EXPRESSION_PARTITION; else @@ -72,18 +82,21 @@ = private IHyperlinkRegion getRegion(IDocument document, final int offset) { jspExpression =3D false; + dotExpression =3D false; ELContext context =3D getELContext(document); if(context !=3D null){ ExpressionStructure eStructure =3D getExpression(context, offset); if(eStructure !=3D null){ ELInvocationExpression invocationExpression =3D getInvocationExpressio= n(eStructure.reference, eStructure.expression, offset); if(invocationExpression !=3D null){ - jspExpression =3D decide(context, eStructure.expression, invocationEx= pression, offset-eStructure.reference.getStartPosition()); + jspExpression =3D decide(context, eStructure.expression, invocationEx= pression, offset-eStructure.reference.getStartPosition(), offset); if(jspExpression){ IHyperlinkRegion region =3D new HyperlinkRegion(invocationExpression= .getStartPosition(), invocationExpression.getLength(), null, null, null); return region; } } + dotExpression =3D checkDot(document, offset, context, eStructure.expre= ssion, invocationExpression, offset-eStructure.reference.getStartPosition()= ); + = IHyperlinkRegion region =3D new HyperlinkRegion(eStructure.expression.= getStartPosition(), eStructure.expression.getLength(), null, null, null); return region; } @@ -127,11 +140,14 @@ return null; } = - public boolean decide(ELContext context, ELExpression expression, ELInvoc= ationExpression invocationExpression, int offset){ + public boolean decide(ELContext context, ELExpression expression, ELInvoc= ationExpression invocationExpression, int offset, int globalOffset){ for(ELResolver resolver : context.getElResolvers()){ - ELResolution resolution =3D resolver.resolve(context, invocationExpress= ion, invocationExpression.getStartPosition()); + ELResolution resolution =3D resolver.resolve(context, invocationExpress= ion, globalOffset); + if(resolution=3D=3Dnull) { + return false; + } ELSegment segment =3D resolution.findSegmentByOffset(offset); - if(segment !=3D null){ + if(segment !=3D null && segment.isResolved()){ if(segment instanceof JavaMemberELSegment){ JavaMemberELSegment javaSegment =3D (JavaMemberELSegment)segment; if(javaSegment.getJavaElement() !=3D null){ @@ -143,6 +159,21 @@ return false; } = + public boolean checkDot(IDocument document, int superOffset, ELContext co= ntext, ELExpression expression, ELInvocationExpression invocationExpression= , int offset){ + try{ + String text =3D document.get(superOffset, 1); + if(DOT.equals(text)){ + if(decide(context, expression, invocationExpression, offset+1, superOf= fset+1)) + return true; + else if(decide(context, expression, invocationExpression, offset-1, su= perOffset-1)) + return true; + } + }catch(BadLocationException ex){ + JSFExtensionsPlugin.log(ex); + } + return false; + } + /** * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecogn= izer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensi= ons.hyperlink.IHyperlinkRegion) */ Modified: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.= test/projects/numberguess/web/giveup.jspx =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/p= rojects/numberguess/web/giveup.jspx 2010-05-07 11:09:41 UTC (rev 21950) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/p= rojects/numberguess/web/giveup.jspx 2010-05-07 11:11:55 UTC (rev 21951) @@ -2,6 +2,7 @@ + + + = Modified: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.= test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/s= rc/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java 2010-05-07 = 11:09:41 UTC (rev 21950) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/s= rc/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java 2010-05-07 = 11:11:55 UTC (rev 21951) @@ -32,11 +32,11 @@ import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocum= ent; import org.eclipse.wst.sse.ui.internal.editor.EditorModelUtil; -import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.AxisUtil; import org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner; import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; = public class ELExprPartitionerTest extends TestCase { TestProjectProvider provider =3D null; @@ -118,38 +118,30 @@ HashMap> recognitionTest =3D new HashMap>(); = ArrayList regionList =3D new ArrayList(); - regionList.add(new Region(623, 16)); - regionList.add(new Region(706, 16)); - regionList.add(new Region(813, 18)); - regionList.add(new Region(914, 19)); - regionList.add(new Region(972, 18)); - regionList.add(new Region(1041, 17)); + regionList.add(new Region(673, 7)); + regionList.add(new Region(680, 9)); + regionList.add(new Region(756, 7)); + regionList.add(new Region(763, 9)); + regionList.add(new Region(863, 7)); + regionList.add(new Region(870, 11)); + regionList.add(new Region(964, 19)); + regionList.add(new Region(1022, 18)); + regionList.add(new Region(1091, 17)); recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE", re= gionList); = regionList =3D new ArrayList(); - regionList.add(new Region(859, 11)); - regionList.add(new Region(871, 16)); - recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_BEAN", regi= onList); + regionList.add(new Region(920, 1)); + regionList.add(new Region(1168, 1)); + regionList.add(new Region(1251, 1)); + recognitionTest.put("org.jboss.tools.common.text.ext.jsp.DOT_EXPRESSION"= , regionList); = regionList =3D new ArrayList(); - regionList.add(new Region(859, 11)); - regionList.add(new Region(871, 16)); - recognitionTest.put("org.jboss.tools.seam.text.ext.SEAM_BEAN", regionLis= t); - = - regionList =3D new ArrayList(); - regionList.add(new Region(859, 11)); - regionList.add(new Region(870, 16)); - regionList.add(new Region(886, 1)); - = - recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION"= , regionList); - = -// regionList =3D new ArrayList(); -// regionList.add(new Region(870, 16)); -// recognitionTest.put("org.eclipse.jst.jsp.SCRIPT.JSP_EL2", regionList); - = - regionList =3D new ArrayList(); - regionList.add(new Region(859, 11)); - regionList.add(new Region(871, 16)); + regionList.add(new Region(909, 11)); + regionList.add(new Region(921, 16)); + regionList.add(new Region(1157, 11)); + regionList.add(new Region(1169, 13)); + regionList.add(new Region(1237, 14)); + regionList.add(new Region(1252, 8)); recognitionTest.put("org.jboss.tools.common.text.ext.jsp.EXPRESSION", re= gionList); = int counter =3D 0; @@ -216,7 +208,7 @@ } } = - assertEquals("Wrong recognized region count: ", 132, counter); + assertEquals("Wrong recognized region count: ", 180, counter); = model.releaseFromEdit(); = Modified: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.= test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/s= rc/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2010-05-07 11:= 09:41 UTC (rev 21950) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/s= rc/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2010-05-07 11:= 11:55 UTC (rev 21951) @@ -17,7 +17,7 @@ = public static Test suite() { TestSuite suite =3D new TestSuite(JsfTextExtAllTests.class.getName()); - //suite.addTest(ELExprPartitionerTest.suite()); + suite.addTest(ELExprPartitionerTest.suite()); return suite; } } \ No newline at end of file --===============1264401119925543908==-- From jbosstools-commits at lists.jboss.org Fri May 7 07:24:42 2010 Content-Type: multipart/mixed; boundary="===============6520455771794208527==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21952 - trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console. Date: Fri, 07 May 2010 07:24:42 -0400 Message-ID: <201005071124.o47BOga6024203@svn01.web.mwc.hst.phx2.redhat.com> --===============6520455771794208527== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-07 07:24:41 -0400 (Fri, 07 May 2010) New Revision: 21952 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/con= sole/ConsoleConfiguration.java Log: https://jira.jboss.org/jira/browse/JBIDE-5997 - fix in trunk Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibern= ate/console/ConsoleConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/co= nsole/ConsoleConfiguration.java 2010-05-07 11:11:55 UTC (rev 21951) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/co= nsole/ConsoleConfiguration.java 2010-05-07 11:24:41 UTC (rev 21952) @@ -156,8 +156,6 @@ Map overrides =3D new HashMap(); if(properties!=3Dnull) { overrides.putAll( properties ); - } else { - overrides.put("hibernate.search.autoregister_listeners", "false"); //$= NON-NLS-1$ //$NON-NLS-2$ } if(StringHelper.isNotEmpty( prefs.getNamingStrategy())) { overrides.put( "hibernate.ejb.naming_strategy", prefs.getNamingStrateg= y() ); //$NON-NLS-1$ @@ -187,6 +185,13 @@ throw new HibernateConsoleRuntimeException(out); } = + method =3D clazz.getMethod("getProperties", new Class[] {}); //$NON-NLS= -1$ + Properties props =3D (Properties)method.invoke(ejb3cfg, new Object[] {}= ); + if (props.getProperty("hibernate.search.autoregister_listeners") =3D=3D= null) { //$NON-NLS-1$ + method =3D clazz.getMethod("setProperty", new Class[] { String.class, = String.class }); //$NON-NLS-1$ + method.invoke(ejb3cfg, new Object[] { "hibernate.search.autoregister_l= isteners", "false" } ); //$NON-NLS-1$ //$NON-NLS-2$ + } + method =3D clazz.getMethod("getHibernateConfiguration", new Class[0]);/= /$NON-NLS-1$ Configuration invoke =3D (Configuration) method.invoke(ejb3cfg, (Object= [])null); invoke =3D configureConnectionProfile(invoke); @@ -749,7 +754,9 @@ if(properties!=3Dnull) { localCfg =3D localCfg.setProperties(properties); } else { - localCfg.setProperty("hibernate.search.autoregister_listeners", "false"= ); //$NON-NLS-1$ //$NON-NLS-2$ + if (localCfg.getProperty("hibernate.search.autoregister_listeners") =3D= =3D null) { //$NON-NLS-1$ + localCfg.setProperty("hibernate.search.autoregister_listeners", "false= "); //$NON-NLS-1$ //$NON-NLS-2$ + } } EntityResolver entityResolver =3D XMLHelper.DEFAULT_DTD_RESOLVER; if(StringHelper.isNotEmpty(prefs.getEntityResolverName())) { --===============6520455771794208527==-- From jbosstools-commits at lists.jboss.org Fri May 7 08:30:15 2010 Content-Type: multipart/mixed; boundary="===============5522005236120073419==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21953 - in branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test: esb-1.2 and 1 other directory. Date: Fri, 07 May 2010 08:30:15 -0400 Message-ID: <201005071230.o47CUFKC005097@svn01.web.mwc.hst.phx2.redhat.com> --===============5522005236120073419== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-07 08:30:15 -0400 (Fri, 07 May 2010) New Revision: 21953 Added: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/projec= ts/Test/esb-1.2/ branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/projec= ts/Test/esb-1.2/jboss-esb-notifiers.xml Log: https://jira.jboss.org/jira/browse/JBIDE-6260 Added: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/pr= ojects/Test/esb-1.2/jboss-esb-notifiers.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/proje= cts/Test/esb-1.2/jboss-esb-notifiers.xml (rev 0) +++ branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/proje= cts/Test/esb-1.2/jboss-esb-notifiers.xml 2010-05-07 12:30:15 UTC (rev 21953) @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + Property changes on: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.es= b.core.test/projects/Test/esb-1.2/jboss-esb-notifiers.xml ___________________________________________________________________ Name: svn:mime-type + text/plain --===============5522005236120073419==-- From jbosstools-commits at lists.jboss.org Fri May 7 09:51:22 2010 Content-Type: multipart/mixed; boundary="===============5387302026967985556==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21954 - in branches/hibernatetools-multiversion/hibernatetools: plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils and 20 other directories. Date: Fri, 07 May 2010 09:51:22 -0400 Message-ID: <201005071351.o47DpMkV019593@svn01.web.mwc.hst.phx2.redhat.com> --===============5387302026967985556== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-07 09:51:18 -0400 (Fri, 07 May 2010) New Revision: 21954 Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/Collection.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/List.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/Map.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/Set.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/Table.java Removed: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/CollectionStub.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/ListStub.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/MapStub.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/SetStub.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/TableStub.java Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.= java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterView= .java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/workbench/Configuration= AdapterFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNameValue= Visitor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseS= chemaWorkbenchAdapter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkb= enchAdapter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContaine= r.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContaine= rWorkbenchAdapter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenc= hAdapter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNameValue= Visitor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphView.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyViewAdapter= .java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAdapter.ja= va branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActo= r.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePrope= rtiesBlock.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNameHandl= er.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNameHandle= r.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse/src/org/hibernate/console/node/NodeFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse/src/org/hibernate/console/node/TableNode.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/ConsoleQueryParameter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/cfg/JDBCMetaDataConfiguration.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/cfg/reveng/DefaultDatabaseCollector= .java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/cfg/reveng/TableIdentifier.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/Array.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/Bag.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/ForeignKey.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/IdentifierCollection.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/IndexedCollection.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/JoinedSubclass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/ManyToOne.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/OneToOne.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/PersistentClass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/PrimaryKey.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/RootClass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/SimpleValue.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/Subclass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/Value.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/ValueFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/ValueVisitor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/= details/HibernateTableComposite.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/O= penSourceAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/S= hapeHideAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/S= hapeShowAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/T= oggleShapeVisibleStateAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/T= oggleShapeVisibleStateCommand.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Com= ponentShape.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Con= nection.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Ele= mentsFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Orm= Diagram.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Orm= Shape.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Spe= cialRootClass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Uti= ls.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/Con= nectionEditPart.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/Orm= ShapeEditPart.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/Sha= peEditPart.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/Pop= upMenuProvider.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.to= ols.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelMap.java branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.= eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/hbmexporter/HbmEx= porterTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - fix rest of stub names Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse/src/org/hibernate/console/node/NodeFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse/src/org/hibernate/console/node/NodeFactory.java 2010-05-07 12:30= :15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse/src/org/hibernate/console/node/NodeFactory.java 2010-05-07 13:51= :18 UTC (rev 21954) @@ -29,7 +29,7 @@ import org.hibernate.console.ConsoleMessages; import org.hibernate.console.ImageConstants; import org.hibernate.mediator.x.Session; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.metadata.ClassMetadata; import org.hibernate.mediator.x.metadata.CollectionMetadata; import org.hibernate.mediator.x.type.CollectionType; @@ -180,7 +180,7 @@ return consoleConfig; } = - public static TableNode createTableNode(BaseNode parent, TableStub table= ) { + public static TableNode createTableNode(BaseNode parent, Table table) { return new TableNode(parent, table); } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse/src/org/hibernate/console/node/TableNode.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse/src/org/hibernate/console/node/TableNode.java 2010-05-07 12:30:1= 5 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse/src/org/hibernate/console/node/TableNode.java 2010-05-07 13:51:1= 8 UTC (rev 21954) @@ -21,11 +21,11 @@ */ package org.hibernate.console.node; = -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = public class TableNode extends BaseNode { = - public TableNode(BaseNode parent, TableStub table) { + public TableNode(BaseNode parent, Table table) { super(null, parent); name =3D table.getName(); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappin= gUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils= .java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils= .java 2010-05-07 13:51:18 UTC (rev 21954) @@ -52,18 +52,18 @@ import org.hibernate.mediator.stubs.util.OpenMappingUtilsEjb3; import org.hibernate.mediator.stubs.util.StringHelper; import org.hibernate.mediator.stubs.util.XMLHelper; -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; +import org.hibernate.mediator.x.mapping.Map; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.RootClass; import org.hibernate.mediator.x.mapping.Subclass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.ToOne; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.tool.hbm2x.Cfg2HbmTool; @@ -132,7 +132,7 @@ * @param table * @return */ - public static String getTableName(TableStub table) { + public static String getTableName(Table table) { return getTableName(table.getCatalog(), table.getSchema(), table.getName= ()); } = @@ -165,8 +165,8 @@ res =3D rootClassInFile(consoleConfig, file, (RootClass)element); } else if (element instanceof Subclass) { res =3D subclassInFile(consoleConfig, file, (Subclass)element); - } else if (element instanceof TableStub) { - res =3D tableInFile(consoleConfig, file, (TableStub)element); + } else if (element instanceof Table) { + res =3D tableInFile(consoleConfig, file, (Table)element); } return res; } @@ -243,7 +243,7 @@ * @return */ @SuppressWarnings("unchecked") - public static boolean tableInFile(ConsoleConfiguration consoleConfig, IFi= le file, TableStub table) { + public static boolean tableInFile(ConsoleConfiguration consoleConfig, IFi= le file, Table table) { EntityResolver entityResolver =3D consoleConfig.getEntityResolver(); = Document doc =3D getDocument(file.getLocation().toFile(), entityResolver= ); Iterator classes =3D getElements(doc, HIBERNATE_TAG_CLASS); @@ -671,8 +671,8 @@ selectRegion =3D findSelectRegion(proj, findAdapter, (PersistentClass)s= election); } else if (selection instanceof Property){ selectRegion =3D findSelectRegion(proj, findAdapter, (Property)selectio= n); - } else if (selection instanceof TableStub) { - selectRegion =3D findSelectRegion(proj, findAdapter, (TableStub)selecti= on); + } else if (selection instanceof Table) { + selectRegion =3D findSelectRegion(proj, findAdapter, (Table)selection); } else if (selection instanceof Column) { selectRegion =3D findSelectRegion(proj, findAdapter, (Column)selection); } @@ -804,7 +804,7 @@ * @param table * @return a proper document region */ - public static IRegion findSelectRegion(IJavaProject proj, FindReplaceDocu= mentAdapter findAdapter, TableStub table) { + public static IRegion findSelectRegion(IJavaProject proj, FindReplaceDocu= mentAdapter findAdapter, Table table) { IRegion res =3D null; String[] tablePatterns =3D generateTablePatterns(table.getName()); IRegion tableRegion =3D null; @@ -1022,8 +1022,8 @@ Value value =3D property.getValue(); toolTag =3D "basic"; //$NON-NLS-1$ if (!value.isSimpleValue()) { - if (value instanceof CollectionStub) { - value =3D ((CollectionStub)value).getElement(); + if (value instanceof Collection) { + value =3D ((Collection)value).getElement(); } } if (value instanceof OneToMany) { @@ -1036,7 +1036,7 @@ else if (value instanceof OneToOne) { toolTag =3D "one-to-one"; //$NON-NLS-1$ } - else if (value instanceof MapStub) { + else if (value instanceof Map) { toolTag =3D "many-to-many"; //$NON-NLS-1$ } else if (value instanceof Component) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFil= terView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterVie= w.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterVie= w.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -34,7 +34,6 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.hibernate.console.ConsoleConfiguration; @@ -48,7 +47,7 @@ import org.hibernate.eclipse.console.workbench.xpl.AnyAdaptableLabelProvid= er; import org.hibernate.mediator.stubs.util.StringHelper; import org.hibernate.mediator.x.mapping.Column; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = public abstract class TableFilterView extends TreeToTableComposite { = @@ -141,8 +140,8 @@ Object sel =3D iterator.next(); ITableFilter filter =3D null; = - if ( sel instanceof TableStub ) { - TableStub table =3D (TableStub) sel; + if ( sel instanceof Table ) { + Table table =3D (Table) sel; filter =3D revEngDef.createTableFilter(); if ( StringHelper.isNotEmpty( table.getName() ) ) { filter.setMatchName( table.getName() ); @@ -243,7 +242,7 @@ } } = - protected void createTableColumns(Table table) { + protected void createTableColumns(org.eclipse.swt.widgets.Table table) { TableColumn column =3D new TableColumn(table, SWT.CENTER, 0); column.setText(HibernateConsoleMessages.TableFilterView_sign); column.setWidth(20); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/Config= urationAdapterFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/Configuratio= nAdapterFactory.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/Configuratio= nAdapterFactory.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -38,7 +38,7 @@ import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.PrimaryKey; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.Value; = public class ConfigurationAdapterFactory implements IAdapterFactory { @@ -60,7 +60,7 @@ map.put(LazyDatabaseSchema.class, new LazyDatabaseSchemaWorkbenchAdapter= ()); map.put(LazySessionFactory.class, new LazySessionFactoryAdapter()); map.put(TableContainer.class, new TableContainerWorkbenchAdapter()); - map.put(TableStub.class, new TableWorkbenchAdapter()); + map.put(Table.class, new TableWorkbenchAdapter()); map.put(PrimaryKey.class, new PrimaryKeyWorkbenchAdapter()); map.put(Column.class, new ColumnWorkbenchAdapter()); = = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNa= meValueVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNameValu= eVisitor.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNameValu= eVisitor.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -28,13 +28,13 @@ import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.DependantValue; import org.hibernate.mediator.x.mapping.IdentifierBag; -import org.hibernate.mediator.x.mapping.ListStub; +import org.hibernate.mediator.x.mapping.List; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; +import org.hibernate.mediator.x.mapping.Map; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.PrimitiveArray; -import org.hibernate.mediator.x.mapping.SetStub; +import org.hibernate.mediator.x.mapping.Set; import org.hibernate.mediator.x.mapping.SimpleValue; import org.hibernate.mediator.x.mapping.ValueVisitor; = @@ -64,7 +64,7 @@ return ImageConstants.PROPERTY; } = - public Object accept(SetStub set) { + public Object accept(Set set) { return ImageConstants.MANYTOONE; } = = @@ -72,7 +72,7 @@ return ImageConstants.ONETOMANY; } = - public Object accept(MapStub map) { + public Object accept(Map map) { return ImageConstants.MANYTOONE; } = @@ -84,7 +84,7 @@ return ImageConstants.MANYTOONE; = } = - public Object accept(ListStub list) { + public Object accept(List list) { return ImageConstants.MANYTOONE; } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDa= tabaseSchemaWorkbenchAdapter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabase= SchemaWorkbenchAdapter.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabase= SchemaWorkbenchAdapter.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -43,7 +43,7 @@ import org.hibernate.mediator.x.cfg.reveng.JDBCReader; import org.hibernate.mediator.x.cfg.reveng.ReverseEngineeringStrategy; import org.hibernate.mediator.x.connection.ConnectionProvider; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = public class LazyDatabaseSchemaWorkbenchAdapter extends BasicWorkbenchAdap= ter { = @@ -61,9 +61,9 @@ = List result =3D new ArrayList(); = - Iterator>> qualifierEntries =3D db.ge= tQualifierEntries(); + Iterator>> qualifierEntries =3D db.getQua= lifierEntries(); while (qualifierEntries.hasNext()) { - Map.Entry> entry =3D qualifierEntries.next(); + Map.Entry> entry =3D qualifierEntries.next(); result.add(new TableContainer(entry.getKey(), entry.getValue())); } return toArray(result.iterator(), TableContainer.class, new Comparator<= TableContainer>() { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/Proper= tyWorkbenchAdapter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWork= benchAdapter.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWork= benchAdapter.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -29,14 +29,14 @@ import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.DependantValue; import org.hibernate.mediator.x.mapping.IdentifierBag; -import org.hibernate.mediator.x.mapping.ListStub; +import org.hibernate.mediator.x.mapping.List; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; +import org.hibernate.mediator.x.mapping.Map; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.PrimitiveArray; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.SetStub; +import org.hibernate.mediator.x.mapping.Set; import org.hibernate.mediator.x.mapping.SimpleValue; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.mapping.ValueVisitor; @@ -73,7 +73,7 @@ return NO_CHILDREN; } = - public Object accept(SetStub set) { + public Object accept(Set set) { return NO_CHILDREN; // should it look up the target entity? } = @@ -81,7 +81,7 @@ return NO_CHILDREN; } = - public Object accept(MapStub map) { + public Object accept(Map map) { return NO_CHILDREN; } = @@ -93,7 +93,7 @@ return NO_CHILDREN; } = - public Object accept(ListStub list) { + public Object accept(List list) { return NO_CHILDREN; } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableC= ontainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContain= er.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContain= er.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -23,19 +23,19 @@ = import java.util.List; = -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = public class TableContainer { = - private final List tables; + private final List tables; private final String name; = - public TableContainer(String name, List tables) { + public TableContainer(String name, List
tables) { this.tables =3D tables; this.name =3D name; } = - public List getTables() { + public List
getTables() { return tables; } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableC= ontainerWorkbenchAdapter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContain= erWorkbenchAdapter.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContain= erWorkbenchAdapter.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -27,15 +27,15 @@ import org.hibernate.console.ImageConstants; import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.utils.EclipseImages; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = public class TableContainerWorkbenchAdapter extends BasicWorkbenchAdapter { = public Object[] getChildren(Object o) { TableContainer tc =3D getTableContainer( o ); - return toArray(tc.getTables().iterator(), TableStub.class, new Comparato= r() { + return toArray(tc.getTables().iterator(), Table.class, new Comparator() { = - public int compare(TableStub arg0, TableStub arg1) { + public int compare(Table arg0, Table arg1) { = return arg0.getName().compareTo(arg1.getName()); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableW= orkbenchAdapter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkben= chAdapter.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkben= chAdapter.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -30,12 +30,12 @@ import org.hibernate.eclipse.console.utils.EclipseImages; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.PrimaryKey; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = public class TableWorkbenchAdapter extends BasicWorkbenchAdapter { = public Object[] getChildren(Object o) { - TableStub t =3D getTable( o ); + Table t =3D getTable( o ); = List items =3D new ArrayList(); = @@ -55,8 +55,8 @@ return items.toArray(new Object[items.size()]); } = - private TableStub getTable(Object o) { - return (TableStub) o; + private Table getTable(Object o) { + return (Table) o; } = public ImageDescriptor getImageDescriptor(Object object) { @@ -64,7 +64,7 @@ } = public String getLabel(Object o) { - TableStub table =3D getTable(o); + Table table =3D getTable(o); //return Table.qualify(table.getCatalog(), table.getSchema(), table.getN= ame(), '.'); return table.getName(); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNa= meValueVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNameValu= eVisitor.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNameValu= eVisitor.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -27,13 +27,13 @@ import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.DependantValue; import org.hibernate.mediator.x.mapping.IdentifierBag; -import org.hibernate.mediator.x.mapping.ListStub; +import org.hibernate.mediator.x.mapping.List; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; +import org.hibernate.mediator.x.mapping.Map; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.PrimitiveArray; -import org.hibernate.mediator.x.mapping.SetStub; +import org.hibernate.mediator.x.mapping.Set; import org.hibernate.mediator.x.mapping.SimpleValue; import org.hibernate.mediator.x.mapping.ValueVisitor; = @@ -54,7 +54,7 @@ return "IdBag <" + bag.getElement().accept(this) + ">"; //$NON-NLS-1$//= $NON-NLS-2$ } = - public Object accept(ListStub list) { + public Object accept(List list) { return "List <" + list.getElement().accept(this) + ">"; //$NON-NLS-1$ //= $NON-NLS-2$ } = @@ -66,7 +66,7 @@ return list.getElement().accept(this) + "[]"; //$NON-NLS-1$ } = - public Object accept(MapStub map) { + public Object accept(Map map) { return "Map<" + map.getElement().accept(this) + ">"; //$NON-NLS-1$ //$NO= N-NLS-2$ } = @@ -81,7 +81,7 @@ return referencedEntityName; } = - public Object accept(SetStub set) { + public Object accept(Set set) { return "Set<" + set.getElement().accept(this) + ">"; //$NON-NLS-1$ //$NO= N-NLS-2$ } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphVie= w.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphView.java= 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphView.java= 2010-05-07 13:51:18 UTC (rev 21954) @@ -30,7 +30,7 @@ import org.hibernate.eclipse.graph.model.TableViewAdapter; import org.hibernate.eclipse.graph.parts.ConfigurationEditPart; import org.hibernate.eclipse.graph.parts.PersistentClassEditPart; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = public class RelationalGraphView extends AbstractGraphViewPart { = @@ -60,7 +60,7 @@ cv =3D new ConfigurationViewAdapter(pe.getPersistentClassViewAdapter(= ).getConfiguration().getConfiguration()); } = = - TableStub table =3D pe.getPersistentClassViewAdapter().getPersistentCl= ass().getTable(); + Table table =3D pe.getPersistentClassViewAdapter().getPersistentClass(= ).getTable(); tables.add(new TableViewAdapter(cv,table)); = } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyView= Adapter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyViewAdapte= r.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyViewAdapte= r.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -30,7 +30,7 @@ import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.eclipse.console.workbench.HibernateWorkbenchHelper; import org.hibernate.mediator.HibernateConsoleRuntimeException; -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.type.EntityType; @@ -78,8 +78,8 @@ = private void createSingleEndedEnityAssociations() { try { //TODO: we need the consoleconfiguration here to know the exact ty= pes = - if ( property.getValue() instanceof CollectionStub ) { - CollectionStub collection =3D (CollectionStub) property.getValue(); + if ( property.getValue() instanceof Collection ) { + Collection collection =3D (Collection) property.getValue(); if(!collection.isInverse() && collection.getElement() instanceof OneTo= Many) { OneToMany oneToMany =3D (OneToMany) collection.getElement(); = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAda= pter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAdapter.j= ava 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAdapter.j= ava 2010-05-07 13:51:18 UTC (rev 21954) @@ -26,15 +26,15 @@ import java.util.List; = import org.hibernate.mediator.x.mapping.Column; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = = public class TableViewAdapter extends GraphNode { = - private TableStub table; + private Table table; private final ConfigurationViewAdapter configuration; = - public TableViewAdapter(ConfigurationViewAdapter configuration, TableStub= table) { + public TableViewAdapter(ConfigurationViewAdapter configuration, Table tab= le) { this.configuration =3D configuration; this.table =3D table; } @@ -44,7 +44,7 @@ = } = - public TableStub getTable() { + public Table getTable() { return table; } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java 20= 10-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java 20= 10-05-07 13:51:18 UTC (rev 21954) @@ -52,7 +52,7 @@ import org.hibernate.mediator.x.cfg.ConfigurationFactory; import org.hibernate.mediator.x.cfg.JDBCMetaDataConfiguration; import org.hibernate.mediator.x.cfg.reveng.TableIdentifier; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.osgi.service.prefs.Preferences; = public class HibernateNature implements IProjectNature { @@ -118,11 +118,11 @@ } } = - List tables =3D null; + List
tables =3D null; = private ReadDatabaseMetaData job; = - public List getTables() { + public List
getTables() { ConsoleConfiguration ccfg =3D getDefaultConsoleConfiguration(); if(ccfg=3D=3Dnull) return Collections.emptyList(); = @@ -172,11 +172,11 @@ = } = - public List getMatchingTables(String tableName) { - List result =3D new ArrayList(); - Iterator tableMappings =3D getTables().iterator(); + public List
getMatchingTables(String tableName) { + List
result =3D new ArrayList
(); + Iterator
tableMappings =3D getTables().iterator(); while (tableMappings.hasNext() ) { - TableStub table =3D tableMappings.next(); + Table table =3D tableMappings.next(); if(table.getName().toUpperCase().startsWith(tableName.toUpperCase()) ) { result.add(table); } @@ -184,10 +184,10 @@ return result; } = - public TableStub getTable(TableIdentifier nearestTableName) { + public Table getTable(TableIdentifier nearestTableName) { // TODO: can be made MUCH more efficient with proper indexing of the tab= les. // TODO: handle catalog/schema properly - for (TableStub table : getTables()) { + for (Table table : getTables()) { if(nearestTableName.getName().equals(table.getName())) { return table; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/Configurat= ionActor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationAct= or.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationAct= or.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -10,7 +10,6 @@ ************************************************************************= ******/ package org.hibernate.eclipse.jdt.ui.wizards; = -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -52,14 +51,12 @@ import org.hibernate.mediator.x.cfg.Mappings; import org.hibernate.mediator.x.mapping.Array; import org.hibernate.mediator.x.mapping.Bag; -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.IndexedCollection; import org.hibernate.mediator.x.mapping.JoinedSubclass; import org.hibernate.mediator.x.mapping.KeyValue; -import org.hibernate.mediator.x.mapping.ListStub; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.PersistentClass; @@ -67,10 +64,9 @@ import org.hibernate.mediator.x.mapping.PrimitiveArray; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.RootClass; -import org.hibernate.mediator.x.mapping.SetStub; import org.hibernate.mediator.x.mapping.SimpleValue; import org.hibernate.mediator.x.mapping.Subclass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.ToOne; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.type.EnumType; @@ -156,7 +152,7 @@ ConfigurationFactory configStubFactory =3D new ConfigurationFactory(null= ); Configuration config =3D configStubFactory.createConfiguration(); Mappings mappings =3D config.createMappings(); - Collection classesCollection =3D createHierarhyStructur= e(project, processor.getRootClasses()); + java.util.Collection classesCollection =3D createHierar= hyStructure(project, processor.getRootClasses()); for (PersistentClass persistentClass : classesCollection) { mappings.addClass(persistentClass); } @@ -170,7 +166,7 @@ * @return */ @SuppressWarnings("unchecked") - private Collection createHierarhyStructure(IJavaProject = project, Map rootClasses){ + private java.util.Collection createHierarhyStructure(IJa= vaProject project, Map rootClasses){ Map pcCopy =3D new HashMap(); for (Map.Entry entry : rootClasses.entrySet()) { pcCopy.put(entry.getKey(), entry.getValue()); @@ -204,7 +200,7 @@ subclass.setDiscriminatorValue(StringHelper.unqualify(pastClass.getCl= assName())); subclass.setAbstract(pastClass.isAbstract()); if (subclass instanceof JoinedSubclass) { - ((JoinedSubclass) subclass).setTable(TableStub.newInstance(pastClass= .getClassName().toUpperCase())); + ((JoinedSubclass) subclass).setTable(Table.newInstance(pastClass.get= ClassName().toUpperCase())); ((JoinedSubclass) subclass).setKey((KeyValue) pc.getIdentifierProper= ty().getValue()); } else { if (pastClass.getIdentifierProperty() !=3D null) { @@ -279,7 +275,7 @@ Map.Entry entry =3D it.next(); EntityInfo entryInfo =3D entry.getValue(); String className =3D entryInfo.getName(); - TableStub table =3D TableStub.newInstance(className.toUpperCase()); + Table table =3D Table.newInstance(className.toUpperCase()); RootClass rootClass =3D RootClass.newInstance(); rootClass.setEntityName( entryInfo.getFullyQualifiedName() ); rootClass.setClassName( entryInfo.getFullyQualifiedName() ); @@ -508,7 +504,7 @@ ITypeBinding[] interfaces =3D Utils.getAllInterfaces(tb); Value value =3D buildCollectionValue(interfaces); if (value !=3D null) { - CollectionStub cValue =3D (CollectionStub)value; = + Collection cValue =3D (Collection)value; = if (ref !=3D null && rootClasses.get(ref.fullyQualifiedName) !=3D null){ OneToMany oValue =3D OneToMany.newInstance(rootClass); RootClass associatedClass =3D rootClasses.get(ref.fullyQualifiedName); @@ -523,9 +519,9 @@ cValue.setElement(elementValue); cValue.setCollectionTable(rootClass.getTable());//TODO what to set? } - if (value instanceof ListStub){ + if (value instanceof List){ ((IndexedCollection)cValue).setIndex(SimpleValue.newInstance()); - } else if (value instanceof MapStub){ + } else if (value instanceof Map){ SimpleValue map_key =3D SimpleValue.newInstance(); //FIXME: is it possible to map Map? //Or only Map @@ -564,12 +560,12 @@ Value value =3D buildCollectionValue(interfaces); if (value !=3D null){ SimpleValue element =3D buildSimpleValue("string");//$NON-NLS-1$ - ((CollectionStub) value).setElement(element); - ((CollectionStub) value).setCollectionTable(rootClass.getTable());//TOD= O what to set? + ((Collection) value).setElement(element); + ((Collection) value).setCollectionTable(rootClass.getTable());//TODO wh= at to set? buildProperty(value); - if (value instanceof ListStub){ + if (value instanceof List){ ((IndexedCollection)value).setIndex(SimpleValue.newInstance()); - } else if (value instanceof MapStub){ + } else if (value instanceof Map){ SimpleValue map_key =3D SimpleValue.newInstance(); //FIXME: how to detect key-type here map_key.setTypeName("string"); //$NON-NLS-1$ @@ -637,14 +633,14 @@ return sValue; } = - private CollectionStub buildCollectionValue(ITypeBinding[] interfaces){ - CollectionStub cValue =3D null; + private Collection buildCollectionValue(ITypeBinding[] interfaces){ + Collection cValue =3D null; if (Utils.isImplementInterface(interfaces, Set.class.getName())){ - cValue =3D SetStub.newInstance(rootClass); + cValue =3D org.hibernate.mediator.x.mapping.Set.newInstance(rootClass); } else if (Utils.isImplementInterface(interfaces, List.class.getName())){ - cValue =3D ListStub.newInstance(rootClass); + cValue =3D org.hibernate.mediator.x.mapping.List.newInstance(rootClass); } else if (Utils.isImplementInterface(interfaces, Map.class.getName())){ - cValue =3D MapStub.newInstance(rootClass); + cValue =3D org.hibernate.mediator.x.mapping.Map.newInstance(rootClass); } else if (Utils.isImplementInterface(interfaces, Collection.class.getNa= me())){ cValue =3D Bag.newInstance(rootClass); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/Tab= lePropertiesBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TableProp= ertiesBlock.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TableProp= ertiesBlock.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -72,7 +72,7 @@ import org.hibernate.mediator.x.cfg.reveng.TableIdentifier; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.PrimaryKey; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = public class TablePropertiesBlock extends MasterDetailsBlock { = @@ -163,7 +163,7 @@ = LazyDatabaseSchema lds =3D editor.getLazyDatabaseSchema(); = - Map tables =3D new HashMap(); + Map tables =3D new HashMap(); Map > columns =3D new HashMap >(); = if (lds =3D=3D null) { @@ -197,8 +197,8 @@ if(result!=3Dnull) { for (int i =3D 0; i < result.length; i++) { Object object =3D result[i]; - if(object instanceof TableStub) { - TableStub table =3D (TableStub) object; + if(object instanceof Table) { + Table table =3D (Table) object; tables.put(TableIdentifier.create(table), table); lastTable =3D TableIdentifier.create(table); } else if (object instanceof Column) { @@ -220,10 +220,10 @@ } } = - Iterator> iterator =3D tables.ent= rySet().iterator(); + Iterator> iterator =3D tables.entrySe= t().iterator(); while ( iterator.hasNext() ) { - Map.Entry element =3D iterator.next(); - TableStub table =3D element.getValue(); + Map.Entry element =3D iterator.next(); + Table table =3D element.getValue(); IRevEngTable retable =3D null; // editor.getReverseEngineeringDefinition().findTable(TableIdentifier.= create(table)); if(retable=3D=3Dnull) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNa= meHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNameHand= ler.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNameHand= ler.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -32,7 +32,7 @@ import org.hibernate.eclipse.nature.HibernateNature; import org.hibernate.mediator.x.cfg.reveng.TableIdentifier; import org.hibernate.mediator.x.mapping.Column; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.w3c.dom.Attr; import org.w3c.dom.Node; = @@ -54,7 +54,7 @@ if(nature!=3Dnull) { TableIdentifier nearestTableName =3D extractor.getNearestTableName(node= ); if(nearestTableName!=3Dnull) { - TableStub table =3D nature.getTable(nearestTableName); + Table table =3D nature.getTable(nearestTableName); if (table!=3Dnull) { Iterator tableMappings =3D table.getColumnIterator(); while (tableMappings.hasNext() ) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNam= eHandler.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNameHandl= er.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNameHandl= er.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -30,7 +30,7 @@ import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.hibernate.eclipse.nature.HibernateNature; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.w3c.dom.Attr; import org.w3c.dom.Node; = @@ -41,7 +41,7 @@ IJavaProject javaProject, Node node, String attributeName, String start, int offset) { = - List tables =3D new ArrayList(); = + List
tables =3D new ArrayList
(); = = HibernateNature nature =3D HibernateNature.getHibernateNature( javaProje= ct ); if(nature!=3Dnull) { @@ -49,8 +49,8 @@ } = List proposals =3D new ArrayList(); - for (Iterator iter =3D tables.iterator(); iter.hasNext();) { - TableStub element =3D iter.next(); + for (Iterator
iter =3D tables.iterator(); iter.hasNext();) { + Table element =3D iter.next(); proposals.add(new CompletionProposal(element.getName(), offset, start.l= ength(), element.getName().length(), null, null, null, null) ); } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/ConsoleQueryParameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/ConsoleQueryParameter.java 2010-05-0= 7 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/ConsoleQueryParameter.java 2010-05-0= 7 13:51:18 UTC (rev 21954) @@ -33,7 +33,7 @@ import java.util.TimeZone; = import org.hibernate.mediator.x.Hibernate; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.type.NullableType; import org.hibernate.mediator.x.type.Type; = @@ -54,7 +54,7 @@ addTypeFormat(Hibernate.INTEGER, Integer.valueOf(42)); addTypeFormat(Hibernate.BIG_DECIMAL, new BigDecimal(42.0)); addTypeFormat(Hibernate.CHARACTER, Character.valueOf('h')); - addTypeFormat(Hibernate.CLASS, TableStub.class); + addTypeFormat(Hibernate.CLASS, Table.class); addTypeFormat(Hibernate.CURRENCY, Currency.getInstance(Locale.getDefault= ())); addTypeFormat(Hibernate.DATE, new Date()); addTypeFormat(Hibernate.DOUBLE, Double.valueOf(42.42)); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/cfg/JDBCMetaDataConfiguratio= n.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/JDBCMetaDataConfiguration.java= 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/JDBCMetaDataConfiguration.java= 2010-05-07 13:51:18 UTC (rev 21954) @@ -5,7 +5,7 @@ import java.util.Properties; import org.hibernate.mediator.base.HObject; import org.hibernate.mediator.x.cfg.reveng.ReverseEngineeringStrategy; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = public class JDBCMetaDataConfiguration extends Configuration { public static final String CL =3D "org.hibernate.cfg.JDBCMetaDataConfigur= ation"; //$NON-NLS-1$ @@ -36,19 +36,19 @@ } = @SuppressWarnings("unchecked") - public ArrayList getTableMappingsArr() { - ArrayList arr =3D new ArrayList(); = + public ArrayList
getTableMappingsArr() { + ArrayList
arr =3D new ArrayList
(); = Iterator it =3D (Iterator)invoke(mn()); while (it.hasNext() ) { Object obj =3D it.next(); if (obj !=3D null) { - arr.add(new TableStub(obj)); + arr.add(new Table(obj)); } } return arr; } = - public Iterator getTableMappingsIt() { + public Iterator
getTableMappingsIt() { return getTableMappingsArr().iterator(); } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/cfg/reveng/DefaultDatabaseCo= llector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/reveng/DefaultDatabaseCollecto= r.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/reveng/DefaultDatabaseCollecto= r.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Map.Entry; import org.hibernate.mediator.base.HObject; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = public class DefaultDatabaseCollector extends HObject { public static final String CL =3D "org.hibernate.cfg.reveng.DefaultDataba= seCollector"; //$NON-NLS-1$ @@ -21,17 +21,17 @@ } = @SuppressWarnings("unchecked") - public Iterator>> getQualifierEntries() { + public Iterator>> getQualifierEntries() { Iterator> it =3D (Iterator>)invoke(mn()); - HashMap> map =3D new HashMap>(); + HashMap> map =3D new HashMap>(); while (it.hasNext()) { Map.Entry entry =3D it.next(); - ArrayList arr =3D new ArrayList(); + ArrayList
arr =3D new ArrayList
(); Iterator itValue =3D (Iterator)entry.getValue().iterator(); while (itValue.hasNext()) { Object obj =3D itValue.next(); if (obj !=3D null) { - arr.add(new TableStub(obj)); + arr.add(new Table(obj)); } } map.put(entry.getKey(), arr); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/cfg/reveng/TableIdentifier.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/reveng/TableIdentifier.java 20= 10-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/reveng/TableIdentifier.java 20= 10-05-07 13:51:18 UTC (rev 21954) @@ -1,7 +1,7 @@ package org.hibernate.mediator.x.cfg.reveng; = import org.hibernate.mediator.base.HObject; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = public class TableIdentifier extends HObject { public static final String CL =3D "org.hibernate.cfg.reveng.TableIdentifi= er"; //$NON-NLS-1$ @@ -10,7 +10,7 @@ super(tableIdentifier, CL); } = - public static TableIdentifier create(TableStub table) { + public static TableIdentifier create(Table table) { return newInstance(table.getCatalog(), table.getSchema(), table.getName(= ) ); } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/Array.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Array.java 2010-05-07 12:3= 0:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Array.java 2010-05-07 13:5= 1:18 UTC (rev 21954) @@ -2,7 +2,7 @@ = import org.hibernate.mediator.base.HObject; = -public class Array extends ListStub { +public class Array extends List { public static final String CL =3D "org.hibernate.mapping.Array"; //$NON-N= LS-1$ = protected Array(Object array) { @@ -21,7 +21,7 @@ invoke(mn(), element); } = - public void setCollectionTable(TableStub table) { + public void setCollectionTable(Table table) { invoke(mn(), table); } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/Bag.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Bag.java 2010-05-07 12:30:= 15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Bag.java 2010-05-07 13:51:= 18 UTC (rev 21954) @@ -1,7 +1,7 @@ package org.hibernate.mediator.x.mapping; = = -public class Bag extends CollectionStub { +public class Bag extends Collection { public static final String CL =3D "org.hibernate.mapping.Bag"; //$NON-NLS= -1$ = protected Bag(Object bag) { Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hib= ernate.mediator/src/org/hibernate/mediator/x/mapping/Collection.java (from = rev 21404, branches/hibernatetools-multiversion/hibernatetools/plugins/org.= hibernate.mediator/src/org/hibernate/mediator/x/mapping/CollectionStub.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Collection.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Collection.java 2010-05-07= 13:51:18 UTC (rev 21954) @@ -0,0 +1,63 @@ +package org.hibernate.mediator.x.mapping; + +import org.hibernate.mediator.x.FetchMode; + +public abstract class Collection extends Value { + public static final String CL =3D "org.hibernate.mapping.Collection"; //$= NON-NLS-1$ + + protected Collection(Object collection) { + super(collection, CL); + } + + protected Collection(Object collection, String cn) { + super(collection, cn); + } + + public void setCollectionTable(Table table) { + invoke(mn(), table); + } + + public void setKey(KeyValue key) { + invoke(mn(), key); + } + + public void setLazy(boolean lazy) { + invoke(mn(), lazy); + } + + public void setRole(String role) { + invoke(mn(), role); + } + + public void setElement(Value element) { + invoke(mn(), element); + } + + public void setFetchMode(FetchMode fetchMode) { + invoke(mn(), fetchMode); + } + + public Value getElement() { + return ValueFactory.createValueStub(invoke(mn())); + } + + public Table getCollectionTable() { + Object obj =3D invoke(mn()); + if (obj =3D=3D null) { + return null; + } + return new Table(obj); + } + + public KeyValue getKey() { + return (KeyValue)ValueFactory.createValueStub(invoke(mn())); + } + + public boolean isOneToMany() { + return (Boolean)invoke(mn()); + } + + public boolean isInverse() { + return (Boolean)invoke(mn()); + } +} Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hi= bernate.mediator/src/org/hibernate/mediator/x/mapping/CollectionStub.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/CollectionStub.java 2010-0= 5-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/CollectionStub.java 2010-0= 5-07 13:51:18 UTC (rev 21954) @@ -1,63 +0,0 @@ -package org.hibernate.mediator.x.mapping; - -import org.hibernate.mediator.x.FetchMode; - -public abstract class CollectionStub extends Value { - public static final String CL =3D "org.hibernate.mapping.Collection"; //$= NON-NLS-1$ - - protected CollectionStub(Object collection) { - super(collection, CL); - } - - protected CollectionStub(Object collection, String cn) { - super(collection, cn); - } - - public void setCollectionTable(TableStub table) { - invoke(mn(), table); - } - - public void setKey(KeyValue key) { - invoke(mn(), key); - } - - public void setLazy(boolean lazy) { - invoke(mn(), lazy); - } - - public void setRole(String role) { - invoke(mn(), role); - } - - public void setElement(Value element) { - invoke(mn(), element); - } - - public void setFetchMode(FetchMode fetchMode) { - invoke(mn(), fetchMode); - } - - public Value getElement() { - return ValueFactory.createValueStub(invoke(mn())); - } - - public TableStub getCollectionTable() { - Object obj =3D invoke(mn()); - if (obj =3D=3D null) { - return null; - } - return new TableStub(obj); - } - - public KeyValue getKey() { - return (KeyValue)ValueFactory.createValueStub(invoke(mn())); - } - - public boolean isOneToMany() { - return (Boolean)invoke(mn()); - } - - public boolean isInverse() { - return (Boolean)invoke(mn()); - } -} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/ForeignKey.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/ForeignKey.java 2010-05-07= 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/ForeignKey.java 2010-05-07= 13:51:18 UTC (rev 21954) @@ -17,12 +17,12 @@ return (Boolean)invoke(mn(), column); } = - public TableStub getReferencedTable() { + public Table getReferencedTable() { Object obj =3D invoke(mn()); if (obj =3D=3D null) { return null; } - return new TableStub(obj); + return new Table(obj); } = @SuppressWarnings("unchecked") Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/IdentifierCollection= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/IdentifierCollection.java = 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/IdentifierCollection.java = 2010-05-07 13:51:18 UTC (rev 21954) @@ -1,7 +1,7 @@ package org.hibernate.mediator.x.mapping; = = -public abstract class IdentifierCollection extends CollectionStub { +public abstract class IdentifierCollection extends Collection { public static final String CL =3D "org.hibernate.mapping.IdentifierCollec= tion"; //$NON-NLS-1$ = protected IdentifierCollection(Object identifierCollection) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/IndexedCollection.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/IndexedCollection.java 201= 0-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/IndexedCollection.java 201= 0-05-07 13:51:18 UTC (rev 21954) @@ -1,7 +1,7 @@ package org.hibernate.mediator.x.mapping; = = -public abstract class IndexedCollection extends CollectionStub { +public abstract class IndexedCollection extends Collection { public static final String CL =3D "org.hibernate.mapping.IndexedCollectio= n"; //$NON-NLS-1$ = protected IndexedCollection(Object indexedCollection) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/JoinedSubclass.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/JoinedSubclass.java 2010-0= 5-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/JoinedSubclass.java 2010-0= 5-07 13:51:18 UTC (rev 21954) @@ -12,7 +12,7 @@ return new JoinedSubclass(newInstance(CL, persistentClass)); } = - public void setTable(TableStub table) { + public void setTable(Table table) { invoke(mn(), table); } = Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hib= ernate.mediator/src/org/hibernate/mediator/x/mapping/List.java (from rev 21= 404, branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibern= ate.mediator/src/org/hibernate/mediator/x/mapping/ListStub.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/List.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/List.java 2010-05-07 13:51= :18 UTC (rev 21954) @@ -0,0 +1,28 @@ +package org.hibernate.mediator.x.mapping; + + +public class List extends IndexedCollection { + public static final String CL =3D "org.hibernate.mapping.List"; //$NON-NL= S-1$ + + protected List(Object list) { + super(list, CL); + } + + protected List(Object list, String cn) { + super(list, cn); + } + = + public static List newInstance(PersistentClass owner) { + return new List(newInstance(CL, owner)); + } + + @Override + public Object accept(ValueVisitor visitor) { + return visitor.accept(this); + } + + public Value getIndex() { + return ValueFactory.createValueStub(invoke(mn())); + } + +} Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hi= bernate.mediator/src/org/hibernate/mediator/x/mapping/ListStub.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/ListStub.java 2010-05-07 1= 2:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/ListStub.java 2010-05-07 1= 3:51:18 UTC (rev 21954) @@ -1,28 +0,0 @@ -package org.hibernate.mediator.x.mapping; - - -public class ListStub extends IndexedCollection { - public static final String CL =3D "org.hibernate.mapping.List"; //$NON-NL= S-1$ - - protected ListStub(Object list) { - super(list, CL); - } - - protected ListStub(Object list, String cn) { - super(list, cn); - } - = - public static ListStub newInstance(PersistentClass owner) { - return new ListStub(newInstance(CL, owner)); - } - - @Override - public Object accept(ValueVisitor visitor) { - return visitor.accept(this); - } - - public Value getIndex() { - return ValueFactory.createValueStub(invoke(mn())); - } - -} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/ManyToOne.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/ManyToOne.java 2010-05-07 = 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/ManyToOne.java 2010-05-07 = 13:51:18 UTC (rev 21954) @@ -8,7 +8,7 @@ super(manyToOne, CL); } = - public static ManyToOne newInstance(TableStub table) { + public static ManyToOne newInstance(Table table) { return new ManyToOne(newInstance(CL, table)); } = Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hib= ernate.mediator/src/org/hibernate/mediator/x/mapping/Map.java (from rev 214= 04, branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/MapStub.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Map.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Map.java 2010-05-07 13:51:= 18 UTC (rev 21954) @@ -0,0 +1,19 @@ +package org.hibernate.mediator.x.mapping; + + +public class Map extends IndexedCollection { + public static final String CL =3D "org.hibernate.mapping.Map"; //$NON-NLS= -1$ + + protected Map(Object map) { + super(map, CL); + } + = + public static Map newInstance(PersistentClass owner) { + return new Map(newInstance(CL, owner)); + } + + @Override + public Object accept(ValueVisitor visitor) { + return visitor.accept(this); + } +} Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hi= bernate.mediator/src/org/hibernate/mediator/x/mapping/MapStub.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/MapStub.java 2010-05-07 12= :30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/MapStub.java 2010-05-07 13= :51:18 UTC (rev 21954) @@ -1,19 +0,0 @@ -package org.hibernate.mediator.x.mapping; - - -public class MapStub extends IndexedCollection { - public static final String CL =3D "org.hibernate.mapping.Map"; //$NON-NLS= -1$ - - protected MapStub(Object map) { - super(map, CL); - } - = - public static MapStub newInstance(PersistentClass owner) { - return new MapStub(newInstance(CL, owner)); - } - - @Override - public Object accept(ValueVisitor visitor) { - return visitor.accept(this); - } -} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/OneToOne.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/OneToOne.java 2010-05-07 1= 2:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/OneToOne.java 2010-05-07 1= 3:51:18 UTC (rev 21954) @@ -8,7 +8,7 @@ super(oneToOne, CL); } = - public static OneToOne newInstance(TableStub table, PersistentClass owner= ) { + public static OneToOne newInstance(Table table, PersistentClass owner) { return new OneToOne(newInstance(CL, table, owner)); } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClass.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/PersistentClass.java 2010-= 05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/PersistentClass.java 2010-= 05-07 13:51:18 UTC (rev 21954) @@ -69,12 +69,12 @@ return new Property(obj); } = - public TableStub getTable() { + public Table getTable() { Object obj =3D invoke(mn()); if (obj =3D=3D null) { return null; } - return new TableStub(obj); + return new Table(obj); } = @SuppressWarnings("unchecked") Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/PrimaryKey.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/PrimaryKey.java 2010-05-07= 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/PrimaryKey.java 2010-05-07= 13:51:18 UTC (rev 21954) @@ -59,12 +59,12 @@ return new Column(obj); } = - public TableStub getTable() { + public Table getTable() { Object obj =3D invoke(mn()); if (obj =3D=3D null) { return null; } - return new TableStub(obj); + return new Table(obj); } = } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/RootClass.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/RootClass.java 2010-05-07 = 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/RootClass.java 2010-05-07 = 13:51:18 UTC (rev 21954) @@ -23,12 +23,12 @@ invoke(mn(), discr); } = - public TableStub getTable() { + public Table getTable() { Object obj =3D invoke(mn()); if (obj =3D=3D null) { return null; } - return new TableStub(obj); + return new Table(obj); } = public void addProperty(Property p) { @@ -63,7 +63,7 @@ invoke(mn(), lazy); } = - public void setTable(TableStub table) { + public void setTable(Table table) { invoke(mn(), table); } = Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hib= ernate.mediator/src/org/hibernate/mediator/x/mapping/Set.java (from rev 214= 04, branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/SetStub.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Set.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Set.java 2010-05-07 13:51:= 18 UTC (rev 21954) @@ -0,0 +1,20 @@ +package org.hibernate.mediator.x.mapping; + + +public class Set extends Collection { + public static final String CL =3D "org.hibernate.mapping.Set"; //$NON-NLS= -1$ + + protected Set(Object set) { + super(set, CL); + } + = + public static Set newInstance(PersistentClass owner) { + return new Set(newInstance(CL, owner)); + } + + @Override + public Object accept(ValueVisitor visitor) { + return visitor.accept(this); + } + +} Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hi= bernate.mediator/src/org/hibernate/mediator/x/mapping/SetStub.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/SetStub.java 2010-05-07 12= :30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/SetStub.java 2010-05-07 13= :51:18 UTC (rev 21954) @@ -1,20 +0,0 @@ -package org.hibernate.mediator.x.mapping; - - -public class SetStub extends CollectionStub { - public static final String CL =3D "org.hibernate.mapping.Set"; //$NON-NLS= -1$ - - protected SetStub(Object set) { - super(set, CL); - } - = - public static SetStub newInstance(PersistentClass owner) { - return new SetStub(newInstance(CL, owner)); - } - - @Override - public Object accept(ValueVisitor visitor) { - return visitor.accept(this); - } - -} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/SimpleValue.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/SimpleValue.java 2010-05-0= 7 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/SimpleValue.java 2010-05-0= 7 13:51:18 UTC (rev 21954) @@ -26,7 +26,7 @@ invoke(mn(), column); } = - public void setTable(TableStub table) { + public void setTable(Table table) { invoke(mn(), table); } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/Subclass.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Subclass.java 2010-05-07 1= 2:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Subclass.java 2010-05-07 1= 3:51:18 UTC (rev 21954) @@ -32,12 +32,12 @@ invoke(mn(), p); } = - public TableStub getRootTable() { + public Table getRootTable() { Object obj =3D invoke(mn()); if (obj =3D=3D null) { return null; } - return new TableStub(obj); + return new Table(obj); } = public boolean isJoinedSubclass() { Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hib= ernate.mediator/src/org/hibernate/mediator/x/mapping/Table.java (from rev 2= 1404, branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiber= nate.mediator/src/org/hibernate/mediator/x/mapping/TableStub.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Table.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Table.java 2010-05-07 13:5= 1:18 UTC (rev 21954) @@ -0,0 +1,106 @@ +package org.hibernate.mediator.x.mapping; + +import java.util.ArrayList; +import java.util.Iterator; + +import org.hibernate.mediator.HibernateConsoleRuntimeException; +import org.hibernate.mediator.Messages; +import org.hibernate.mediator.base.HObject; + +public class Table extends HObject { + public static final String CL =3D "org.hibernate.mapping.Table"; //$NON-N= LS-1$ + + public Table(Object table) { + super(table, CL); + } + = + public static Table newInstance(String name) { + return new Table(newInstance(CL, name)); + } + = + public String getName() { + return (String)invoke(mn()); + } + = + public PrimaryKey getPrimaryKey() { + Object obj =3D invoke(mn()); + if (obj =3D=3D null) { + return null; + } + return new PrimaryKey(obj); + } + = + @SuppressWarnings("unchecked") + public Iterator getForeignKeyIterator() { + Iterator it =3D (Iterator)invoke(mn()); + ArrayList al =3D new ArrayList(); + while (it.hasNext()) { + Object obj =3D it.next(); + if (obj !=3D null) { + al.add(new ForeignKey(obj)); + } + } + return al.iterator(); + } + + public String getCatalog() { + return (String)invoke(mn()); + } + + public String getSchema() { + return (String)invoke(mn()); + } + + public KeyValue getIdentifierValue() { + Object obj =3D invoke(mn()); + if (obj =3D=3D null) { + return null; + } + Value res =3D ValueFactory.createValueStub(obj); + if (res instanceof KeyValue) { + return (KeyValue)res; + } + throw new HibernateConsoleRuntimeException(Messages.Stub_create_null_stu= b_prohibit); + } + + @SuppressWarnings("unchecked") + public Iterator getColumnIterator() { + Iterator it =3D (Iterator)invoke(mn()); + ArrayList al =3D new ArrayList(); + while (it.hasNext()) { + Object obj =3D it.next(); + if (obj !=3D null) { + al.add(new Column(obj)); + } + } + return al.iterator(); + } + + public String getComment() { + return (String)invoke(mn()); + } + + public String getRowId() { + return (String)invoke(mn()); + } + + public String getSubselect() { + return (String)invoke(mn()); + } + + public boolean hasDenormalizedTables() { + return (Boolean)invoke(mn()); + } + + public boolean isAbstract() { + return (Boolean)invoke(mn()); + } + + public boolean isAbstractUnionTable() { + return (Boolean)invoke(mn()); + } + + public boolean isPhysicalTable() { + return (Boolean)invoke(mn()); + } +} Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hi= bernate.mediator/src/org/hibernate/mediator/x/mapping/TableStub.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/TableStub.java 2010-05-07 = 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/TableStub.java 2010-05-07 = 13:51:18 UTC (rev 21954) @@ -1,106 +0,0 @@ -package org.hibernate.mediator.x.mapping; - -import java.util.ArrayList; -import java.util.Iterator; - -import org.hibernate.mediator.HibernateConsoleRuntimeException; -import org.hibernate.mediator.Messages; -import org.hibernate.mediator.base.HObject; - -public class TableStub extends HObject { - public static final String CL =3D "org.hibernate.mapping.Table"; //$NON-N= LS-1$ - - public TableStub(Object table) { - super(table, CL); - } - = - public static TableStub newInstance(String name) { - return new TableStub(newInstance(CL, name)); - } - = - public String getName() { - return (String)invoke(mn()); - } - = - public PrimaryKey getPrimaryKey() { - Object obj =3D invoke(mn()); - if (obj =3D=3D null) { - return null; - } - return new PrimaryKey(obj); - } - = - @SuppressWarnings("unchecked") - public Iterator getForeignKeyIterator() { - Iterator it =3D (Iterator)invoke(mn()); - ArrayList al =3D new ArrayList(); - while (it.hasNext()) { - Object obj =3D it.next(); - if (obj !=3D null) { - al.add(new ForeignKey(obj)); - } - } - return al.iterator(); - } - - public String getCatalog() { - return (String)invoke(mn()); - } - - public String getSchema() { - return (String)invoke(mn()); - } - - public KeyValue getIdentifierValue() { - Object obj =3D invoke(mn()); - if (obj =3D=3D null) { - return null; - } - Value res =3D ValueFactory.createValueStub(obj); - if (res instanceof KeyValue) { - return (KeyValue)res; - } - throw new HibernateConsoleRuntimeException(Messages.Stub_create_null_stu= b_prohibit); - } - - @SuppressWarnings("unchecked") - public Iterator getColumnIterator() { - Iterator it =3D (Iterator)invoke(mn()); - ArrayList al =3D new ArrayList(); - while (it.hasNext()) { - Object obj =3D it.next(); - if (obj !=3D null) { - al.add(new Column(obj)); - } - } - return al.iterator(); - } - - public String getComment() { - return (String)invoke(mn()); - } - - public String getRowId() { - return (String)invoke(mn()); - } - - public String getSubselect() { - return (String)invoke(mn()); - } - - public boolean hasDenormalizedTables() { - return (Boolean)invoke(mn()); - } - - public boolean isAbstract() { - return (Boolean)invoke(mn()); - } - - public boolean isAbstractUnionTable() { - return (Boolean)invoke(mn()); - } - - public boolean isPhysicalTable() { - return (Boolean)invoke(mn()); - } -} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/Value.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Value.java 2010-05-07 12:3= 0:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Value.java 2010-05-07 13:5= 1:18 UTC (rev 21954) @@ -18,12 +18,12 @@ super(value, cn); } = - public TableStub getTable() { + public Table getTable() { Object obj =3D invoke(mn()); if (obj =3D=3D null) { return null; } - return new TableStub(obj); + return new Table(obj); } = public boolean isSimpleValue() { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/ValueFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/ValueFactory.java 2010-05-= 07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/ValueFactory.java 2010-05-= 07 13:51:18 UTC (rev 21954) @@ -16,16 +16,16 @@ return new IdentifierBag(value); //} else if (0 =3D=3D "org.hibernate.mapping.IndexedCollection".compareT= o(cl.getName())) { // return new IndexedCollectionStub(value); - } else if (0 =3D=3D ListStub.CL.compareTo(cl.getName())) { - return new ListStub(value); + } else if (0 =3D=3D List.CL.compareTo(cl.getName())) { + return new List(value); } else if (0 =3D=3D Array.CL.compareTo(cl.getName())) { return new Array(value); } else if (0 =3D=3D PrimitiveArray.CL.compareTo(cl.getName())) { return new PrimitiveArray(value); - } else if (0 =3D=3D MapStub.CL.compareTo(cl.getName())) { - return new MapStub(value); - } else if (0 =3D=3D SetStub.CL.compareTo(cl.getName())) { - return new SetStub(value); + } else if (0 =3D=3D Map.CL.compareTo(cl.getName())) { + return new Map(value); + } else if (0 =3D=3D Set.CL.compareTo(cl.getName())) { + return new Set(value); } else if (0 =3D=3D OneToMany.CL.compareTo(cl.getName())) { return new OneToMany(value); //} else if (0 =3D=3D KeyValueStub.CL.compareTo(cl.getName())) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/ValueVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/ValueVisitor.java 2010-05-= 07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/ValueVisitor.java 2010-05-= 07 13:51:18 UTC (rev 21954) @@ -5,12 +5,12 @@ public interface ValueVisitor { Object accept(Bag bag); Object accept(IdentifierBag bag); - Object accept(ListStub list); + Object accept(List list); Object accept(PrimitiveArray primitiveArray); Object accept(Array list); - Object accept(MapStub map); + Object accept(Map map); Object accept(OneToMany many); - Object accept(SetStub set); + Object accept(Set set); Object accept(Any any); Object accept(SimpleValue value); Object accept(DependantValue value); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/m= apping/details/HibernateTableComposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping= /details/HibernateTableComposite.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping= /details/HibernateTableComposite.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -51,7 +51,7 @@ * | ---------------------------------------------------------------------= ---- | * -----------------------------------------------------------------------= ------ * - * @see TableStub + * @see Table * @see EntityComposite - The parent container * @see TableCombo * @see CatalogCombo Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/ac= tions/OpenSourceAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/= OpenSourceAction.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/= OpenSourceAction.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -24,7 +24,7 @@ import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; @@ -61,7 +61,7 @@ while (iterator.hasNext() && editorPart =3D=3D null) { Shape shape =3D iterator.next(); Object selection =3D shape.getOrmElement(); - if (selection instanceof Column || selection instanceof TableStub) { + if (selection instanceof Column || selection instanceof Table) { Iterator targetConnections =3D shape.getTargetConnections(= ).iterator(); while (targetConnections.hasNext()) { Connection connection =3D targetConnections.next(); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/ac= tions/ShapeHideAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/= ShapeHideAction.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/= ShapeHideAction.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -21,7 +21,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IWorkbenchPart; import org.hibernate.mediator.x.mapping.PersistentClass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.command.ToggleShapeVis= ibleStateCommand; @@ -109,7 +109,7 @@ if (null !=3D obj && obj instanceof OrmShape) { OrmShape ormShape =3D (OrmShape)obj; Object ormElement =3D ormShape.getOrmElement(); - if (ormElement instanceof PersistentClass || ormElement instanceof Tab= leStub) { + if (ormElement instanceof PersistentClass || ormElement instanceof Tab= le) { if (ormShape.isVisible()) { res =3D true; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/ac= tions/ShapeShowAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/= ShapeShowAction.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/= ShapeShowAction.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -21,7 +21,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IWorkbenchPart; import org.hibernate.mediator.x.mapping.PersistentClass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.command.ToggleShapeVis= ibleStateCommand; @@ -109,7 +109,7 @@ if (null !=3D obj && obj instanceof OrmShape) { OrmShape ormShape =3D (OrmShape)obj; Object ormElement =3D ormShape.getOrmElement(); - if (ormElement instanceof PersistentClass || ormElement instanceof Tab= leStub) { + if (ormElement instanceof PersistentClass || ormElement instanceof Tab= le) { if (!ormShape.isVisible()) { res =3D true; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/ac= tions/ToggleShapeVisibleStateAction.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/= ToggleShapeVisibleStateAction.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/= ToggleShapeVisibleStateAction.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IWorkbenchPart; import org.hibernate.mediator.x.mapping.PersistentClass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.command.ToggleShapeVis= ibleStateCommand; @@ -120,7 +120,7 @@ } if (null !=3D obj && obj instanceof OrmShape) { Object ormElement =3D ((OrmShape)obj).getOrmElement(); - if (ormElement instanceof PersistentClass || ormElement instanceof Tab= leStub) { + if (ormElement instanceof PersistentClass || ormElement instanceof Tab= le) { res =3D true; } } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/co= mmand/ToggleShapeVisibleStateCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/= ToggleShapeVisibleStateCommand.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/= ToggleShapeVisibleStateCommand.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -15,7 +15,7 @@ = import org.eclipse.gef.commands.Command; import org.hibernate.mediator.x.mapping.PersistentClass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; = /** @@ -46,7 +46,7 @@ } for (OrmShape shape : selectedShape) { Object ormElement =3D shape.getOrmElement(); - if (ormElement instanceof PersistentClass || ormElement instanceof Tabl= eStub) { + if (ormElement instanceof PersistentClass || ormElement instanceof Tabl= e) { shape.setVisible(!visState); } } @@ -56,7 +56,7 @@ for (int i =3D 0; i < selectedShape.size(); i++) { OrmShape shape =3D selectedShape.get(i); Object ormElement =3D shape.getOrmElement(); - if (ormElement instanceof PersistentClass || ormElement instanceof Tabl= eStub) { + if (ormElement instanceof PersistentClass || ormElement instanceof Tabl= e) { shape.setVisible(selectedShapeStates.get(i)); } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/mo= del/ComponentShape.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Co= mponentShape.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Co= mponentShape.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -12,7 +12,7 @@ = import java.util.Properties; = -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Property; = /** @@ -31,7 +31,7 @@ protected void initModel() { Object ormElement =3D getOrmElement(); if (ormElement instanceof Property) { - CollectionStub collection =3D (CollectionStub)((Property)ormElement).ge= tValue(); + Collection collection =3D (Collection)((Property)ormElement).getValue(); Shape bodyOrmShape =3D new Shape(collection.getKey()); bodyOrmShape.setIndent(20); addChild(bodyOrmShape); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/mo= del/Connection.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Co= nnection.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Co= nnection.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -18,7 +18,7 @@ import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.RootClass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = /** * Directed connection between 2 shapes, from source to target. = @@ -131,23 +131,23 @@ */ public ConnectionType getConnectionType() { if (source instanceof OrmShape && target instanceof OrmShape) { - if ((source.getOrmElement() instanceof TableStub) && (target.getOrmElem= ent() instanceof TableStub)) { + if ((source.getOrmElement() instanceof Table) && (target.getOrmElement(= ) instanceof Table)) { return ConnectionType.ForeignKeyConstraint; } boolean bClassMapping =3D true; - if (!(source.getOrmElement() instanceof RootClass || source.getOrmEleme= nt() instanceof TableStub)) { + if (!(source.getOrmElement() instanceof RootClass || source.getOrmEleme= nt() instanceof Table)) { bClassMapping =3D false; } - if (!(target.getOrmElement() instanceof RootClass || target.getOrmEleme= nt() instanceof TableStub)) { + if (!(target.getOrmElement() instanceof RootClass || target.getOrmEleme= nt() instanceof Table)) { bClassMapping =3D false; } if (bClassMapping) { return ConnectionType.ClassMapping; } } - if ((source.getOrmElement() instanceof TableStub && target.getOrmElement= () instanceof TableStub) || - (source.getOrmElement() instanceof TableStub && target.getOrmElement() = instanceof Column) || - (source.getOrmElement() instanceof Column && target.getOrmElement() ins= tanceof TableStub) || + if ((source.getOrmElement() instanceof Table && target.getOrmElement() i= nstanceof Table) || + (source.getOrmElement() instanceof Table && target.getOrmElement() inst= anceof Column) || + (source.getOrmElement() instanceof Column && target.getOrmElement() ins= tanceof Table) || (source.getOrmElement() instanceof Column && target.getOrmElement() ins= tanceof Column)) { return ConnectionType.ForeignKeyConstraint; } @@ -260,16 +260,16 @@ } } else if (PROPERTY_TABLE_NAME.equals(propertyId)) { if (connectType =3D=3D ConnectionType.ClassMapping) { - if (source.getOrmElement() instanceof TableStub) { - res =3D ((TableStub)(source.getOrmElement())).getName(); - } else if (target.getOrmElement() instanceof TableStub) { - res =3D ((TableStub)(target.getOrmElement())).getName(); + if (source.getOrmElement() instanceof Table) { + res =3D ((Table)(source.getOrmElement())).getName(); + } else if (target.getOrmElement() instanceof Table) { + res =3D ((Table)(target.getOrmElement())).getName(); } } else if (connectType =3D=3D ConnectionType.PropertyMapping) { - if (((Shape)source.getParent()).getOrmElement() instanceof TableStub) { - res =3D ((TableStub)(((Shape)source.getParent()).getOrmElement())).ge= tName(); - } else if (((Shape)target.getParent()).getOrmElement() instanceof Tabl= eStub) { - res =3D ((TableStub)(((Shape)target.getParent()).getOrmElement())).ge= tName(); + if (((Shape)source.getParent()).getOrmElement() instanceof Table) { + res =3D ((Table)(((Shape)source.getParent()).getOrmElement())).getNam= e(); + } else if (((Shape)target.getParent()).getOrmElement() instanceof Tabl= e) { + res =3D ((Table)(((Shape)target.getParent()).getOrmElement())).getNam= e(); } } } else if (PROPERTY_CLASS_FIELD.equals(propertyId)) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/mo= del/ElementsFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/El= ementsFactory.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/El= ementsFactory.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -17,7 +17,7 @@ import java.util.Set; = import org.hibernate.mediator.x.cfg.Configuration; -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.DependantValue; @@ -29,7 +29,7 @@ import org.hibernate.mediator.x.mapping.RootClass; import org.hibernate.mediator.x.mapping.SimpleValue; import org.hibernate.mediator.x.mapping.Subclass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.type.EntityType; import org.hibernate.mediator.x.type.Type; @@ -61,12 +61,12 @@ while (it.hasNext()) { final OrmShape shape =3D it.next(); Object ormElement =3D shape.getOrmElement(); - if (ormElement instanceof TableStub) { - TableStub databaseTable =3D (TableStub)ormElement; + if (ormElement instanceof Table) { + Table databaseTable =3D (Table)ormElement; Iterator itFK =3D (Iterator)databaseTable.getF= oreignKeyIterator(); while (itFK.hasNext()) { final ForeignKey fk =3D itFK.next(); - TableStub referencedTable =3D fk.getReferencedTable(); + Table referencedTable =3D fk.getReferencedTable(); final OrmShape referencedShape =3D getOrCreateDatabaseTable(reference= dTable); // Iterator itColumns =3D (Iterator)fk.columnIterator(); @@ -142,10 +142,10 @@ @SuppressWarnings("unchecked") protected void refreshComponentReferences(ComponentShape componentShape) { Property property =3D (Property)componentShape.getOrmElement(); - if (!(property.getValue() instanceof CollectionStub)) { + if (!(property.getValue() instanceof Collection)) { return; } - CollectionStub collection =3D (CollectionStub)property.getValue(); + Collection collection =3D (Collection)property.getValue(); Value component =3D collection.getElement(); Shape csChild0 =3D null, csChild1 =3D null; Iterator tmp =3D componentShape.getChildrenIterator(); @@ -231,7 +231,7 @@ } = @SuppressWarnings("unchecked") - protected OrmShape getOrCreateDatabaseTable(TableStub databaseTable) { + protected OrmShape getOrCreateDatabaseTable(Table databaseTable) { OrmShape tableShape =3D null; if (databaseTable !=3D null) { tableShape =3D getShape(databaseTable); @@ -257,7 +257,7 @@ } = protected OrmShape getOrCreatePersistentClass(PersistentClass persistentC= lass, = - TableStub componentClassDatabaseTable) { + Table componentClassDatabaseTable) { OrmShape classShape =3D null; if (persistentClass =3D=3D null) { return classShape; @@ -291,7 +291,7 @@ subclassShape =3D createShape(subclass); } if (((Subclass)element).isJoinedSubclass()) { - TableStub jcTable =3D ((Subclass)element).getTable(); + Table jcTable =3D ((Subclass)element).getTable(); OrmShape jcTableShape =3D getOrCreateDatabaseTable(jcTable); createConnections(subclassShape, jcTableShape); if (shouldCreateConnection(subclassShape, jcTableShape)) { @@ -357,8 +357,8 @@ if (property =3D=3D null) { return classShape; } - if (property.getValue() instanceof CollectionStub) { - Component component =3D (Component)((CollectionStub)property.getValue()= ).getElement(); + if (property.getValue() instanceof Collection) { + Component component =3D (Component)((Collection)property.getValue()).ge= tElement(); if (component !=3D null) { classShape =3D createShape(property); OrmShape tableShape =3D elements.get(Utils.getTableName(component.getT= able())); @@ -389,7 +389,7 @@ = protected OrmShape getOrCreateAssociationClass(Property property) { OrmShape classShape =3D null; - OneToMany component =3D (OneToMany)(((CollectionStub)(property.getValue(= ))).getElement()); + OneToMany component =3D (OneToMany)(((Collection)(property.getValue())).= getElement()); if (component =3D=3D null) { return classShape; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/mo= del/OrmDiagram.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Or= mDiagram.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Or= mDiagram.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -52,7 +52,7 @@ import org.hibernate.eclipse.console.utils.ProjectUtils; import org.hibernate.mediator.x.cfg.Configuration; import org.hibernate.mediator.x.mapping.RootClass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection.Conne= ctionType; @@ -1042,7 +1042,7 @@ while (it.hasNext()) { final OrmShape shape =3D it.next(); Object ormElement =3D shape.getOrmElement(); - if (ormElement instanceof TableStub) { + if (ormElement instanceof Table) { nTables++; } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/mo= del/OrmShape.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Or= mShape.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Or= mShape.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -17,7 +17,7 @@ import org.eclipse.ui.IMemento; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.KeyValue; @@ -25,7 +25,7 @@ import org.hibernate.mediator.x.mapping.RootClass; import org.hibernate.mediator.x.mapping.SimpleValue; import org.hibernate.mediator.x.mapping.Subclass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramGuide; = /** @@ -192,7 +192,7 @@ Shape bodyOrmShape =3D null; if (field.getValue().isSimpleValue() && !((SimpleValue)field.getValu= e()).isTypeSpecified()) { bodyOrmShape =3D new Shape(field); - } else if (typeIsAccessible && field.getValue() instanceof Collectio= nStub) { + } else if (typeIsAccessible && field.getValue() instanceof Collectio= n) { bodyOrmShape =3D new ComponentShape(field); } else if (typeIsAccessible && field.getValue().getType().isEntityTy= pe()) { bodyOrmShape =3D new ExpandableShape(field); @@ -283,8 +283,8 @@ } } } - } else if (ormElement instanceof TableStub) { - Iterator iterator =3D ((TableStub)getOrmElement()).getColumnIte= rator(); + } else if (ormElement instanceof Table) { + Iterator iterator =3D ((Table)getOrmElement()).getColumnIterato= r(); while (iterator.hasNext()) { Column column =3D iterator.next(); Shape bodyOrmShape =3D new Shape(column); @@ -445,7 +445,7 @@ res =3D descriptors_entity; } else if (ormElement instanceof Subclass) { //RootClass rootClass =3D ((Subclass)ormElement).getRootClass(); - } else if (ormElement instanceof TableStub) { + } else if (ormElement instanceof Table) { //Iterator iterator =3D ((Table)getOrmElement()).getColumnIterator(); //while (iterator.hasNext()) { // Column column =3D (Column)iterator.next(); @@ -461,14 +461,14 @@ public Object getPropertyValue(Object propertyId) { Object res =3D null; RootClass rootClass =3D null; - TableStub table =3D null; + Table table =3D null; Object ormElement =3D getOrmElement(); if (ormElement instanceof RootClass) { rootClass =3D (RootClass)ormElement; } else if (ormElement instanceof Subclass) { //rootClass =3D ((Subclass)ormElement).getRootClass(); - } else if (ormElement instanceof TableStub) { - table =3D (TableStub)getOrmElement(); + } else if (ormElement instanceof Table) { + table =3D (Table)getOrmElement(); } if (rootClass !=3D null) { if (ENTITY_isAbstract.equals(propertyId)) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/mo= del/SpecialRootClass.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Sp= ecialRootClass.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Sp= ecialRootClass.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -12,7 +12,7 @@ = import java.util.Iterator; = -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; @@ -45,8 +45,8 @@ return; } Component component =3D null; - if (property.getValue() instanceof CollectionStub) { - CollectionStub collection =3D (CollectionStub)property.getValue(); + if (property.getValue() instanceof Collection) { + Collection collection =3D (Collection)property.getValue(); component =3D (Component)collection.getElement(); } else if (property.getValue() instanceof Component) { component =3D (Component)property.getValue(); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/mo= del/Utils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Ut= ils.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Ut= ils.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -17,7 +17,7 @@ import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.SimpleValue; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = /** * Some common model utils. @@ -53,8 +53,8 @@ } else { res =3D rootClass.getClassName(); } - } else if (obj instanceof TableStub) { - res =3D getTableName((TableStub)obj); + } else if (obj instanceof Table) { + res =3D getTableName((Table)obj); } else if (obj instanceof Property) { Property property =3D (Property)obj; res =3D property.getPersistentClass().getEntityName() + "." + property.= getName(); //$NON-NLS-1$ @@ -77,7 +77,7 @@ return (catalog !=3D null ? catalog + "." : "") + (schema !=3D null ? sc= hema + "." : "") + name; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-N= LS-4$ } = - public static String getTableName(TableStub table) { + public static String getTableName(Table table) { return getTableName(table.getCatalog(), table.getSchema(), table.getName= ()); } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/pa= rts/ConnectionEditPart.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/Co= nnectionEditPart.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/Co= nnectionEditPart.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -28,7 +28,7 @@ import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.RootClass; import org.hibernate.mediator.x.mapping.Subclass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.editors.figures.RoundPolylineC= onnection; import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection; import org.jboss.tools.hibernate.ui.diagram.editors.model.BaseElement; @@ -98,7 +98,7 @@ Object el =3D getTargetElement(); if (el instanceof RootClass || el instanceof Subclass) { = return ResourceManager.getInstance().getColor(new RGB(210, 155, 100)); - } else if (el instanceof Column || el instanceof TableStub || el instanc= eof Property) { = + } else if (el instanceof Column || el instanceof Table || el instanceof = Property) { = return ResourceManager.getInstance().getColor(new RGB(160, 160, 160)); } return ResourceManager.getInstance().getColor(new RGB(255, 0, 0)); @@ -108,7 +108,7 @@ Object el =3D getTargetElement(); if (el instanceof RootClass || el instanceof Subclass) { = return ResourceManager.getInstance().getColor(new RGB(112, 161, 99)); - } else if (el instanceof Column || el instanceof TableStub || = + } else if (el instanceof Column || el instanceof Table || = el instanceof Component) { = return ResourceManager.getInstance().getColor(new RGB(66, 173, 247)); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/pa= rts/OrmShapeEditPart.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/Or= mShapeEditPart.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/Or= mShapeEditPart.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -23,7 +23,7 @@ import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.editors.figures.TitleFigure; import org.jboss.tools.hibernate.ui.diagram.editors.model.BaseElement; import org.jboss.tools.hibernate.ui.diagram.editors.model.ExpandableShape; @@ -124,7 +124,7 @@ if (element instanceof PersistentClass || = element instanceof Component) { return ResourceManager.getInstance().getColor(new RGB(0, 0, 0)); - } else if (element instanceof TableStub || element instanceof Property) { + } else if (element instanceof Table || element instanceof Property) { return ResourceManager.getInstance().getColor(new RGB( Integer.parseInt(ColorConstants.Colors_DatabaseColumnR), Integer.parseInt(ColorConstants.Colors_DatabaseColumnG), Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/pa= rts/ShapeEditPart.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/Sh= apeEditPart.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/Sh= apeEditPart.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -40,7 +40,7 @@ import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.SimpleValue; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.editors.figures.TitleFigure; import org.jboss.tools.hibernate.ui.diagram.editors.figures.TopLineBorder; import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection; @@ -311,7 +311,7 @@ Integer.parseInt(ColorConstants.Colors_DatabaseColumnR), Integer.parseInt(ColorConstants.Colors_DatabaseColumnG), Integer.parseInt(ColorConstants.Colors_DatabaseColumnB))); - else if (el instanceof TableStub) + else if (el instanceof Table) return ResourceManager.getInstance().getColor(new RGB( Integer.parseInt(ColorConstants.Colors_DatabaseTableR), Integer.parseInt(ColorConstants.Colors_DatabaseTableG), @@ -335,7 +335,7 @@ if (el instanceof PersistentClass || el instanceof Property || el instanceof SimpleValue || el instanceof OneToMany) { return ResourceManager.getInstance().getColor(new RGB(112, 161, 99)); - } else if (el instanceof TableStub || el instanceof Column) { + } else if (el instanceof Table || el instanceof Column) { return ResourceManager.getInstance().getColor(new RGB(66, 173, 247)); } return ResourceManager.getInstance().getColor(new RGB(255, 0, 0)); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/po= pup/PopupMenuProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/Po= pupMenuProvider.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/Po= pupMenuProvider.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -30,7 +30,7 @@ import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.editors.actions.AutoLayoutActi= on; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ExportImageAct= ion; import org.jboss.tools.hibernate.ui.diagram.editors.actions.OpenMappingAct= ion; @@ -90,7 +90,7 @@ Object first =3D selectedShape.getOrmElement(); if (first instanceof PersistentClass || first.getClass() =3D=3D Property.class - || first instanceof TableStub + || first instanceof Table || first instanceof Column) { action =3D getActionRegistry().getAction(OpenSourceAction.ACTION_ID); appendToGroup(GROUP_OPEN_SOURCE, action); @@ -115,7 +115,7 @@ if (null !=3D obj && obj instanceof OrmShape) { selectedShape =3D (Shape)obj; Object first =3D selectedShape.getOrmElement(); - if (first instanceof PersistentClass || first instanceof TableStub) { + if (first instanceof PersistentClass || first instanceof Table) { addToggleVisibleStateMenu =3D true; } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtil= s.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java= 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java= 2010-05-07 13:51:18 UTC (rev 21954) @@ -14,7 +14,7 @@ = import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.ForeignKey; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; = /** * @author some modifications from Vitali @@ -22,7 +22,7 @@ public class HibernateUtils { = public static boolean isPrimaryKey(Column column) { - TableStub table =3D getTable(column); + Table table =3D getTable(column); if (table !=3D null) { if (table.getPrimaryKey() !=3D null) { if (table.getPrimaryKey().containsColumn(column)) { @@ -34,7 +34,7 @@ } = public static boolean isForeignKey(Column column) { - TableStub table =3D getTable(column); + Table table =3D getTable(column); if (table !=3D null) { Iterator iter =3D table.getForeignKeyIterator(); while (iter.hasNext()) { @@ -48,7 +48,7 @@ = } = - public static TableStub getTable(Column column) { + public static Table getTable(Column column) { if (column.getValue() !=3D null) { return column.getValue().getTable(); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java 20= 10-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java 20= 10-05-07 13:51:18 UTC (rev 21954) @@ -18,17 +18,17 @@ import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.DependantValue; import org.hibernate.mediator.x.mapping.IdentifierBag; -import org.hibernate.mediator.x.mapping.ListStub; +import org.hibernate.mediator.x.mapping.List; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; +import org.hibernate.mediator.x.mapping.Map; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.PrimitiveArray; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.SetStub; +import org.hibernate.mediator.x.mapping.Set; import org.hibernate.mediator.x.mapping.SimpleValue; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.type.Type; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; @@ -42,8 +42,8 @@ = public static ImageDescriptor getImageDescriptor(final Object obj) { String imageName =3D null; - if (obj instanceof TableStub) { - imageName =3D getImageName((TableStub)obj); + if (obj instanceof Table) { + imageName =3D getImageName((Table)obj); } else if (obj instanceof Column) { imageName =3D getImageName((Column)obj); } else if (obj instanceof Property) { @@ -66,7 +66,7 @@ * @param table * @return */ - public static String getImageName(TableStub table) { + public static String getImageName(Table table) { return "Image_DatabaseTable"; //$NON-NLS-1$ } = @@ -80,7 +80,7 @@ String str =3D "Image_DatabaseColumn"; //$NON-NLS-1$ final boolean primaryKey =3D HibernateUtils.isPrimaryKey(column); final boolean foreignKey =3D HibernateUtils.isForeignKey(column); - final TableStub table =3D HibernateUtils.getTable(column); + final Table table =3D HibernateUtils.getTable(column); if (column.isUnique()) { str =3D "Image_DatabaseUniqueKeyColumn"; //$NON-NLS-1$ } else if (primaryKey && table !=3D null && foreignKey) { @@ -132,11 +132,11 @@ str =3D "Image_Collection_primitive_array"; //$NON-NLS-1$ } else if (value instanceof Array) { str =3D "Image_Collection_array"; //$NON-NLS-1$ - } else if (value instanceof ListStub) { + } else if (value instanceof List) { str =3D "Image_Collection_list"; //$NON-NLS-1$ - } else if (value instanceof SetStub) { + } else if (value instanceof Set) { str =3D "Image_Collection_set"; //$NON-NLS-1$ - } else if (value instanceof MapStub) { + } else if (value instanceof Map) { str =3D "Image_Collection_map"; //$NON-NLS-1$ } else if (value instanceof Bag) { str =3D "Image_Collection_bag"; //$NON-NLS-1$ Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.j= boss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelMap.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelMap.java 20= 10-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.t= ools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelMap.java 20= 10-05-07 13:51:18 UTC (rev 21954) @@ -18,7 +18,7 @@ import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.SimpleValue; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.type.Type; import org.jboss.tools.hibernate.ui.diagram.editors.model.Utils; @@ -36,8 +36,8 @@ = public static String getLabel(final Object obj) { String label =3D null; - if (obj instanceof TableStub) { - label =3D getParticularLabel((TableStub)obj); + if (obj instanceof Table) { + label =3D getParticularLabel((Table)obj); } else if (obj instanceof Column) { label =3D getParticularLabel((Column)obj); } else if (obj instanceof Property) { @@ -59,7 +59,7 @@ return label; } = - public static String getParticularLabel(TableStub table) { + public static String getParticularLabel(Table table) { return Utils.getTableName(table); } = @@ -160,7 +160,7 @@ StringBuffer name =3D new StringBuffer(); name.append(persistentClass.getEntityName() !=3D null ? = persistentClass.getEntityName() : persistentClass.getClassName()); - TableStub table =3D persistentClass.getTable(); + Table table =3D persistentClass.getTable(); if (table !=3D null) { final String tableName =3D Utils.getTableName(table); if (tableName !=3D null) { Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hib= ernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/hbmexporte= r/HbmExporterTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate= .eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/hbmexporter/HbmE= xporterTest.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate= .eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/hbmexporter/HbmE= xporterTest.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -31,14 +31,11 @@ import org.hibernate.eclipse.jdt.ui.wizards.ConfigurationActor; import org.hibernate.mediator.x.cfg.Configuration; import org.hibernate.mediator.x.mapping.Array; -import org.hibernate.mediator.x.mapping.ListStub; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.PrimitiveArray; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.SetStub; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.type.IntegerType; = @@ -163,8 +160,8 @@ Value value =3D listProp.getValue(); assertNotNull(value); assertTrue("Expected to get List-type mapping", //$NON-NLS-1$ = - value.getClass()=3D=3DListStub.class); - ListStub list =3D (ListStub)value; + value.getClass()=3D=3DList.class); + org.hibernate.mediator.x.mapping.List list =3D (org.hibernate.mediator.x= .mapping.List)value; assertTrue(list.getElement() instanceof OneToMany); assertTrue(list.getCollectionTable().Obj().equals(b.getTable().Obj())); assertNotNull(list.getIndex()); @@ -181,8 +178,8 @@ Value value =3D setProp.getValue(); assertNotNull(value); assertTrue("Expected to get Set-type mapping", //$NON-NLS-1$ - value.getClass()=3D=3DSetStub.class); - SetStub set =3D (SetStub)value; + value.getClass()=3D=3DSet.class); + org.hibernate.mediator.x.mapping.Set set =3D (org.hibernate.mediator.x.m= apping.Set)value; assertTrue(set.getElement() instanceof OneToMany); assertTrue(set.getCollectionTable().Obj().equals(b.getTable().Obj())); assertNotNull(set.getKey()); @@ -198,8 +195,8 @@ Value value =3D mapValue.getValue(); assertNotNull(value); assertTrue("Expected to get Map-type mapping", //$NON-NLS-1$ = - value.getClass()=3D=3DMapStub.class); - MapStub map =3D (MapStub)value; + value.getClass()=3D=3DMap.class); + org.hibernate.mediator.x.mapping.Map map =3D (org.hibernate.mediator.x.m= apping.Map)value; assertTrue(map.getElement() instanceof OneToMany); assertTrue(map.getCollectionTable().Obj().equals(b.getTable().Obj())); assertNotNull(map.getKey()); --===============5387302026967985556==-- From jbosstools-commits at lists.jboss.org Fri May 7 10:15:36 2010 Content-Type: multipart/mixed; boundary="===============6798902481948276275==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21955 - in trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext: config and 2 other directories. Date: Fri, 07 May 2010 10:15:36 -0400 Message-ID: <201005071415.o47EFaV3028461@svn01.web.mwc.hst.phx2.redhat.com> --===============6798902481948276275== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: lzoubek(a)redhat.com Date: 2010-05-07 10:15:34 -0400 (Fri, 07 May 2010) New Revision: 21955 Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/RemoveServer.java Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/RequirementAwareSuite.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTEclipseExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTTestExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/Annotations.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/TestConfigurator.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/AddServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/ClearProjects.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/RequirementBase.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/StopServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/view/ServersView.java Log: SWTbot extensions : auto-shutdown server after all tests finished, improved= @Server annotation Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/RequirementAwareSuite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/RequirementAwareSuite.java 2010-05-07 13:51:18 UTC (rev 21954) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/RequirementAwareSuite.java 2010-05-07 14:15:34 UTC (rev 21955) @@ -9,6 +9,7 @@ import org.jboss.tools.ui.bot.ext.config.TestConfigurator; import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; import org.jboss.tools.ui.bot.ext.config.requirement.RequirementBase; +import org.junit.runner.Description; import org.junit.runner.Runner; import org.junit.runner.notification.RunListener; import org.junit.runner.notification.RunNotifier; @@ -26,6 +27,9 @@ * @author lzoubek(a)redhat.com */ public class RequirementAwareSuite extends Suite { + // we have one global instance of cleanup listener + final static DoAfterAllTestsRunListener cleanUp =3D new DoAfterAllTestsRu= nListener(); + class ReqAwareClassRunner extends BlockJUnit4ClassRunner { private final List requirements; = @@ -37,14 +41,19 @@ = @Override public void run(RunNotifier notifier) { - // adding ability to create screen shot (taken from SWTBotJunit4ClassRu= nner) + // planned test counter must know about all tests (methods) within a cl= ass + cleanUp.incrPlanned(getChildren().size()-1); + // ensure that we have exactly 1 cleanup listener registered + notifier.removeListener(cleanUp); + notifier.addListener(cleanUp); + // adding ability to create screen shot (taken from + // SWTBotJunit4ClassRunner) RunListener failureSpy =3D new ScreenshotCaptureListener(); notifier.removeListener(failureSpy); - notifier.addListener(failureSpy); = + notifier.addListener(failureSpy); try { super.run(notifier); - } - finally { + } finally { notifier.removeListener(failureSpy); } } @@ -57,7 +66,7 @@ r.fulfill(); } } catch (Exception e) { - log.error("Fulfilling failed", e); = + log.error("Fulfilling failed", e); } = return super.withBeforeClasses(statement); @@ -74,19 +83,74 @@ .getClassRequirements(klass); if (reqs !=3D null) { if (!TestConfigurator.checkConfig()) { - log.info("Skipping class '" + klass.getCanonicalName()+"' - incorrect= configuration"); + log.info("Skipping class '" + klass.getCanonicalName() + + "' - incorrect configuration"); return null; } log.info("Returning runner for test class " + klass.getCanonicalName()); - return new ReqAwareClassRunner(klass, reqs); = + // ensure creating runner instance + Runner runner =3D new ReqAwareClassRunner(klass, reqs); + // increment number of tests planned to run by 1 (class contains at le= ast 1 test method) + cleanUp.incrPlanned(); + return runner; } - log.info("Skipping class '" + klass.getCanonicalName() + "' - annotatio= ns do not met configuration"); + log.info("Skipping class '" + klass.getCanonicalName() + + "' - annotations do not met configuration"); return null; } = } = + /** + * listener which listens to test runs, does some cleanup after all tests + * have run + * = + * @author lzoubek + * = + */ + static class DoAfterAllTestsRunListener extends RunListener { + // As we can run more suites at once, we need to count tests which are p= lanned to run + // and the ones which already passed (or failed), perform cleanups when = the last one finishes + private int testsAboutToRun =3D 0; + private int testsFinished =3D 0; + + public void incrPlanned() { + testsAboutToRun +=3D 1; + } + public void incrPlanned(int amount) { + testsAboutToRun +=3D amount; + } + + public void incrFinished() { + testsFinished +=3D 1; + } + + public int getPlanned() { + return testsAboutToRun; + } + + public int getFinished() { + return testsFinished; + } = + @Override + public void testFinished(Description description) throws Exception { + incrFinished(); + log.info("Finished tests : "+getFinished()+"/"+getPlanned()); + if (getFinished() >=3D getPlanned()) { + log.info("All tests finished, performing cleanup requirements "); + try { + RequirementBase.createStopServer().fulfill(); + + log.info("All cleanup requirements performed"); + } catch (Exception ex) { + log.error("Unable to fulfill cleanup requirements", ex); + } + } + super.testFinished(description); + } + } + private final ArrayList runners =3D new ArrayList(); = /** @@ -103,7 +167,6 @@ public RequirementAwareSuite(Class klass) throws Throwable { super(klass, Collections. emptyList()); runners.add(new Suite(klass, new RequirementAwareRunnerBuilder())); - } = @Override Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTEclipseExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-07 13:51:18 UTC (rev 21954) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-07 14:15:34 UTC (rev 21955) @@ -571,7 +571,30 @@ } = } + public void removeServerRuntime(String runtimeName) { + log.info("Removing Server Runtime: " + runtimeName ); + SWTBot wiz =3D open + .preferenceOpen(ActionItem.Preference.ServerRuntimeEnvironments.LAB= EL); + SWTBotTable tbRuntimeEnvironments =3D bot.table(); = + // first check if Environment doesn't exist + int numRows =3D tbRuntimeEnvironments.rowCount(); + if (numRows > 0) { + int currentRow =3D 0; + while (currentRow < numRows) { + if (tbRuntimeEnvironments.cell(currentRow, 0).equalsIgnoreCase( + runtimeName)) { + tbRuntimeEnvironments.select(currentRow); + wiz.button(IDELabel.Button.REMOVE).click(); + open.finish(wiz,IDELabel.Button.OK); + log.info("Server Runtime '" + runtimeName +"' removed."); + return; + } else { + currentRow++; + } + } + } + } /** * adds given java to Installed JRE's * = Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTTestExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTTestExt.java 2010-05-07 13:51:18 UTC (rev 21954) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTTestExt.java 2010-05-07 14:15:34 UTC (rev 21955) @@ -65,5 +65,6 @@ public static int TIME_5S =3D Timing.time5S(); public static int TIME_10S =3D Timing.time10S(); public static int TIME_20S =3D Timing.time20S(); + = = } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/Annotations.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/Annotations.java 2010-05-07 13:51:18 UTC (rev 21954) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/Annotations.java 2010-05-07 14:15:34 UTC (rev 21955) @@ -70,6 +70,11 @@ */ boolean required() default true; /** + * state (default Running) + * @return + */ + ServerState state() default ServerState.Running; + /** * server type to match (Default ALL) * @return */ @@ -91,7 +96,7 @@ * */ @Retention(RetentionPolicy.RUNTIME) - public @interface Seam { + public @interface Seam { = /** * true if Seam is required (default) * @return @@ -133,6 +138,20 @@ String operator() default "=3D"; = } + public enum ServerState { + /** + * server will run + */ + Running, + /** + * server present, but not running + */ + NotRunning, + /** + * server (and runtime) not present + */ + Disabled + } public enum ServerType { /** * EAP Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/TestConfigurator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/TestConfigurator.java 2010-05-07 13:51:18 UTC (rev 21954) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/TestConfigurator.java 2010-05-07 14:15:34 UTC (rev 21955) @@ -17,6 +17,7 @@ import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; import org.jboss.tools.ui.bot.ext.config.Annotations.Seam; import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; import org.jboss.tools.ui.bot.ext.config.requirement.RequirementBase; = @@ -123,7 +124,7 @@ private static RequirementBase getServerRequirement(Server s) { if (!s.required()) { return null; - } + } = if (!s.type().equals(ServerType.ALL)) { if (s.type().equals(ServerType.EAP) && !server.type.equals(ServerBean.ServerType.EAP)) { @@ -134,10 +135,19 @@ return null; } } - if (!matches(server.version, s.operator(), s.version())) { return null; } + if (ServerState.Disabled.equals(s.state())) { + RequirementBase removeServer =3D RequirementBase.createRemoveServer(); + removeServer.getDependsOn().add(RequirementBase.createStopServer()); + return removeServer; + } + if (ServerState.NotRunning.equals(s.state())) { + RequirementBase stopServer =3D RequirementBase.createStopServer(); + stopServer.getDependsOn().add(RequirementBase.createAddServer()); + return stopServer; + } return RequirementBase.createStartServer(); } = Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/requirement/AddServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddServer.java 2010-05-07 13:51:18 UTC (rev 21954) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddServer.java 2010-05-07 14:15:34 UTC (rev 21955) @@ -46,6 +46,7 @@ SWTTestExt.configuredState.getServer().name=3DruntimeName; SWTTestExt.configuredState.getServer().version=3DTestConfigurator.server= .version; SWTTestExt.configuredState.getServer().type=3DTestConfigurator.server.ty= pe.toString(); + SWTTestExt.configuredState.getServer().withJavaVersion =3D TestConfigura= tor.server.withJavaVersion; } = = Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/requirement/ClearProjects.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/ClearProjects.java 2010-05-07 13:51:18 UTC (rev 21954) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/ClearProjects.java 2010-05-07 14:15:34 UTC (rev 21955) @@ -1,6 +1,5 @@ package org.jboss.tools.ui.bot.ext.config.requirement; = -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.SWTTestExt; /** * undeploys and deletes all projects @@ -12,13 +11,7 @@ @Override public boolean checkFulfilled() { try { = - SWTBotTreeItem[] items =3D SWTTestExt.projectExplorer.show().bot().tree= ().getAllItems(); - if (items.length!=3D0) { - for (SWTBotTreeItem item : items) { - log.info("Item "+item.getText()); = - } - } - return items.length=3D=3D0; + return SWTTestExt.projectExplorer.show().bot().tree().getAllItems().len= gth=3D=3D0; = } catch (Exception ex) { log.error("Unable to determine count of projects",ex); Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bo= t/ext/config/requirement/RemoveServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/RemoveServer.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/RemoveServer.java 2010-05-07 14:15:34 UTC (rev 21955) @@ -0,0 +1,28 @@ +package org.jboss.tools.ui.bot.ext.config.requirement; + +import org.jboss.tools.ui.bot.ext.SWTTestExt; + +/** + * removes server and server runtime + * @author lzoubek(a)redhat.com + * + */ +public class RemoveServer extends RequirementBase { + + @Override + public boolean checkFulfilled() { + return !SWTTestExt.configuredState.getServer().isConfigured; + } + + @Override + public void handle() { + SWTTestExt.servers.deleteServer(SWTTestExt.configuredState.getServer().n= ame); + SWTTestExt.eclipse.removeServerRuntime(SWTTestExt.configuredState.getSer= ver().name); + SWTTestExt.configuredState.getServer().isConfigured=3Dfalse; + SWTTestExt.configuredState.getServer().name=3Dnull; + SWTTestExt.configuredState.getServer().version=3Dnull; + SWTTestExt.configuredState.getServer().type=3Dnull; + SWTTestExt.configuredState.getServer().withJavaVersion=3Dnull; + } + +} Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jbo= ss/tools/ui/bot/ext/config/requirement/RemoveServer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/requirement/RequirementBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/RequirementBase.java 2010-05-07 13:51:18 UTC (rev 219= 54) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/RequirementBase.java 2010-05-07 14:15:34 UTC (rev 219= 55) @@ -148,6 +148,16 @@ return req; } = + public static RequirementBase createStopServer() { + RequirementBase req =3D new StopServer(); + return req; + } + + public static RequirementBase createRemoveServer() { + RequirementBase req =3D new RemoveServer(); + return req; + } + = = } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/requirement/StopServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/StopServer.java 2010-05-07 13:51:18 UTC (rev 21954) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/StopServer.java 2010-05-07 14:15:34 UTC (rev 21955) @@ -2,7 +2,7 @@ = import org.jboss.tools.ui.bot.ext.SWTTestExt; /** - * Stops server (as dependent requirement has {@link AddServer} + * Stops server * @author Vladimir Pakan * */ Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/view/ServersView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/view/ServersView.java 2010-05-07 13:51:18 UTC (rev 21954) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/view/ServersView.java 2010-05-07 14:15:34 UTC (rev 21955) @@ -56,24 +56,42 @@ * @param serverName */ public void stopServer(String serverName) { - SWTBot bot =3D open.viewOpen(ServerServers.LABEL).bot(); + SWTBot bot =3D show().bot(); SWTBotTree tree =3D bot.tree(); SWTBotTreeItem server =3D findServerByName(tree,serverName); if (server!=3Dnull) { ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Me= nu.STOP, false)).click(); new SWTUtilExt(this).waitForNonIgnoredJobs(); - new SWTUtilExt(this).waitForAll(Timing.time3S()); + new SWTUtilExt(this).waitForAll(Timing.time10S()); = } } /** + * deletes server with given name + * @param serverName + */ + public void deleteServer(String serverName) { + SWTBot bot =3D show().bot(); + SWTBotTree tree =3D bot.tree(); + SWTBotTreeItem server =3D findServerByName(tree,serverName); + if (server!=3Dnull) { + ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); + new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, IDELabel.Me= nu.DELETE, false)).click(); + SWTBotShell shell =3D shell("Delete Server"); + shell.activate(); + open.finish(shell.bot(), IDELabel.Button.OK); + log.info("Removed server: " + serverName); + = + } + } + /** * starts application server by given name * @param serverName */ public void startServer(String serverName) { show(); - SWTBot bot =3D open.viewOpen(ServerServers.LABEL).bot(); + SWTBot bot =3D show().bot(); SWTBotTree tree =3D bot.tree(); SWTBotTreeItem server =3D findServerByName(tree,serverName); if (server!=3Dnull) { --===============6798902481948276275==-- From jbosstools-commits at lists.jboss.org Fri May 7 10:52:46 2010 Content-Type: multipart/mixed; boundary="===============0158200766270104874==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21956 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 4 other directories. Date: Fri, 07 May 2010 10:52:45 -0400 Message-ID: <201005071452.o47Eqjaf032189@svn01.web.mwc.hst.phx2.redhat.com> --===============0158200766270104874== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-07 10:52:45 -0400 (Fri, 07 May 2010) New Revision: 21956 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/producers/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/producers/FunnelWeaver.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/producers/SpiderProducerVariableType_Broken.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= IParametedType.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : producer field type is a type variable Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/IParametedType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IParametedType.java 2010-05-07 14:15:34 UTC (rev 21955) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IParametedType.java 2010-05-07 14:52:45 UTC (rev 21956) @@ -21,7 +21,7 @@ public interface IParametedType { = /** - * Returns the corresponding IType of the declaration. + * Returns the corresponding IType of the declaration. May be null. * = * @return the corresponding IType of the declaration. */ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-07 14:15:34 UTC (rev 219= 55) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-07 14:52:45 UTC (rev 219= 56) @@ -31,6 +31,7 @@ import org.eclipse.jdt.core.IMemberValuePair; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.ITypeParameter; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.Signature; import org.eclipse.wst.validation.internal.core.ValidationException; @@ -74,6 +75,9 @@ import org.jboss.tools.jst.web.kb.validation.IValidator; import org.jboss.tools.jst.web.kb.validation.ValidationUtil; = +/** + * @author Alexey Kazakov + */ public class CDICoreValidator extends CDIValidationErrorManager implements= IValidator { public static final String ID =3D "org.jboss.tools.cdi.core.CoreValidator= "; = @@ -472,6 +476,9 @@ boolean businessMethod =3D false; for (IParametedType type : types) { IType sourceType =3D type.getType(); + if(sourceType=3D=3Dnull) { + continue; + } IAnnotation annotation =3D sourceType.getAnnotation(CDIConstants.LO= CAL_ANNOTATION_TYPE_NAME); if(annotation=3D=3Dnull) { annotation =3D sourceType.getAnnotation("Local"); //$NON-NLS-N1 @@ -503,73 +510,162 @@ private static final String[] RESOURCE_ANNOTATIONS =3D {CDIConstants.RESO= URCE_ANNOTATION_TYPE_NAME, CDIConstants.WEB_SERVICE_REF_ANNOTATION_TYPE_NAM= E, CDIConstants.EJB_ANNOTATION_TYPE_NAME, CDIConstants.PERSISTENCE_CONTEXT_= ANNOTATION_TYPE_NAME, CDIConstants.PERSISTENCE_UNIT_ANNOTATION_TYPE_NAME}; = private void validateProducer(IProducer producer) { - if(producer instanceof IProducerField) { - /* - * 3.5.1. Declaring a resource - * - producer field declaration specifies an EL name (together with on= e of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) - */ - IProducerField producerField =3D (IProducerField)producer; - if(producerField.getName()!=3Dnull) { - IAnnotationDeclaration declaration; - for (String annotationType : RESOURCE_ANNOTATIONS) { - declaration =3D producerField.getAnnotation(annotationType); - if(declaration!=3Dnull) { - IAnnotationDeclaration nameDeclaration =3D producerField.getAnnotati= on(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); - if(nameDeclaration!=3Dnull) { - declaration =3D nameDeclaration; + try { + Set typeDeclarations =3D producer + .getAllTypeDeclarations(); + ITypeDeclaration typeDeclaration =3D null; + if (!typeDeclarations.isEmpty()) { + /* + * 3.3. Producer methods + * - producer method return type contains a wildcard type parameter + * = + * 2.2.1 Legal bean types + * - a parameterized type that contains a wildcard type parameter is = not a legal bean type. + * = + * 3.4. Producer fields + * - producer field type contains a wildcard type parameter + */ + typeDeclaration =3D typeDeclarations.iterator() + .next(); + String[] paramTypes =3D Signature + .getTypeArguments(typeDeclaration.getSignature()); + for (String paramType : paramTypes) { + if (Signature.getTypeSignatureKind(paramType) =3D=3D Signature.WILDCA= RD_TYPE_SIGNATURE) { + if (producer instanceof IProducerField) { + addError( + CDIValidationMessages.PRODUCER_FIELD_TYPE_HAS_WILDCARD, + CDIPreferences.PRODUCER_FIELD_TYPE_HAS_WILDCARD, + typeDeclaration, producer.getResource()); + } else { + addError( + CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, + CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, + typeDeclaration, producer.getResource()); } - addError(CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME,= CDIPreferences.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, declaration, producer= .getResource()); } } } - /* - * 3.4. Producer fields - * - producer field type contains a wildcard type parameter - */ - Set typeDeclarations =3D producerField.getAllTypeDecl= arations(); - if(!typeDeclarations.isEmpty()) { - ITypeDeclaration typeDeclaration =3D typeDeclarations.iterator().next(= ); - String[] paramTypes =3D Signature.getTypeArguments(typeDeclaration.get= Signature()); - for (String paramType : paramTypes) { - if((paramType.length()=3D=3D1 && paramType.charAt(0) =3D=3D Signature= .C_STAR) || paramType.charAt(0) =3D=3D Signature.C_EXTENDS) { - addError(CDIValidationMessages.PRODUCER_FIELD_TYPE_HAS_WILDCARD, CDI= Preferences.PRODUCER_FIELD_TYPE_HAS_WILDCARD, typeDeclaration, producer.get= Resource()); + + String[] typeVariables =3D producer.getBeanClass().getTypeParameterSign= atures(); + + if (producer instanceof IProducerField) { + /* + * 3.5.1. Declaring a resource + * - producer field declaration specifies an EL name (together with o= ne of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRe= f) + */ + IProducerField producerField =3D (IProducerField) producer; + if (producerField.getName() !=3D null) { + IAnnotationDeclaration declaration; + for (String annotationType : RESOURCE_ANNOTATIONS) { + declaration =3D producerField + .getAnnotation(annotationType); + if (declaration !=3D null) { + IAnnotationDeclaration nameDeclaration =3D producerField + .getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); + if (nameDeclaration !=3D null) { + declaration =3D nameDeclaration; + } + addError( + CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, + CDIPreferences.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, + declaration, producer.getResource()); + } } } - } - } else { - IProducerMethod producerMethod =3D (IProducerMethod)producer; - List params =3D producerMethod.getParameters(); - Set declarations =3D new HashSet(); - declarations.add(producerMethod.getAnnotation(CDIConstants.PRODUCES_ANN= OTATION_TYPE_NAME)); - for (IParameter param : params) { /* - * 3.3.6. Declaring a disposer method - * - a disposer method is annotated @Produces. - * = - * 3.3.2. Declaring a producer method - * - a has a parameter annotated @Disposes + * 3.4. Producer fields + * - producer field type is a type variable */ - ITextSourceReference declaration =3D param.getAnnotationPosition(CDICo= nstants.DISPOSES_ANNOTATION_TYPE_NAME); - if(declaration!=3Dnull) { - declarations.add(declaration); + if(typeVariables.length>0) { + String typeSign =3D producerField.getField().getTypeSignature(); + String typeString =3D Signature.toString(typeSign); + for (String variableSig : typeVariables) { + String variableName =3D Signature.getTypeVariable(variableSig); + if(typeString.equals(variableName)) { + addError( + CDIValidationMessages.PRODUCER_FIELD_TYPE_IS_VARIABLE, + CDIPreferences.PRODUCER_FIELD_TYPE_IS_VARIABLE, + typeDeclaration!=3Dnull?typeDeclaration:producer, producer.getRes= ource()); + } + } } + } else { + IProducerMethod producerMethod =3D (IProducerMethod) producer; + List params =3D producerMethod.getParameters(); + Set declarations =3D new HashSet(); + declarations + .add(producerMethod + .getAnnotation(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME)); + for (IParameter param : params) { + /* + * 3.3.6. Declaring a disposer method + * - a disposer method is annotated @Produces. + * = + * 3.3.2. Declaring a producer method + * - a has a parameter annotated @Disposes + */ + ITextSourceReference declaration =3D param + .getAnnotationPosition(CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); + if (declaration !=3D null) { + declarations.add(declaration); + } + /* + * 3.3.2. Declaring a producer method + * - a has a parameter annotated @Observers + * = + * 10.4.2. Declaring an observer method + * - an observer method is annotated @Produces + */ + declaration =3D param + .getAnnotationPosition(CDIConstants.OBSERVERS_ANNOTATION_TYPE_NAME); + if (declaration !=3D null) { + declarations.add(declaration); + } + } + if (declarations.size() > 1) { + for (ITextSourceReference declaration : declarations) { + addError( + CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED, + CDIPreferences.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED, + declaration, producer.getResource()); + } + } + /* - * 3.3.2. Declaring a producer method - * - a has a parameter annotated @Observers - * = - * 10.4.2. Declaring an observer method - * - an observer method is annotated @Produces + * 3.3. Producer methods + * - producer method return type is a type variable + * = + * 2.2.1 - Legal bean types + * - a type variable is not a legal bean type */ - declaration =3D param.getAnnotationPosition(CDIConstants.OBSERVERS_ANN= OTATION_TYPE_NAME); - if(declaration!=3Dnull) { - declarations.add(declaration); + String typeSign =3D producerMethod.getMethod().getReturnType(); + String typeString =3D Signature.toString(typeSign); + ITypeParameter[] paramTypes =3D producerMethod.getMethod().getTypePara= meters(); + boolean marked =3D false; + for (ITypeParameter param : paramTypes) { + String variableName =3D param.getElementName(); + if(variableName.equals(typeString)) { + addError( + CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, + CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, + typeDeclaration!=3Dnull?typeDeclaration:producer, producer.getReso= urce()); + marked =3D true; + } } - } - if(declarations.size()>1) { - for (ITextSourceReference declaration : declarations) { - addError(CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED= , CDIPreferences.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED, declaration, produ= cer.getResource()); + if(!marked && typeVariables.length>0) { + for (String variableSig : typeVariables) { + String variableName =3D Signature.getTypeVariable(variableSig); + if(typeString.equals(variableName)) { + addError( + CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, + CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, + typeDeclaration!=3Dnull?typeDeclaration:producer, producer.getRes= ource()); + } + } } } + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); } } = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-07 14:15:34 UTC (rev 21955) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-07 14:52:45 UTC (rev 21956) @@ -44,9 +44,9 @@ new String[][]{ {CDIPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_illegalTypeInTypedDeclaration_label}, {CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, CDIPreference= sMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWild= card_label}, -// {CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, CDIPreferenc= esMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeIsVari= able_label}, -// {CDIPreferences.PRODUCER_FIELD_TYPE_HAS_WILDCARD, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_producerFieldTypeHasWildcard_label}, -// {CDIPreferences.PRODUCER_FIELD_TYPE_IS_VARIABLE, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_producerFieldTypeIsVariable_label}, + {CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, CDIPreferences= Messages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeIsVariab= le_label}, + {CDIPreferences.PRODUCER_FIELD_TYPE_HAS_WILDCARD, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_producerFieldTypeHasWildcard_label}, + {CDIPreferences.PRODUCER_FIELD_TYPE_IS_VARIABLE, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_producerFieldTypeIsVariable_label}, // {CDIPreferences.PRODUCER_FIELD_TYPE_DOES_NOT_MATCH_JAVA_EE_OBJECT, CD= IPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerFieldTypeDoe= sNotMatchJavaEeObject_label}, // {CDIPreferences.INJECTION_TYPE_IS_VARIABLE, CDIPreferencesMessages.CD= IValidatorConfigurationBlock_pb_injectionTypeIsVariable_label}, {CDIPreferences.STEREOTYPE_IS_ANNOTATED_TYPED, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_stereotypeIsAnnotatedTyped_label}, Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/producers/FunnelWeaver.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/FunnelWeaver.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/FunnelWeaver.java 2010-05-07 14:52:45 UTC (rev 21956) @@ -0,0 +1,5 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.producers; + +class FunnelWeaver { + = +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/producers/FunnelWeaver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/producers/SpiderProducerVariableType_Broken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/SpiderProducerVariableType_Broken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/SpiderProducerVariableType_Broken.java 2010-05-07 14:52= :45 UTC (rev 21956) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.producers; + +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.InjectionPoint; + +public class SpiderProducerVariableType_Broken { + + @Produces public FunnelWeaver getAnotherFunnelWeaver; + + @Produces T getAnotherFunnelWeaver2; + + @Produces + public T create(InjectionPoint point) { + return null; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/producers/SpiderProducerVariableType_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-07 14:15:34 UTC (rev 21955) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-07 14:52:45 UTC (rev 21956) @@ -261,18 +261,72 @@ } = /** + * 3.3. Producer methods + * - producer method return type contains a wildcard type parameter + * = + * 2.2.1 - Legal bean types + * - a parameterized type that contains a wildcard type parameter is not= a legal bean type. + * = + * @throws Exception + */ + public void testParameterizedReturnTypeWithWildcard() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/parameterizedTypeWithWildcard/Spider= Producer.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_HA= S_WILDCARD, 24); + } + + /** * 3.4. Producer fields * - producer field type contains a wildcard type parameter * = * @throws Exception */ - public void testParameterizedReturnTypeWithWildcard() throws Exception { + public void testParameterizedTypeWithWildcard() throws Exception { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/field/definition/broken/parameterizedReturnTypeWit= hWildcard/SpiderProducerWildCardType_Broken.java"); AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, A= bstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD= _TYPE_HAS_WILDCARD, 23, 1008, 1033); AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, A= bstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD= _TYPE_HAS_WILDCARD, 24, 10011, 1036); } = /** + * 3.3. Producer methods + * - producer method return type is a type variable + * = + * 2.2.1 - Legal bean types + * - a type variable is not a legal bean type + * = + * @throws Exception + */ + public void testParameterizedType() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/= TProducer.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_IS= _VARIABLE, 25); + file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/v= alidation/producers/SpiderProducerVariableType_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_IS= _VARIABLE, 13); + } + + /** + * 3.4. Producer methods + * - producer field type is a type variable + * = + * @throws Exception + */ + public void testVariableType() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/SpiderProducerVariableType_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD_TYPE_IS_VARIABL= E, 10); + } + + /** + * 3.4. Producer fields + * - producer field with a parameterized type with a type variable decla= res any scope other than @Dependent + * // TODO + * = + * @throws Exception + */ +// public void testParameterizedReturnTypeWithTypeVariable() throws Except= ion { +// IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tes= ts/jbt/validation/producers/SpiderProducerVariableType_Broken.java"); +// AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file,= AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOP= E_FOR_PRODUCER_FIELD, 23, 1008, 1033); +// AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file,= AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOP= E_FOR_PRODUCER_FIELD, 24, 10011, 1036); +// } + + /** * 3.9.1. Declaring an initializer method * - an initializer method has a parameter annotated @Disposes * = --===============0158200766270104874==-- From jbosstools-commits at lists.jboss.org Fri May 7 11:54:56 2010 Content-Type: multipart/mixed; boundary="===============4285292136689727428==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21957 - in branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test: src/org/jboss/tools/esb/core/test and 1 other directory. Date: Fri, 07 May 2010 11:54:56 -0400 Message-ID: <201005071554.o47Fsup5011867@svn01.web.mwc.hst.phx2.redhat.com> --===============4285292136689727428== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-07 11:54:55 -0400 (Fri, 07 May 2010) New Revision: 21957 Modified: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/projec= ts/Test/esb-1.2/jboss-esb-notifiers.xml branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/or= g/jboss/tools/esb/core/test/ESBModelTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6164 Modified: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test= /projects/Test/esb-1.2/jboss-esb-notifiers.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/proje= cts/Test/esb-1.2/jboss-esb-notifiers.xml 2010-05-07 14:52:45 UTC (rev 21956) +++ branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/proje= cts/Test/esb-1.2/jboss-esb-notifiers.xml 2010-05-07 15:54:55 UTC (rev 21957) @@ -21,6 +21,12 @@ + + attachThisFile.txt + Modified: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test= /src/org/jboss/tools/esb/core/test/ESBModelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/o= rg/jboss/tools/esb/core/test/ESBModelTest.java 2010-05-07 14:52:45 UTC (rev= 21956) +++ branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/o= rg/jboss/tools/esb/core/test/ESBModelTest.java 2010-05-07 15:54:55 UTC (rev= 21957) @@ -273,6 +273,36 @@ assertTrue(errorList.toString(), errorList.length() =3D=3D 0); } = + public void testNotifyEmail() { + XModelObject object =3D getFileObject("esb-1.2", "jboss-esb-notifiers.xm= l", ESBConstants.ENT_ESB_FILE_120); + = + StringBuffer errorList =3D new StringBuffer(); + = + String notifyEmailPath =3D "Services/s/Actions/SendResponseNotifier/ok/N= otifyEmail"; + = + String[][] notifyEmailAttrValues =3D { + {"from", "person(a)somewhere.com"}, + {"send to", "person(a)elsewhere.com"}, + {"subject", "theSubject"}, + {"host", "localhost"}, + {"port", "8801"}, + {"username", "smtpUsername"}, + {"password", "smtpPassword"}, + {"auth", "true"}, + {"copy to", "person(a)somewhereelse.com"}, + {"attachment name", "attachment"}, + }; + checkAttributes(object, notifyEmailPath, notifyEmailAttrValues, errorLis= t); + + String attachmentPath =3D notifyEmailPath + "/attachThisFile.txt"; + String[][] attachmentAttrValues =3D { + {"file", "attachThisFile.txt"}, + }; + checkAttributes(object, attachmentPath, attachmentAttrValues, errorList); + + assertTrue(errorList.toString(), errorList.length() =3D=3D 0); + } + XModelObject getFileObject(String parentPath, String xmlname) { return getFileObject(parentPath, xmlname, ESBConstants.ENT_ESB_FILE_101); } --===============4285292136689727428==-- From jbosstools-commits at lists.jboss.org Fri May 7 11:55:57 2010 Content-Type: multipart/mixed; boundary="===============0028237509279680263==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21958 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta. Date: Fri, 07 May 2010 11:55:57 -0400 Message-ID: <201005071555.o47Ftv9Z012319@svn01.web.mwc.hst.phx2.redhat.com> --===============0028237509279680263== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-07 11:55:56 -0400 (Fri, 07 May 2010) New Revision: 21958 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.= meta Log: https://jira.jboss.org/jira/browse/JBIDE-6164 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-not= ifiers.meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers= .meta 2010-05-07 15:54:55 UTC (rev 21957) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers= .meta 2010-05-07 15:55:56 UTC (rev 21958) @@ -398,6 +398,11 @@ + + + + + --===============0028237509279680263==-- From jbosstools-commits at lists.jboss.org Fri May 7 11:59:21 2010 Content-Type: multipart/mixed; boundary="===============3523500132943971263==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21959 - branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/resources/meta. Date: Fri, 07 May 2010 11:59:21 -0400 Message-ID: <201005071559.o47FxLWX012356@svn01.web.mwc.hst.phx2.redhat.com> --===============3523500132943971263== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-07 11:59:20 -0400 (Fri, 07 May 2010) New Revision: 21959 Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/resources= /meta/esb-notifiers.meta Log: https://jira.jboss.org/jira/browse/JBIDE-6164 Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/re= sources/meta/esb-notifiers.meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/resource= s/meta/esb-notifiers.meta 2010-05-07 15:55:56 UTC (rev 21958) +++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/resource= s/meta/esb-notifiers.meta 2010-05-07 15:59:20 UTC (rev 21959) @@ -398,6 +398,11 @@ + + + + + --===============3523500132943971263==-- From jbosstools-commits at lists.jboss.org Fri May 7 12:26:54 2010 Content-Type: multipart/mixed; boundary="===============1316128173276553950==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21960 - in trunk/esb/tests/org.jboss.tools.esb.core.test: src/org/jboss/tools/esb/core/test and 1 other directory. Date: Fri, 07 May 2010 12:26:54 -0400 Message-ID: <201005071626.o47GQs4O021371@svn01.web.mwc.hst.phx2.redhat.com> --===============1316128173276553950== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-07 12:26:53 -0400 (Fri, 07 May 2010) New Revision: 21960 Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jbos= s-esb-notifiers.xml trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/co= re/test/ESBModelTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6164 Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1= .2/jboss-esb-notifiers.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jbo= ss-esb-notifiers.xml 2010-05-07 15:59:20 UTC (rev 21959) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jbo= ss-esb-notifiers.xml 2010-05-07 16:26:53 UTC (rev 21960) @@ -21,6 +21,12 @@ + + attachThisFile.txt + Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools= /esb/core/test/ESBModelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/c= ore/test/ESBModelTest.java 2010-05-07 15:59:20 UTC (rev 21959) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/c= ore/test/ESBModelTest.java 2010-05-07 16:26:53 UTC (rev 21960) @@ -273,6 +273,36 @@ assertTrue(errorList.toString(), errorList.length() =3D=3D 0); } = + public void testNotifyEmail() { + XModelObject object =3D getFileObject("esb-1.2", "jboss-esb-notifiers.xm= l", ESBConstants.ENT_ESB_FILE_120); + = + StringBuffer errorList =3D new StringBuffer(); + = + String notifyEmailPath =3D "Services/s/Actions/SendResponseNotifier/ok/N= otifyEmail"; + = + String[][] notifyEmailAttrValues =3D { + {"from", "person(a)somewhere.com"}, + {"send to", "person(a)elsewhere.com"}, + {"subject", "theSubject"}, + {"host", "localhost"}, + {"port", "8801"}, + {"username", "smtpUsername"}, + {"password", "smtpPassword"}, + {"auth", "true"}, + {"copy to", "person(a)somewhereelse.com"}, + {"attachment name", "attachment"}, + }; + checkAttributes(object, notifyEmailPath, notifyEmailAttrValues, errorLis= t); + + String attachmentPath =3D notifyEmailPath + "/attachThisFile.txt"; + String[][] attachmentAttrValues =3D { + {"file", "attachThisFile.txt"}, + }; + checkAttributes(object, attachmentPath, attachmentAttrValues, errorList); + + assertTrue(errorList.toString(), errorList.length() =3D=3D 0); + } + XModelObject getFileObject(String parentPath, String xmlname) { return getFileObject(parentPath, xmlname, ESBConstants.ENT_ESB_FILE_101); } --===============1316128173276553950==-- From jbosstools-commits at lists.jboss.org Fri May 7 12:35:25 2010 Content-Type: multipart/mixed; boundary="===============5364761310907932601==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21961 - in trunk: cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 3 other directories. Date: Fri, 07 May 2010 12:35:25 -0400 Message-ID: <201005071635.o47GZPQZ022362@svn01.web.mwc.hst.phx2.redhat.com> --===============5364761310907932601== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-07 12:35:24 -0400 (Fri, 07 May 2010) New Revision: 21961 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/producers/AnotherScope.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/producers/FishStereotype.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/producers/ParameterizedTypeWithWrongScope_Broken.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/Abst= ractResourceMarkerTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : Producer field with a parameterized type with a type variable declares an= y scope other than @Dependent Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-07 16:26:53 UTC (rev 219= 60) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-07 16:35:24 UTC (rev 219= 61) @@ -544,6 +544,32 @@ } } } + + /** + * 3.3. Producer methods + * - producer method with a parameterized return type with a type var= iable declares any scope other than @Dependent + * = + * 3.4. Producer fields + * - producer field with a parameterized type with a type variable de= clares any scope other than @Dependent + */ + if(paramTypes.length>0) { + IScope scope =3D producer.getScope(); + if(!CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME.equals(scope.getSourc= eType().getFullyQualifiedName())) { + ITextSourceReference declaration =3D typeDeclaration; + Set decls =3D producer.getScopeDeclarations(); + for (IScopeDeclaration decl : decls) { + if(decl.getParentMember().getResource().equals(producer.getResource= ())) { + declaration =3D decl; + break; + } + } + boolean field =3D producer instanceof IProducerField; + addError( + field?CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD:CDIVa= lidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, + field?CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD:CDIPreferenc= es.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, + declaration, producer.getResource()); + } + } } = String[] typeVariables =3D producer.getBeanClass().getTypeParameterSign= atures(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-07 16:26:53 UTC (rev 21960) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-07 16:35:24 UTC (rev 21961) @@ -64,8 +64,8 @@ {CDIPreferences.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE, CDIPreferences= Messages.CDIValidatorConfigurationBlock_pb_stereotypeDeclaresMoreThanOneSco= pe_label}, // {CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalScopeForManagedBean_label}, // {CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalScopeForSessionBean_label}, -// {CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, CDIPreferencesMess= ages.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerMethod_label}, -// {CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerField_label}, + {CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerMethod_label}, + {CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerField_label}, // {CDIPreferences.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, C= DIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeWhenTyp= eInjectionPointIsInjected_label}, // {CDIPreferences.ILLEGAL_SCOPE_FOR_INTERCEPTOR, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_illegalScopeForInterceptor_label}, // {CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_illegalScopeForDecorator_label}, Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/producers/AnotherScope.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/AnotherScope.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/AnotherScope.java 2010-05-07 16:35:24 UTC (rev 21961) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.producers; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.NormalScope; + +(a)Target( { TYPE, METHOD, FIELD }) +(a)Retention(RUNTIME) +(a)Documented +(a)NormalScope +(a)interface AnotherScope { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/producers/AnotherScope.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/producers/FishStereotype.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/FishStereotype.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/FishStereotype.java 2010-05-07 16:35:24 UTC (rev 21961) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.producers; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.ApplicationScoped; +import javax.enterprise.inject.Stereotype; +import javax.inject.Named; + +(a)Stereotype +(a)Target( { TYPE, METHOD, FIELD }) +(a)Retention(RUNTIME) +(a)ApplicationScoped +(a)Named +(a)interface FishStereotype { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/producers/FishStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/producers/ParameterizedTypeWithWrongScope_Broken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/ParameterizedTypeWithWrongScope_Broken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/ParameterizedTypeWithWrongScope_Broken.java 2010-05-07 = 16:35:24 UTC (rev 21961) @@ -0,0 +1,44 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.producers; + +import javax.enterprise.context.Dependent; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.InjectionPoint; + +public class ParameterizedTypeWithWrongScope_Broken { + + @Produces public FunnelWeaver getAnotherFunnelWeaver; + + @AnotherScope + @Produces public FunnelWeaver getAnotherFunnelWeaver2; + + @Dependent @Produces public FunnelWeaver getAnotherFunnelWeaver3; + + @AnotherScope @Produces public String getAnotherFunnelWeaver4; + + @FishStereotype + @Produces public FunnelWeaver getAnotherFunnelWeaver5; + + @Produces public FunnelWeaver create(InjectionPoint point) { + return null; + } + + @AnotherScope + @Produces + public FunnelWeaver create2(InjectionPoint point) { + return null; + } + + @Dependent @Produces public FunnelWeaver create3(InjectionPoint p= oint) { + return null; + } + + @AnotherScope @Produces public String create4(InjectionPoint point) { + return null; + } + + @FishStereotype + @Produces + public FunnelWeaver create5(InjectionPoint point) { + return null; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/producers/ParameterizedTypeWithWrongScope_Broken= .java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-07 16:26:53 UTC (rev 21960) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-07 16:35:24 UTC (rev 21961) @@ -308,23 +308,38 @@ * = * @throws Exception */ - public void testVariableType() throws Exception { + public void testTypeVariable() throws Exception { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/SpiderProducerVariableType_Broken.java"); AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD_TYPE_IS_VARIABL= E, 10); } = /** + * 3.3. Producer methods + * - producer method with a parameterized return type with a type variab= le declares any scope other than @Dependent + * = + * @throws Exception + */ + public void testParameterizedReturnTypeWithWrongScope() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/ParameterizedTypeWithWrongScope_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_MET= HOD, 25, 41); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 21); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 35); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 32); + } + + /** * 3.4. Producer fields * - producer field with a parameterized type with a type variable decla= res any scope other than @Dependent - * // TODO * = * @throws Exception */ -// public void testParameterizedReturnTypeWithTypeVariable() throws Except= ion { -// IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tes= ts/jbt/validation/producers/SpiderProducerVariableType_Broken.java"); -// AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file,= AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOP= E_FOR_PRODUCER_FIELD, 23, 1008, 1033); -// AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file,= AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOP= E_FOR_PRODUCER_FIELD, 24, 10011, 1036); -// } + public void testParameterizedTypeWithWrongScope() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/ParameterizedTypeWithWrongScope_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_FIE= LD, 11, 19); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= FIELD, 9); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= FIELD, 14); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= FIELD, 16); + } = /** * 3.9.1. Declaring an initializer method Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tes= ts/AbstractResourceMarkerTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/Abs= tractResourceMarkerTest.java 2010-05-07 16:26:53 UTC (rev 21960) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/Abs= tractResourceMarkerTest.java 2010-05-07 16:35:24 UTC (rev 21961) @@ -149,9 +149,9 @@ } = public static void assertMarkerIsNotCreated(IResource resource, String ty= pe, String pattern, int expectedLine) throws CoreException { - int line =3D findMarkerLine(resource, type, pattern); + List lines =3D findMarkerLines(resource, type, pattern); = - assertFalse("Marker matches the '" + pattern + "' pattern was found", l= ine !=3D -1); //$NON-NLS-1$ //$NON-NLS-2$ + assertFalse("Marker matches the '" + pattern + "' pattern was found", l= ines.contains(expectedLine)); //$NON-NLS-1$ //$NON-NLS-2$ } = public static void assertMarkerIsCreated(IResource resource, String type,= String pattern) throws CoreException { --===============5364761310907932601==-- From jbosstools-commits at lists.jboss.org Fri May 7 14:00:47 2010 Content-Type: multipart/mixed; boundary="===============3111424204483688416==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21962 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/loaders. Date: Fri, 07 May 2010 14:00:46 -0400 Message-ID: <201005071800.o47I0kQQ004770@svn01.web.mwc.hst.phx2.redhat.com> --===============3111424204483688416== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2010-05-07 14:00:46 -0400 (Fri, 07 May 2010) New Revision: 21962 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/loaders/XMLRecognizerContext.java Log: JBIDE-6213: Text hover calculations failed Issue is fixed Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/loaders/XMLRecognizerContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/loaders/XMLRecognizerContext.java 2010-05-07 16:35:24 UTC (rev = 21961) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/loaders/XMLRecognizerContext.java 2010-05-07 18:00:46 UTC (rev = 21962) @@ -91,6 +91,9 @@ } Reader xml =3D new StringReader(docTypeString + ""); //$NON= -NLS-1$ DocumentBuilder db =3D SafeDocumentBuilderFactory.createDocumentBuilder(= false); + if (db =3D=3D null) = + return NULL_INFO; + = try { db.setErrorHandler(new ErrorHandler() { public void warning(SAXParseException exception) --===============3111424204483688416==-- From jbosstools-commits at lists.jboss.org Fri May 7 17:17:51 2010 Content-Type: multipart/mixed; boundary="===============3127139286670111254==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21963 - trunk/birt/features/org.jboss.tools.birt.feature. Date: Fri, 07 May 2010 17:17:51 -0400 Message-ID: <201005072117.o47LHpPv016504@svn01.web.mwc.hst.phx2.redhat.com> --===============3127139286670111254== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-07 17:17:51 -0400 (Fri, 07 May 2010) New Revision: 21963 Modified: trunk/birt/features/org.jboss.tools.birt.feature/feature.xml Log: https://jira.jboss.org/jira/browse/JBIDE-6139 Project facet group group.bir= t.chart.runtime not found Modified: trunk/birt/features/org.jboss.tools.birt.feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/birt/features/org.jboss.tools.birt.feature/feature.xml 2010-05-07= 18:00:46 UTC (rev 21962) +++ trunk/birt/features/org.jboss.tools.birt.feature/feature.xml 2010-05-07= 21:17:51 UTC (rev 21963) @@ -1,47 +1,49 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - - + + + + + %description + + + + %copyright + + + + %license + + + + + + + + + + + + + + + + --===============3127139286670111254==-- From jbosstools-commits at lists.jboss.org Fri May 7 17:22:31 2010 Content-Type: multipart/mixed; boundary="===============0306674736446447301==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21964 - branches/jbosstools-3.1.x/birt/features/org.jboss.tools.birt.feature. Date: Fri, 07 May 2010 17:22:31 -0400 Message-ID: <201005072122.o47LMVwX017047@svn01.web.mwc.hst.phx2.redhat.com> --===============0306674736446447301== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-07 17:22:31 -0400 (Fri, 07 May 2010) New Revision: 21964 Modified: branches/jbosstools-3.1.x/birt/features/org.jboss.tools.birt.feature/fea= ture.xml Log: https://jira.jboss.org/jira/browse/JBIDE-6139 Project facet group group.bir= t.chart.runtime not found Modified: branches/jbosstools-3.1.x/birt/features/org.jboss.tools.birt.feat= ure/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/birt/features/org.jboss.tools.birt.feature/fe= ature.xml 2010-05-07 21:17:51 UTC (rev 21963) +++ branches/jbosstools-3.1.x/birt/features/org.jboss.tools.birt.feature/fe= ature.xml 2010-05-07 21:22:31 UTC (rev 21964) @@ -1,47 +1,49 @@ - - - - - %description - - - - %copyright - - - - %license - - - - - - - - - - - - - - + + + + + %description + + + + %copyright + + + + %license + + + + + + + + + + + + + + + + --===============0306674736446447301==-- From jbosstools-commits at lists.jboss.org Sat May 8 09:54:54 2010 Content-Type: multipart/mixed; boundary="===============0874144657340553796==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21965 - branches/modular_build. Date: Sat, 08 May 2010 09:54:54 -0400 Message-ID: <201005081354.o48DssOt018830@svn01.web.mwc.hst.phx2.redhat.com> --===============0874144657340553796== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 09:54:53 -0400 (Sat, 08 May 2010) New Revision: 21965 Modified: branches/modular_build/parent-pom.xml Log: make generated update site contain artifacts, not just site.xml Modified: branches/modular_build/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/parent-pom.xml 2010-05-07 21:22:31 UTC (rev 2196= 4) +++ branches/modular_build/parent-pom.xml 2010-05-08 13:54:53 UTC (rev 2196= 5) @@ -21,6 +21,7 @@ ${tychoVersion} 'v'yyyyMMdd-HHmm + true = --===============0874144657340553796==-- From jbosstools-commits at lists.jboss.org Sat May 8 09:59:22 2010 Content-Type: multipart/mixed; boundary="===============4458011895540298989==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21966 - branches/modular_build/build. Date: Sat, 08 May 2010 09:59:22 -0400 Message-ID: <201005081359.o48DxMlt019319@svn01.web.mwc.hst.phx2.redhat.com> --===============4458011895540298989== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 09:59:22 -0400 (Sat, 08 May 2010) New Revision: 21966 Modified: branches/modular_build/build/build.xml Log: JBDS-486 JBDS-1210 can now use Tycho to generate update site zip, so no nee= d to do custom packaging -- just need a site.xml and a pom.xml and `mvn3 cl= ean verify` will produce target/site.zip Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-08 13:54:53 UTC (rev 219= 65) +++ branches/modular_build/build/build.xml 2010-05-08 13:59:22 UTC (rev 219= 66) @@ -880,53 +880,30 @@ = - - + + = + - - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - Overall update site zip is empty! - - - Update site zip for ${COMPONENTS.to.build} is e= mpty! - - - + = = --===============4458011895540298989==-- From jbosstools-commits at lists.jboss.org Sat May 8 10:00:40 2010 Content-Type: multipart/mixed; boundary="===============6589830367802346862==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21967 - branches/modular_build. Date: Sat, 08 May 2010 10:00:40 -0400 Message-ID: <201005081400.o48E0e1O019814@svn01.web.mwc.hst.phx2.redhat.com> --===============6589830367802346862== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 10:00:39 -0400 (Sat, 08 May 2010) New Revision: 21967 Modified: branches/modular_build/parent-pom.xml Log: remove osx 64 Modified: branches/modular_build/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/parent-pom.xml 2010-05-08 13:59:22 UTC (rev 2196= 6) +++ branches/modular_build/parent-pom.xml 2010-05-08 14:00:39 UTC (rev 2196= 7) @@ -50,11 +50,11 @@ p2 - + macosx cocoa --===============6589830367802346862==-- From jbosstools-commits at lists.jboss.org Sat May 8 10:39:42 2010 Content-Type: multipart/mixed; boundary="===============7527746004512890716==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21968 - branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF. Date: Sat, 08 May 2010 10:39:42 -0400 Message-ID: <201005081439.o48EdgSS029427@svn01.web.mwc.hst.phx2.redhat.com> --===============7527746004512890716== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 10:39:41 -0400 (Sat, 08 May 2010) New Revision: 21968 Modified: branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.te= st/META-INF/MANIFEST.MF Log: add junit4 to manifest Modified: branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.= rest.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.t= est/META-INF/MANIFEST.MF 2010-05-08 14:00:39 UTC (rev 21967) +++ branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.t= est/META-INF/MANIFEST.MF 2010-05-08 14:39:41 UTC (rev 21968) @@ -4,7 +4,8 @@ Bundle-SymbolicName: org.jboss.tools.modeshape.rest.test Bundle-Version: 1.0.0 Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.jboss.tools.modeshape.rest;bundle-version=3D"1.0.0" +Require-Bundle: org.jboss.tools.modeshape.rest;bundle-version=3D"1.0.0", + org.junit4 Bundle-ClassPath: hamcrest-core-1.1.jar, ., junit-4.4.jar --===============7527746004512890716==-- From jbosstools-commits at lists.jboss.org Sat May 8 10:48:41 2010 Content-Type: multipart/mixed; boundary="===============2278171027138862863==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21969 - branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/META-INF. Date: Sat, 08 May 2010 10:48:41 -0400 Message-ID: <201005081448.o48EmfuA030549@svn01.web.mwc.hst.phx2.redhat.com> --===============2278171027138862863== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 10:48:41 -0400 (Sat, 08 May 2010) New Revision: 21969 Modified: branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.te= st/META-INF/MANIFEST.MF Log: add qualifier Modified: branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.= rest.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.t= est/META-INF/MANIFEST.MF 2010-05-08 14:39:41 UTC (rev 21968) +++ branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.t= est/META-INF/MANIFEST.MF 2010-05-08 14:48:41 UTC (rev 21969) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Test Plug-in Bundle-SymbolicName: org.jboss.tools.modeshape.rest.test -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.jboss.tools.modeshape.rest;bundle-version=3D"1.0.0", org.junit4 --===============2278171027138862863==-- From jbosstools-commits at lists.jboss.org Sat May 8 10:49:17 2010 Content-Type: multipart/mixed; boundary="===============4619891724148930294==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21970 - in branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.test/src/org/jboss/tools/modeshape/rest: test and 1 other directory. Date: Sat, 08 May 2010 10:49:17 -0400 Message-ID: <201005081449.o48EnHSO030562@svn01.web.mwc.hst.phx2.redhat.com> --===============4619891724148930294== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 10:49:16 -0400 (Sat, 08 May 2010) New Revision: 21970 Added: branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.te= st/src/org/jboss/tools/modeshape/rest/test/ branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.te= st/src/org/jboss/tools/modeshape/rest/test/AllTests.java Log: add src/org/jboss/tools/modeshape/rest/test/AllTests.java from trunk Added: branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.res= t.test/src/org/jboss/tools/modeshape/rest/test/AllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.t= est/src/org/jboss/tools/modeshape/rest/test/AllTests.java = (rev 0) +++ branches/modular_build/modeshape/tests/org.jboss.tools.modeshape.rest.t= est/src/org/jboss/tools/modeshape/rest/test/AllTests.java 2010-05-08 14:49:= 16 UTC (rev 21970) @@ -0,0 +1,13 @@ +package org.jboss.tools.modeshape.rest.test; + +import org.jboss.tools.modeshape.rest.PersistedServerTest; +import org.jboss.tools.modeshape.rest.ServerManagerTest; +import org.jboss.tools.modeshape.rest.ServerRegistryEventTest; +import org.junit.runner.RunWith; +import org.junit.runners.Suite; + +(a)RunWith( Suite.class ) +(a)Suite.SuiteClasses( {PersistedServerTest.class, ServerManagerTest.class= , ServerRegistryEventTest.class} ) +public class AllTests { + // nothing to do +} --===============4619891724148930294==-- From jbosstools-commits at lists.jboss.org Sat May 8 10:52:00 2010 Content-Type: multipart/mixed; boundary="===============7725625174528516051==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21971 - branches/modular_build/build. Date: Sat, 08 May 2010 10:52:00 -0400 Message-ID: <201005081452.o48Eq0dp031029@svn01.web.mwc.hst.phx2.redhat.com> --===============7725625174528516051== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 10:52:00 -0400 (Sat, 08 May 2010) New Revision: 21971 Modified: branches/modular_build/build/build.xml Log: better approach: if no features/ or plugins/ found in target/site, delete t= he site.zip and report a warning/error Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-08 14:49:16 UTC (rev 219= 70) +++ branches/modular_build/build/build.xml 2010-05-08 14:52:00 UTC (rev 219= 71) @@ -880,30 +880,59 @@ = - - - - - - - + + + + - - + - + preservelastmodified=3D"false" + /> + + + + + + + + + + + + + + + + + + + + + + + + Overall update site zip contains no features! + + + Update site zip for ${COMPONENTS.to.build} cont= ains no features! + + + - = = --===============7725625174528516051==-- From jbosstools-commits at lists.jboss.org Sat May 8 10:54:30 2010 Content-Type: multipart/mixed; boundary="===============3305708963486722672==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21972 - in branches/modular_build/modeshape: features/org.jboss.tools.modeshape.rest.test.feature and 2 other directories. Date: Sat, 08 May 2010 10:54:30 -0400 Message-ID: <201005081454.o48EsUCM031049@svn01.web.mwc.hst.phx2.redhat.com> --===============3305708963486722672== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 10:54:29 -0400 (Sat, 08 May 2010) New Revision: 21972 Modified: branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest= .feature/feature.xml branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest= .test.feature/feature.xml branches/modular_build/modeshape/features/org.jboss.tools.modeshape.rest= .test.sdk.feature/feature.xml branches/modular_build/modeshape/plugins/org.jboss.tools.modeshape.rest/= META-INF/MANIFEST.MF Log: add qualifiers Modified: branches/modular_build/modeshape/features/org.jboss.tools.modesha= pe.rest.feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/modeshape/features/org.jboss.tools.modeshape.res= t.feature/feature.xml 2010-05-08 14:52:00 UTC (rev 21971) +++ branches/modular_build/modeshape/features/org.jboss.tools.modeshape.res= t.feature/feature.xml 2010-05-08 14:54:29 UTC (rev 21972) @@ -13,7 +13,7 @@ Modified: branches/modular_build/modeshape/features/org.jboss.tools.modesha= pe.rest.test.feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/modeshape/features/org.jboss.tools.modeshape.res= t.test.feature/feature.xml 2010-05-08 14:52:00 UTC (rev 21971) +++ branches/modular_build/modeshape/features/org.jboss.tools.modeshape.res= t.test.feature/feature.xml 2010-05-08 14:54:29 UTC (rev 21972) @@ -2,7 +2,7 @@ = Modified: branches/modular_build/modeshape/features/org.jboss.tools.modesha= pe.rest.test.sdk.feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/modeshape/features/org.jboss.tools.modeshape.res= t.test.sdk.feature/feature.xml 2010-05-08 14:52:00 UTC (rev 21971) +++ branches/modular_build/modeshape/features/org.jboss.tools.modeshape.res= t.test.sdk.feature/feature.xml 2010-05-08 14:54:29 UTC (rev 21972) @@ -2,7 +2,7 @@ = Modified: branches/modular_build/modeshape/plugins/org.jboss.tools.modeshap= e.rest/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/modeshape/plugins/org.jboss.tools.modeshape.rest= /META-INF/MANIFEST.MF 2010-05-08 14:52:00 UTC (rev 21971) +++ branches/modular_build/modeshape/plugins/org.jboss.tools.modeshape.rest= /META-INF/MANIFEST.MF 2010-05-08 14:54:29 UTC (rev 21972) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.jboss.tools.modeshape.rest;singleton:=3Dtrue -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.jboss.tools.modeshape.rest.Activator Bundle-Vendor: %bundleVendor Bundle-Localization: plugin --===============3305708963486722672==-- From jbosstools-commits at lists.jboss.org Sat May 8 12:25:00 2010 Content-Type: multipart/mixed; boundary="===============1596254836771113411==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21973 - branches/modular_build/build. Date: Sat, 08 May 2010 12:25:00 -0400 Message-ID: <201005081625.o48GP0Pc019583@svn01.web.mwc.hst.phx2.redhat.com> --===============1596254836771113411== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 12:25:00 -0400 (Sat, 08 May 2010) New Revision: 21973 Modified: branches/modular_build/build/build.xml Log: remove modeshape (test issues?) and implement workaround for 302 redirect i= ssues when building on Windows Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-08 14:54:29 UTC (rev 219= 72) +++ branches/modular_build/build/build.xml 2010-05-08 16:25:00 UTC (rev 219= 73) @@ -8,7 +8,7 @@ value=3D"tests,common; flow,jbpm; jmx,archives,as; - drools,bpel,smooks,freemarker,profiler,portlet,modeshape; + drools,bpel,smooks,freemarker,profiler,portlet; xulrunner,jst,vpe,jsf; esb,tptp,ws; cdi,struts,hibernatetools,seam; @@ -162,15 +162,23 @@ = - - + + + + + + + + + + @@ -178,13 +186,31 @@ - - - - - - - + + + + + + + + + + + + + + + + + Error! +Cannot proceed - must install svnant.jar from ${SVNANT_MIRROR}/svnant-1.3.= 0.zip into ${COMMON_TOOLS}/. + + + + = --===============1596254836771113411==-- From jbosstools-commits at lists.jboss.org Sat May 8 12:25:36 2010 Content-Type: multipart/mixed; boundary="===============5721405034891560022==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21974 - branches/modular_build/build. Date: Sat, 08 May 2010 12:25:36 -0400 Message-ID: <201005081625.o48GPaXO020013@svn01.web.mwc.hst.phx2.redhat.com> --===============5721405034891560022== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 12:25:36 -0400 (Sat, 08 May 2010) New Revision: 21974 Added: branches/modular_build/build/svnant.jar branches/modular_build/build/svnant.jar.README.txt Log: implement workaround for 302 redirect issues when building on Windows: cach= e a copy of svnant.jar locally Added: branches/modular_build/build/svnant.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/modular_build/build/svnant.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/modular_build/build/svnant.jar.README.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/svnant.jar.README.txt = (rev 0) +++ branches/modular_build/build/svnant.jar.README.txt 2010-05-08 16:25:36 = UTC (rev 21974) @@ -0,0 +1,3 @@ +Fetched from http://www.tigris.org/files/documents/906/46267/svnant-1.3.0.= zip +Cannot simply fetch file using because Ant get stuck in infinite red= irection loop (200 -> 302 -> 200 -> ...) + Property changes on: branches/modular_build/build/svnant.jar.README.txt ___________________________________________________________________ Name: svn:mime-type + text/plain --===============5721405034891560022==-- From jbosstools-commits at lists.jboss.org Sat May 8 12:32:41 2010 Content-Type: multipart/mixed; boundary="===============6862670097185763306==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21975 - branches/modular_build/build. Date: Sat, 08 May 2010 12:32:41 -0400 Message-ID: <201005081632.o48GWfi6020608@svn01.web.mwc.hst.phx2.redhat.com> --===============6862670097185763306== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 12:32:41 -0400 (Sat, 08 May 2010) New Revision: 21975 Added: branches/modular_build/build/svnClientAdapter.jar branches/modular_build/build/svnant.README.txt branches/modular_build/build/svnkit.jar Log: implement workaround for 302 redirect issues when building on Windows: cach= e a copy of svnant jars locally Added: branches/modular_build/build/svnClientAdapter.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/modular_build/build/svnClientAdapter.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: branches/modular_build/build/svnant.README.txt (from rev 21974, bra= nches/modular_build/build/svnant.jar.README.txt) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/svnant.README.txt = (rev 0) +++ branches/modular_build/build/svnant.README.txt 2010-05-08 16:32:41 UTC = (rev 21975) @@ -0,0 +1,2 @@ +svnant.jar, svnClientAdapter.jar, and svnkit.jar fetched from http://www.t= igris.org/files/documents/906/46267/svnant-1.3.0.zip +Cannot simply fetch file using because Ant get stuck in infinite red= irection loop (200 -> 302 -> 200 -> ...) Property changes on: branches/modular_build/build/svnant.README.txt ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/build/svnkit.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/modular_build/build/svnkit.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============6862670097185763306==-- From jbosstools-commits at lists.jboss.org Sat May 8 12:45:29 2010 Content-Type: multipart/mixed; boundary="===============9158520250451835083==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21976 - branches/modular_build/build. Date: Sat, 08 May 2010 12:45:29 -0400 Message-ID: <201005081645.o48GjTZc022006@svn01.web.mwc.hst.phx2.redhat.com> --===============9158520250451835083== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 12:45:28 -0400 (Sat, 08 May 2010) New Revision: 21976 Modified: branches/modular_build/build/build.xml Log: implement workaround for 302 redirect issues when building on Windows: cach= e a copy of svnant jars locally Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-08 16:32:41 UTC (rev 219= 75) +++ branches/modular_build/build/build.xml 2010-05-08 16:45:28 UTC (rev 219= 76) @@ -168,7 +168,9 @@ - + + + --===============9158520250451835083==-- From jbosstools-commits at lists.jboss.org Sat May 8 12:47:19 2010 Content-Type: multipart/mixed; boundary="===============8109809720104142481==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21977 - branches/modular_build/build. Date: Sat, 08 May 2010 12:47:19 -0400 Message-ID: <201005081647.o48GlJWg022143@svn01.web.mwc.hst.phx2.redhat.com> --===============8109809720104142481== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 12:47:19 -0400 (Sat, 08 May 2010) New Revision: 21977 Removed: branches/modular_build/build/svnant.jar.README.txt Log: renamed Deleted: branches/modular_build/build/svnant.jar.README.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/svnant.jar.README.txt 2010-05-08 16:45:28 = UTC (rev 21976) +++ branches/modular_build/build/svnant.jar.README.txt 2010-05-08 16:47:19 = UTC (rev 21977) @@ -1,3 +0,0 @@ -Fetched from http://www.tigris.org/files/documents/906/46267/svnant-1.3.0.= zip -Cannot simply fetch file using because Ant get stuck in infinite red= irection loop (200 -> 302 -> 200 -> ...) - --===============8109809720104142481==-- From jbosstools-commits at lists.jboss.org Sat May 8 14:22:50 2010 Content-Type: multipart/mixed; boundary="===============7639714620686225918==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21978 - in branches/modular_build: build and 1 other directory. Date: Sat, 08 May 2010 14:22:50 -0400 Message-ID: <201005081822.o48IMons011360@svn01.web.mwc.hst.phx2.redhat.com> --===============7639714620686225918== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 14:22:50 -0400 (Sat, 08 May 2010) New Revision: 21978 Modified: branches/modular_build/build/build.xml branches/modular_build/parent-pom.xml Log: better fallback support for source checkout/update when svnant / svnkit una= vailable Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-08 16:47:19 UTC (rev 219= 77) +++ branches/modular_build/build/build.xml 2010-05-08 18:22:50 UTC (rev 219= 78) @@ -163,31 +163,20 @@ - + + + - - - - - - - - - - - - + + + = @@ -208,7 +197,7 @@ Error! -Cannot proceed - must install svnant.jar from ${SVNANT_MIRROR}/svnant-1.3.= 0.zip into ${COMMON_TOOLS}/. +Build cannot proceed - must install svnant.jar + other jars from ${SVNANT_= MIRROR}/svnant-1.3.0.zip into ${COMMON_TOOLS}/. @@ -297,26 +286,63 @@ Update @{COMPONENT} - - - + + + + + + + + + + + + + + + Fetch sources from ${svn.root}/@{component} into= ${WORKINGDIR}/@{component} - - - + + + + + + + + + + + + + + + + = - - - + + + + + + + + svn.info.@{co= mponent}.rev =3D ${svn.info.@{component}.rev} @@ -371,13 +397,18 @@ - - - + + + + + + + + Modified: branches/modular_build/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/parent-pom.xml 2010-05-08 16:47:19 UTC (rev 2197= 7) +++ branches/modular_build/parent-pom.xml 2010-05-08 18:22:50 UTC (rev 2197= 8) @@ -37,9 +37,9 @@ maven-scm-plugin 1.0 - - true - sources + true + connection + = @@ -50,11 +50,6 @@ p2 - macosx cocoa @@ -225,6 +220,17 @@ + svnkit13 + http://eclipse.svnkit.com/1.3.x/ + p2 + + true + + + true + + + subclipse16 http://subclipse.tigris.org/update_1.6.x/ p2 --===============7639714620686225918==-- From jbosstools-commits at lists.jboss.org Sat May 8 14:26:19 2010 Content-Type: multipart/mixed; boundary="===============0053466163518952501==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21979 - branches/modular_build/build. Date: Sat, 08 May 2010 14:26:19 -0400 Message-ID: <201005081826.o48IQJf3011814@svn01.web.mwc.hst.phx2.redhat.com> --===============0053466163518952501== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-08 14:26:19 -0400 (Sat, 08 May 2010) New Revision: 21979 Removed: branches/modular_build/build/svnClientAdapter.jar branches/modular_build/build/svnant.README.txt branches/modular_build/build/svnant.jar branches/modular_build/build/svnkit.jar Modified: branches/modular_build/build/build.xml Log: better error reporting; no longer need svnant/svnkit (fallback to mvn scm p= lugin for svn fetch) Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-08 18:22:50 UTC (rev 219= 78) +++ branches/modular_build/build/build.xml 2010-05-08 18:26:19 UTC (rev 219= 79) @@ -176,7 +176,7 @@ - = + @@ -192,12 +192,23 @@ - - - + + + + + + + + + + + Error! -Build cannot proceed - must install svnant.jar + other jars from ${SVNANT_= MIRROR}/svnant-1.3.0.zip into ${COMMON_TOOLS}/. +Build cannot proceed! + Must install svnant.jar, svnkit.jar + svnClientAdapter.jar from = + ${SVNANT_MIRROR}/svnant-1.3.0.zip = + into ${COMMON_TOOLS}/. Deleted: branches/modular_build/build/svnClientAdapter.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: branches/modular_build/build/svnant.README.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/svnant.README.txt 2010-05-08 18:22:50 UTC = (rev 21978) +++ branches/modular_build/build/svnant.README.txt 2010-05-08 18:26:19 UTC = (rev 21979) @@ -1,2 +0,0 @@ -svnant.jar, svnClientAdapter.jar, and svnkit.jar fetched from http://www.t= igris.org/files/documents/906/46267/svnant-1.3.0.zip -Cannot simply fetch file using because Ant get stuck in infinite red= irection loop (200 -> 302 -> 200 -> ...) Deleted: branches/modular_build/build/svnant.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: branches/modular_build/build/svnkit.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============0053466163518952501==-- From jbosstools-commits at lists.jboss.org Sat May 8 15:16:02 2010 Content-Type: multipart/mixed; boundary="===============1657577439534624058==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21980 - trunk/jmx/docs/reference/en-US. Date: Sat, 08 May 2010 15:16:02 -0400 Message-ID: <201005081916.o48JG2AU022833@svn01.web.mwc.hst.phx2.redhat.com> --===============1657577439534624058== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-08 15:16:01 -0400 (Sat, 08 May 2010) New Revision: 21980 Modified: trunk/jmx/docs/reference/en-US/tasks.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-49 Managing JBoss AS Managing JBoss AS Remotely Establishing Connection Modified: trunk/jmx/docs/reference/en-US/tasks.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/docs/reference/en-US/tasks.xml 2010-05-08 18:26:19 UTC (rev 2= 1979) +++ trunk/jmx/docs/reference/en-US/tasks.xml 2010-05-08 19:16:01 UTC (rev 2= 1980) @@ -36,11 +36,11 @@ Managing Application = = -Like it's said in earlier in the guide the JMX technology allows to = monitor and manage Java applications. In this section we will show you how = to get connected to = -a sample java application and run the sayHello() meth= od remotely from inside the MBean Explorer. +Like it's said earlier in the guide the JMX technology allows to mon= itor and manage Java applications. In this section we will show you how to = get connected to = +a sample Java application and run the sayHello() meth= od remotely from inside of the MBean Explorer. Unzip the bundle of sample classes. -Compile the example Java classes from within the where you= unpacked the files directory. +Compile the example Java classes from within where you un= packed the files directory. = = - In the Create JMX Connection dialog, hit Next and then click on the A= dvanced tab. + In the Create JMX Connection dialog, hit Next and then click the Adv= anced tab. = = In the JMX URL input field enter the= following URL: @@ -175,8 +175,11 @@ = = -
- Managing JBoss Instances + + = + = +
+ Managing JBoss AS = Managing JBoss instances is not supported with the JMX Tools alone. You must also download and install the AS Too= ls portion of @@ -184,7 +187,7 @@ tooling, you cannot create a JBoss JMX connection yourself or = through the Connection Wizard. The first step is to create a JBoss Server. The full i= nstructions for this can be found in the AS Tools section, however, the short summary i= s: - + Open the Servers view @@ -222,10 +225,54 @@ Note that once the server is started, the JMX connec= tion can be expanded - + = Now you can explore MBeans exposed by a JBoss instance.
+ = +
+ Managing JBoss AS Remotely + = + JBoss JMX Tool allow you to easily get access and mangane J= Boss AS server remotely. = + In order to get connected to the instance of JBoss AS remotely you need = to run the server or make sure the server is lauched. = + + + + Go to + Window > Open Perspective > Other + and select the JMX perspective. + = + + Switch to the MBean Explorer by= going to + Window > Show View > Other + and selecting the MBean Explorer. + + = + + Click the + New Connection icon = + = + = + + + + + = + in the MBean Explorer menu + bar. + + = + + Select the + Advanced tab and set t= he JMX URL to: = + = + = + Please, note that in this example we connected to the local host= . = + + +
= Extension Task This section will outline how to contribute your own Server = type with some default @@ -296,7 +343,7 @@ this server is in the connected state only when the server is = started. = = -
The Default Connection +
Establishing Connection = There are two ways to connect to an application with re= mote management enabled: = @@ -315,14 +362,16 @@ Then to follow the simple one you just need to specify h= ost, port (and optionally user name and password) and click OK. + On the Advanced tab you can set the= sever name (it will be displayed in MBean Explorer), = a url to the remote server. + For example, to connect to JBoss AS you need to set the JMX URL to = + + = + If it is required you can enter user name and password for the se= rver connection. = + + = = - The default JMX URL is - service:jmx:rmi:///jndi/rmi://localhost:3000/jmx= rmi. - = - In case you need to connect to an application which has = not used the "standard" JMX URL - (e.g. Eclipse Equinox), you need chose more advance way, w= here it's necessary to specify - explicitly a JMX URL in the Advanced tab of the JMX Connec= tion window. - = Note Only JMX URL based on RMI are supported. --===============1657577439534624058==-- From jbosstools-commits at lists.jboss.org Sun May 9 13:22:55 2010 Content-Type: multipart/mixed; boundary="===============0772611736312606737==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21981 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar. Date: Sun, 09 May 2010 13:22:55 -0400 Message-ID: <201005091722.o49HMtwV028788@svn01.web.mwc.hst.phx2.redhat.com> --===============0772611736312606737== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2010-05-09 13:22:54 -0400 (Sun, 09 May 2010) New Revision: 21981 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/too= lbar/SplitToolBar.java Log: https://jira.jboss.org/jira/browse/JBIDE-6262: Bottom border of comboboxes = in the text editing toolbar is not visible under Windows Vista and Windows = 7. - a workaround is used Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/toolbar/SplitToolBar.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/to= olbar/SplitToolBar.java 2010-05-08 19:16:01 UTC (rev 21980) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/to= olbar/SplitToolBar.java 2010-05-09 17:22:54 UTC (rev 21981) @@ -48,8 +48,12 @@ */ public abstract class SplitToolBar implements IVpeToolBar { = + // The height of toolbar is computed wrong in some cases. See JBIDE-6262. = + // It is SWT bug. To work around it, manually computed height is used. + private int maxItemHeight =3D 0; + protected CoolBar coolBar; - public abstract void createItems(ToolBar bar); + protected abstract void createItems(ToolBar bar); = public void createToolBarControl(Composite parent) { Composite comp =3D new Composite(parent, SWT.NONE); @@ -62,10 +66,12 @@ createItems(toolBar); final CoolItem coolItem =3D new CoolItem(coolBar, SWT.DROP_DOWN); coolItem.setControl(toolBar); + = Point size =3D toolBar.computeSize(SWT.DEFAULT, SWT.DEFAULT); - Point coolSize =3D coolItem.computeSize(size.x, size.y); = + Point coolSize =3D coolItem.computeSize(size.x, getMaxItemHeight()); coolItem.setSize(coolSize); + = coolItem.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { if (event.detail =3D=3D SWT.ARROW) { @@ -235,7 +241,8 @@ item =3D new ToolItem(bar, style); item.setImage(image); = item.setToolTipText(toolTipText); - + updateMaxItemHeight(item.getBounds().height); + = return item; } = @@ -249,6 +256,7 @@ toolTipText, comboItems, selectionIndex); ToolItem sep =3D new ToolItem(bar, SWT.SEPARATOR); sep.setWidth(combo.getSize().x); + updateMaxItemHeight(combo.getSize().y); sep.setControl(combo); = return combo; @@ -398,4 +406,12 @@ } return i; } + = + private void updateMaxItemHeight(int oneOfHeights) { + maxItemHeight =3D Math.max(maxItemHeight, oneOfHeights); + } + + private int getMaxItemHeight() { + return maxItemHeight; + } } --===============0772611736312606737==-- From jbosstools-commits at lists.jboss.org Mon May 10 06:16:56 2010 Content-Type: multipart/mixed; boundary="===============6300702487831035406==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21982 - in trunk/jst/tests/org.jboss.tools.ui.bot.ext: src/org/jboss/tools/ui/bot/ext and 2 other directories. Date: Mon, 10 May 2010 06:16:55 -0400 Message-ID: <201005101016.o4AAGtwa019726@svn01.web.mwc.hst.phx2.redhat.com> --===============6300702487831035406== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: lzoubek(a)redhat.com Date: 2010-05-10 06:16:54 -0400 (Mon, 10 May 2010) New Revision: 21982 Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/JavaBean.java Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default.= properties trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/RequirementAwareSuite.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/Annotations.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/ESBBean.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/SeamBean.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/ServerBean.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/TestConfigurator.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/AddJava.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/AddServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/requirement/RequirementBase.java Log: SWTbot extensions : support EPP, print configuration debug info, all config= props are optional now, major changes of JAVA config property Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-d= efault.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default= .properties 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/resources/SWTBotTest-default= .properties 2010-05-10 10:16:54 UTC (rev 21982) @@ -1,9 +1,10 @@ # SWTBotTest properties -# all defined paths should exist -JAVA_HOME_15=3D/usr/java/jdk-1.5.0_12/jre -JAVA_HOME_16=3D/opt/sun-jdk-1.6.0.19/jre -# EAP|JBOSS_AS,,|default, +# all properties are optional, all defined paths should exist +# , +JAVA=3D1.6,/opt/sun-jdk-1.6.0.19/jre +#EAP|JBOSS_AS|EPP,,|default, SERVER=3DEAP,5.0,1.6,/data/jboss/jboss-eap-5.0/jboss-as #, SEAM=3D2.2,/data/jboss/jboss-eap-5.0/seam +#, ESB=3D4.7,/data/jboss/esb-4.7 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/RequirementAwareSuite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/RequirementAwareSuite.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/RequirementAwareSuite.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -87,13 +87,11 @@ + "' - incorrect configuration"); return null; } - log.info("Returning runner for test class " - + klass.getCanonicalName()); - // ensure creating runner instance - Runner runner =3D new ReqAwareClassRunner(klass, reqs); + log.info("Returning runner for class '" + + klass.getCanonicalName()+"'"); // increment number of tests planned to run by 1 (class contains at le= ast 1 test method) cleanUp.incrPlanned(); - return runner; + return new ReqAwareClassRunner(klass, reqs); } log.info("Skipping class '" + klass.getCanonicalName() + "' - annotations do not met configuration"); @@ -136,6 +134,7 @@ @Override public void testFinished(Description description) throws Exception { incrFinished(); + log.info("Finished test : "+description.getDisplayName()); log.info("Finished tests : "+getFinished()+"/"+getPlanned()); if (getFinished() >=3D getPlanned()) { log.info("All tests finished, performing cleanup requirements "); Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/Annotations.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/Annotations.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/Annotations.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -162,6 +162,10 @@ */ JbossAS, /** + * EAP with portal + */ + EPP, + /** * all server types acceptable */ ALL Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/ESBBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/ESBBean.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/ESBBean.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -6,6 +6,9 @@ = public static ESBBean fromString(String propValue) throws Exception{ try { + if (propValue=3D=3Dnull) { + return null; + } String[] esbParams =3D propValue.split(","); ESBBean bean =3D new ESBBean(); bean.esbHome=3DesbParams[1]; @@ -16,4 +19,9 @@ throw new Exception("Cannot parse ESB property line",ex); } } + @Override + public String toString() { + return String.format("ESB runtime version=3D%s, home=3D%s", + this.version, this.esbHome); + } } Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bo= t/ext/config/JavaBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/JavaBean.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/JavaBean.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -0,0 +1,27 @@ +package org.jboss.tools.ui.bot.ext.config; + +public class JavaBean { + public String version; + public String javaHome; + = + public static JavaBean fromString(String propValue) throws Exception{ + try { + if (propValue=3D=3Dnull) { + return null; + } + String[] esbParams =3D propValue.split(","); + JavaBean bean =3D new JavaBean(); + bean.javaHome=3DesbParams[1]; + bean.version=3DesbParams[0]; + return bean; + } + catch (Exception ex) { + throw new Exception("Cannot parse JAVA property line",ex); + } + } + @Override + public String toString() { + return String.format("JAVA runtime version=3D%s, home=3D%s", + this.version, this.javaHome); + } +} Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jbo= ss/tools/ui/bot/ext/config/JavaBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/SeamBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/SeamBean.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/SeamBean.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -1,21 +1,28 @@ package org.jboss.tools.ui.bot.ext.config; = - public class SeamBean { = public String version; public String seamHome; - = - public static SeamBean fromString(String propValue) throws Exception{ + + public static SeamBean fromString(String propValue) throws Exception { try { + if (propValue =3D=3D null) { + return null; + } String[] seamParams =3D propValue.split(","); SeamBean bean =3D new SeamBean(); - bean.seamHome=3DseamParams[1]; - bean.version=3DseamParams[0]; + bean.seamHome =3D seamParams[1]; + bean.version =3D seamParams[0]; return bean; - } - catch (Exception ex) { - throw new Exception("Cannot parse SEAM property line",ex); - } + } catch (Exception ex) { + throw new Exception("Cannot parse SEAM property line", ex); + } } + + @Override + public String toString() { + return String.format("Seam runtime version=3D%s, home=3D%s", + this.version, this.seamHome); + } } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/ServerBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/ServerBean.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/ServerBean.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -10,12 +10,8 @@ public String version; public String runtimeHome; public String withJavaVersion; - public ServerType type; + public String type; = - public enum ServerType { - EAP, = - JBOSS_AS - } /** * creates bean instance from property string * @param propValue property value @@ -24,17 +20,24 @@ */ public static ServerBean fromString(String propValue) throws Exception { try { + if (propValue=3D=3Dnull) { + return null; + } String[] serverParams =3D propValue.split(","); ServerBean bean =3D new ServerBean(); bean.withJavaVersion =3D serverParams[2]; = bean.runtimeHome=3DserverParams[3]; bean.version=3DserverParams[1]; - bean.type =3D Enum.valueOf(ServerType.class, serverParams[0]); + bean.type =3D serverParams[0]; return bean; } catch (Exception ex) { throw new Exception("Cannot parse SERVER property line",ex); } } + @Override + public String toString() { + return String.format("Server type=3D%s,version=3D%s,home=3D%s,withJava= =3D%s", this.type,this.version,this.runtimeHome,this.withJavaVersion); + } = } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/TestConfigurator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/TestConfigurator.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/TestConfigurator.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -22,17 +22,17 @@ import org.jboss.tools.ui.bot.ext.config.requirement.RequirementBase; = public class TestConfigurator { - private static final Logger log =3D Logger - .getLogger(TestConfigurator.class); + private static final Logger log =3D Logger.getLogger(TestConfigurator.cla= ss); + public class Keys { public static final String SERVER =3D "SERVER"; public static final String SEAM =3D "SEAM"; - public static final String JAVA_HOME_15 =3D "JAVA_HOME_15"; - public static final String JAVA_HOME_16 =3D "JAVA_HOME_16"; + public static final String JAVA =3D "JAVA"; public static final String ESB =3D "ESB"; } = public class Values { + public static final String SERVER_TYPE_EPP =3D "EPP"; public static final String SERVER_TYPE_EAP =3D "EAP"; public static final String SERVER_TYPE_JBOSSAS =3D "JBOSS_AS"; public static final String SERVER_WITH_DEFAULT_JAVA =3D "default"; @@ -43,6 +43,7 @@ public static ServerBean server; public static SeamBean seam; public static ESBBean esb; + public static JavaBean java; static { try { // try to load from file first @@ -51,10 +52,13 @@ if (propFile !=3D null) { try { if (new File(propFile).exists()) { - log.info("Loading exeternaly provided configuration file '"+propFile= +"'"); - swtTestProperties.load(new FileInputStream(propFile)); + log + .info("Loading exeternaly provided configuration file '" + + propFile + "'"); + swtTestProperties.load(new FileInputStream(propFile)); } else { - throw new IOException(SWTBOT_TEST_PROPERTIES_FILE+" "+propFile+" doe= s not exist!"); + throw new IOException(SWTBOT_TEST_PROPERTIES_FILE + " " + + propFile + " does not exist!"); } } catch (FileNotFoundException e) { // TODO Auto-generated catch block @@ -65,7 +69,7 @@ } } else { try { - log.info("Loading default configuration"); + log.info("Loading default configuration, override by pointing java sy= stem property '"+SWTBOT_TEST_PROPERTIES_FILE+"' to your custom property fil= e"); swtTestProperties.load(new FileInputStream(SWTTestExt.util .getResourceFile(Activator.PLUGIN_ID, "/SWTBotTest-default.properties"))); @@ -80,38 +84,69 @@ = // properties got loaded try { + java =3D JavaBean.fromString(getProperty(Keys.JAVA)); + printConfig(Keys.JAVA, java); server =3D ServerBean.fromString(getProperty(Keys.SERVER)); + printConfig(Keys.SERVER, server); seam =3D SeamBean.fromString(getProperty(Keys.SEAM)); + printConfig(Keys.SEAM, seam); esb =3D ESBBean.fromString(getProperty(Keys.ESB)); + printConfig(Keys.ESB, esb); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); } } -/** - * check config values if they seem to be valid (existing dirs) - * @throws FileNotFoundException = - */ - public static boolean checkConfig() { + + private static void printConfig(String propName, Object bean) { + if (bean =3D=3D null) { + log.info("Property " + propName + + " not found, server not configured"); + } else { + log.info("Configured " + bean.toString()); + } + } + + /** + * check config values if they seem to be valid (existing dirs) + * = + * @throws FileNotFoundException + */ + public static boolean checkConfig() { try { - checkDirExists(getProperty(Keys.JAVA_HOME_15)); - checkDirExists(getProperty(Keys.JAVA_HOME_16)); - checkDirExists(seam.seamHome); - checkDirExists(server.runtimeHome); - checkDirExists(esb.esbHome); - return true; - } - catch (Exception ex) { - log.error("'"+ex.getMessage()+ "' - incorrect configuration, set your c= ustom properties file via '"+SWTBOT_TEST_PROPERTIES_FILE+"' java property"); + if (java !=3D null) + checkDirExists(java.javaHome); + if (seam !=3D null) + checkDirExists(seam.seamHome); + if (server !=3D null) + checkDirExists(server.runtimeHome); + if (esb !=3D null) + checkDirExists(esb.esbHome); + // special checks capturing dependency of server on java = + if (java=3D=3Dnull && server!=3Dnull && !server.withJavaVersion.equals(= Values.SERVER_WITH_DEFAULT_JAVA)) { + throw new Exception("Server is configured to run with java version=3D"= +server.withJavaVersion+" but no JAVA is configured"); + } + if (java!=3Dnull && !java.version.equals(server.withJavaVersion)) { + throw new Exception("Server is configured to run with java version=3D"= +server.withJavaVersion+" but JAVA is configured with "+java.version); + } + return true; + } catch (Exception ex) { + log + .error("'" + + ex.getMessage() + + "' - incorrect configuration, update your configuraton"); return false; } - = + } + private static void checkDirExists(String dir) throws FileNotFoundExcepti= on { if (!new File(dir).exists() || !new File(dir).isDirectory()) { - throw new FileNotFoundException("File '"+dir+"' does not exist or is no= t directory"); + throw new FileNotFoundException("File '" + dir + + "' does not exist or is not directory"); } } + /** * returns null when given Server annotation does not match global test * configuration (e.g. Test wants Server type EAP but we are running on @@ -122,18 +157,26 @@ * @return StartServer requirement otherwise */ private static RequirementBase getServerRequirement(Server s) { - if (!s.required()) { + // tests omitting server must run even when server not configured + if (ServerState.Disabled.equals(s.state()) && server =3D=3D null) { + return RequirementBase.createRemoveServer(); + } + if (!s.required() || server =3D=3D null) { return null; - } = + } if (!s.type().equals(ServerType.ALL)) { if (s.type().equals(ServerType.EAP) - && !server.type.equals(ServerBean.ServerType.EAP)) { + && !server.type.equals(Values.SERVER_TYPE_EAP)) { return null; } if (s.type().equals(ServerType.JbossAS) - && !server.type.equals(ServerBean.ServerType.JBOSS_AS)) { + && !server.type.equals(Values.SERVER_TYPE_JBOSSAS)) { return null; } + if (s.type().equals(ServerType.EPP) + && !server.type.equals(Values.SERVER_TYPE_EPP)) { + return null; + } } if (!matches(server.version, s.operator(), s.version())) { return null; @@ -160,7 +203,7 @@ * @return AddSeam requirement otherwise */ private static RequirementBase getSeamRequirement(Seam s) { - if (!s.required()) { + if (!s.required() || seam =3D=3D null) { return null; } if (!matches(seam.version, s.operator(), s.version())) { @@ -168,8 +211,9 @@ } return RequirementBase.createAddSeam(); } + private static RequirementBase getESBRequirement(ESB e) { - if (!e.required()) { + if (!e.required() || esb =3D=3D null) { return null; } if (!matches(esb.version, e.operator(), e.version())) { Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/requirement/AddJava.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddJava.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddJava.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -1,6 +1,5 @@ package org.jboss.tools.ui.bot.ext.config.requirement; = -import static org.junit.Assert.fail; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.config.TestConfigurator; /** @@ -10,13 +9,11 @@ */ public class AddJava extends RequirementBase { = - private final String version; /** - * requirement for adding JRE + * requirement for adding JRE/JDK * @param version to add */ - public AddJava(String version) { - this.version =3D version; + public AddJava() { } @Override public boolean checkFulfilled() { @@ -29,20 +26,10 @@ SWTTestExt.configuredState.getJreList().add(getAddedAsName()); } public String getAddedAsName() { - return "JRE-"+version; + return "JRE-"+TestConfigurator.java.version; } private String getJavaHome() { - if ("1.5".equals(version)) { - return TestConfigurator.getProperty(TestConfigurator.Keys.JAVA_HOME_15); - } - if ("1.6".equals(version)) { - return TestConfigurator.getProperty(TestConfigurator.Keys.JAVA_HOME_16); - } - failParsing(); - return null; + return TestConfigurator.java.javaHome; } - private void failParsing() { - fail("Unable to add JRE runtime, unsupported verson :"+version); - } = } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/requirement/AddServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddServer.java 2010-05-09 17:22:54 UTC (rev 21981) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/AddServer.java 2010-05-10 10:16:54 UTC (rev 21982) @@ -17,7 +17,7 @@ import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterp= riseMiddlewareJBossEnterpriseApplicationPlatform43Runtime; import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterp= riseMiddlewareJBossEnterpriseApplicationPlatform50Runtime; /** - * adds server (version and type depends on {@link TestConfigurator#server} + * adds server (version and type depends on {@link TestConfigurator#server= }) * @author lzoubek * */ @@ -26,8 +26,8 @@ private String javaName=3Dnull; public AddServer() { String javaVer =3D getNeededJavaVersion(TestConfigurator.server.withJava= Version); - if (javaVer!=3Dnull) { - AddJava addJava =3D createAddJRE(javaVer); + if (javaVer!=3Dnull && TestConfigurator.java!=3Dnull &&javaVer.equals(Te= stConfigurator.java.version)) { + AddJava addJava =3D createAddJava(); getDependsOn().add(addJava); javaName=3DaddJava.getAddedAsName(); } @@ -36,16 +36,16 @@ = @Override public void handle() { - ServerInfo serverInfo =3D getRuntime(TestConfigurator.server.type.toStri= ng(),TestConfigurator.server.version); + ServerInfo serverInfo =3D getRuntime(TestConfigurator.server.type,TestCo= nfigurator.server.version); String runtimeHome=3DTestConfigurator.server.runtimeHome; - String runtimeName=3DTestConfigurator.server.type.toString()+"-"+TestCon= figurator.server.version; + String runtimeName=3DTestConfigurator.server.type+"-"+TestConfigurator.s= erver.version; SWTTestExt.eclipse.addJbossServerRuntime(serverInfo.runtime, = runtimeHome, runtimeName, javaName); SWTTestExt.eclipse.addServer(serverInfo.server, runtimeName); SWTTestExt.configuredState.getServer().isConfigured=3Dtrue; SWTTestExt.configuredState.getServer().name=3DruntimeName; SWTTestExt.configuredState.getServer().version=3DTestConfigurator.server= .version; - SWTTestExt.configuredState.getServer().type=3DTestConfigurator.server.ty= pe.toString(); + SWTTestExt.configuredState.getServer().type=3DTestConfigurator.server.ty= pe; SWTTestExt.configuredState.getServer().withJavaVersion =3D TestConfigura= tor.server.withJavaVersion; } = @@ -77,7 +77,19 @@ JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50.LABEL); } = - } else if (TestConfigurator.Values.SERVER_TYPE_JBOSSAS.equals(serverType= )) { + }if (TestConfigurator.Values.SERVER_TYPE_EPP.equals(serverType)) { + if ("4.3".equals(version)) { + return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicat= ionPlatform43Runtime.LABEL, + JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43.LABEL + ); = + } + if ("5.0".equals(version)) { + return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicat= ionPlatform50Runtime.LABEL, + JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform50.LABEL); + } + = + } + else if (TestConfigurator.Values.SERVER_TYPE_JBOSSAS.equals(serverType))= { if ("4.2".equals(version)) { return new ServerInfo(JBossCommunityJBoss42Runtime.LABEL,JBossCommunit= yJBossAS42.LABEL); = } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/requirement/RequirementBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/RequirementBase.java 2010-05-09 17:22:54 UTC (rev 219= 81) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/requirement/RequirementBase.java 2010-05-10 10:16:54 UTC (rev 219= 82) @@ -120,8 +120,8 @@ return req; } = - public static AddJava createAddJRE(String version) { - AddJava req =3D new AddJava(version); + public static AddJava createAddJava() { + AddJava req =3D new AddJava(); return req; } = --===============6300702487831035406==-- From jbosstools-commits at lists.jboss.org Mon May 10 06:28:47 2010 Content-Type: multipart/mixed; boundary="===============6902379700614088240==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21983 - trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config. Date: Mon, 10 May 2010 06:28:46 -0400 Message-ID: <201005101028.o4AASksD021297@svn01.web.mwc.hst.phx2.redhat.com> --===============6902379700614088240== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: lzoubek(a)redhat.com Date: 2010-05-10 06:28:46 -0400 (Mon, 10 May 2010) New Revision: 21983 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/config/TestConfigurator.java Log: SWTbot extensions :config debug info minifix Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/config/TestConfigurator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/TestConfigurator.java 2010-05-10 10:16:54 UTC (rev 21982) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/config/TestConfigurator.java 2010-05-10 10:28:46 UTC (rev 21983) @@ -101,7 +101,7 @@ private static void printConfig(String propName, Object bean) { if (bean =3D=3D null) { log.info("Property " + propName - + " not found, server not configured"); + + " not found, "+propName+" not configured"); } else { log.info("Configured " + bean.toString()); } --===============6902379700614088240==-- From jbosstools-commits at lists.jboss.org Mon May 10 06:44:18 2010 Content-Type: multipart/mixed; boundary="===============6193063345385861883==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21984 - in trunk/jst/tests: org.jboss.tools.ui.bot.ext.test and 11 other directories. Date: Mon, 10 May 2010 06:44:17 -0400 Message-ID: <201005101044.o4AAiH9c023060@svn01.web.mwc.hst.phx2.redhat.com> --===============6193063345385861883== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: lzoubek(a)redhat.com Date: 2010-05-10 06:44:17 -0400 (Mon, 10 May 2010) New Revision: 21984 Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.classpath trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.project trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.eclipse.jd= t.core.prefs trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.jboss.ide.= eclipse.as.core.prefs trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/bin/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/build.properties trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/resources/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/log4j.xml trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/Activator.java trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/config/ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/config/AnnotatedDefaultServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/config/AnnotatedDisabledServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/config/AnnotatedEPPServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/config/AnnotatedJbossASServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/config/AnnotatedNotRunningServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/config/AnnotatedWithESB.java trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/config/AnnotatedWithSeam.java trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/config/AnonatedRunningServer.java trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/config/ClassWithoutTests.java trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/config/NotAnnotated.java trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/b= ot/ext/test/config/Suite.java Log: added test plugin for swtbot extensions Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.classpath = (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.classpath 2010-05-10 1= 0:44:17 UTC (rev 21984) @@ -0,0 +1,8 @@ + + + + + + + + Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.project = (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.project 2010-05-10 10:= 44:17 UTC (rev 21984) @@ -0,0 +1,28 @@ + + + org.jboss.tools.ui.bot.ext.test + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.eclips= e.jdt.core.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.eclipse.j= dt.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.eclipse.j= dt.core.prefs 2010-05-10 10:44:17 UTC (rev 21984) @@ -0,0 +1,8 @@ +#Mon Aug 31 15:12:26 CEST 2009 +eclipse.preferences.version=3D1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5 +org.eclipse.jdt.core.compiler.compliance=3D1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror +org.eclipse.jdt.core.compiler.problem.enumIdentifier=3Derror +org.eclipse.jdt.core.compiler.source=3D1.5 Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.jboss.= ide.eclipse.as.core.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.jboss.ide= .eclipse.as.core.prefs (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.jboss.ide= .eclipse.as.core.prefs 2010-05-10 10:44:17 UTC (rev 21984) @@ -0,0 +1,3 @@ +#Fri May 07 11:17:03 CEST 2010 +eclipse.preferences.version=3D1 +org.jboss.ide.eclipse.as.core.singledeployable.deployableList=3D Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF = (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF 20= 10-05-10 10:44:17 UTC (rev 21984) @@ -0,0 +1,24 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: WebService SWTBot Tests +Bundle-SymbolicName: org.jboss.tools.ws.ui.bot.test +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.jboss.tools.ui.bot.ext.test.Activator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.apache.log4j;bundle-version=3D"1.2.13", + org.jboss.tools.ui.bot.ext, + org.eclipse.jdt.ui, + org.eclipse.swtbot.eclipse.core;bundle-version=3D"2.0.0", + org.eclipse.swtbot.eclipse.finder;bundle-version=3D"2.0.0", + org.eclipse.swtbot.eclipse.ui;bundle-version=3D"2.0.0", + org.eclipse.swtbot.junit4_x;bundle-version=3D"2.0.0", + org.eclipse.swtbot.swt.finder;bundle-version=3D"2.0.0", + org.eclipse.ui.ide;bundle-version=3D"3.5.1", + org.eclipse.ui.forms;bundle-version=3D"3.4.1", + org.junit4;bundle-version=3D"4.5.0" +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Eclipse-RegisterBuddy: org.apache.log4j +Bundle-ClassPath: . +Export-Package: org.jboss.tools.ui.bot.ext.test Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/build.properties = (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/build.properties 2010-0= 5-10 10:44:17 UTC (rev 21984) @@ -0,0 +1,5 @@ +source.. =3D src/,\ + resources/ +output.. =3D bin/ +bin.includes =3D META-INF/,\ + . Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/log4j.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/log4j.xml = (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/log4j.xml 2010-05-1= 0 10:44:17 UTC (rev 21984) @@ -0,0 +1,65 @@ + + + + + + + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/= ui/bot/ext/test/Activator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/Activator.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/Activator.java 2010-05-10 10:44:17 UTC (rev 21984) @@ -0,0 +1,66 @@ + /************************************************************************= ******* + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ +package org.jboss.tools.ui.bot.ext.test; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID =3D "org.jboss.tools.ui.bot.ext.test= "; + + // The shared instance + private static Activator plugin; + + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * = + * @see + * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.Bundle= Context + * ) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin =3D this; + } + + /* + * (non-Javadoc) + * = + * @see + * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleC= ontext + * ) + */ + public void stop(BundleContext context) throws Exception { + plugin =3D null; + super.stop(context); + } + + /** + * Returns the shared instance + * = + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/= ui/bot/ext/test/config/AnnotatedDefaultServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedDefaultServer.java (re= v 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedDefaultServer.java 2010-05-10 10:44:17 UTC (re= v 21984) @@ -0,0 +1,55 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.junit.Test; + + +(a)SWTBotTestRequires(server=3D@Server(),perspective=3D"Java EE") +public class AnnotatedDefaultServer extends SWTTestExt { + + @Test + public void configuredState() { + assertTrue(configuredState.getServer().isRunning); + assertTrue(configuredState.getServer().isConfigured); + assertNotNull(configuredState.getServer().version); + assertNotNull(configuredState.getServer().type); + assertNotNull(configuredState.getServer().name); + assertNotNull(configuredState.getServer().withJavaVersion); + } + = + @Test + public void serverExists() { + boolean found=3Dfalse; + for (SWTBotTreeItem item : servers.show().bot().tree().getAllItems()) { + if (item.getText().startsWith(configuredState.getServer().name)) { + found =3D true; + break; + } + } + assertTrue(found); + } + = + @Test + public void serverRunning() { + SWTBotTreeItem server =3Dnull; + SWTBotTree tree =3D servers.show().bot().tree(); + for (SWTBotTreeItem item : tree.getAllItems()) { + if (item.getText().startsWith(configuredState.getServer().name)) { + server =3D item; + break; + } + } + if (server!=3Dnull) { + ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); + assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, = IDELabel.Menu.STOP, false)).isEnabled()); + } + } + = +} Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/= ui/bot/ext/test/config/AnnotatedDisabledServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedDisabledServer.java (r= ev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedDisabledServer.java 2010-05-10 10:44:17 UTC (r= ev 21984) @@ -0,0 +1,39 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; +import org.junit.Test; + +(a)SWTBotTestRequires(server=3D@Server(state=3DServerState.Disabled)) +public class AnnotatedDisabledServer extends SWTTestExt { + + @Test + public void configuredState() { + assertTrue(!configuredState.getServer().isRunning); + assertTrue(!configuredState.getServer().isConfigured); + assertNull(configuredState.getServer().version); + assertNull(configuredState.getServer().type); + assertNull(configuredState.getServer().name); + assertNull(configuredState.getServer().withJavaVersion); + } + = + @Test + public void serverDoesNotExist() { + assertTrue(!servers.show().bot().tree().hasItems()); + } + = + @Test + public void runtimeDoesNotExist() { + SWTBot wiz =3D open + .preferenceOpen(ActionItem.Preference.ServerRuntimeEnvironments.LABEL); + SWTBotTable tbRuntimeEnvironments =3D bot.table(); + assertTrue(tbRuntimeEnvironments.rowCount()=3D=3D0); + open.closeCancel(wiz); + } + +} Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/= ui/bot/ext/test/config/AnnotatedEPPServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedEPPServer.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedEPPServer.java 2010-05-10 10:44:17 UTC (rev 21= 984) @@ -0,0 +1,56 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.junit.Test; + + +(a)SWTBotTestRequires(server=3D@Server(type=3DServerType.EPP),perspective= =3D"Java EE") +public class AnnotatedEPPServer extends SWTTestExt { + + @Test + public void configuredState() { + assertTrue(configuredState.getServer().isRunning); + assertTrue(configuredState.getServer().isConfigured); + assertNotNull(configuredState.getServer().version); + assertNotNull(configuredState.getServer().type); + assertNotNull(configuredState.getServer().name); + assertNotNull(configuredState.getServer().withJavaVersion); + } + = + @Test + public void serverExists() { + boolean found=3Dfalse; + for (SWTBotTreeItem item : servers.show().bot().tree().getAllItems()) { + if (item.getText().startsWith(configuredState.getServer().name)) { + found =3D true; + break; + } + } + assertTrue(found); + } + = + @Test + public void serverRunning() { + SWTBotTreeItem server =3Dnull; + SWTBotTree tree =3D servers.show().bot().tree(); + for (SWTBotTreeItem item : tree.getAllItems()) { + if (item.getText().startsWith(configuredState.getServer().name)) { + server =3D item; + break; + } + } + if (server!=3Dnull) { + ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); + assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, = IDELabel.Menu.STOP, false)).isEnabled()); + } + } + = +} Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/= ui/bot/ext/test/config/AnnotatedJbossASServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedJbossASServer.java (re= v 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedJbossASServer.java 2010-05-10 10:44:17 UTC (re= v 21984) @@ -0,0 +1,56 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.junit.Test; + + +(a)SWTBotTestRequires(server=3D@Server(type=3DServerType.JbossAS),perspect= ive=3D"Java EE") +public class AnnotatedJbossASServer extends SWTTestExt { + + @Test + public void configuredState() { + assertTrue(configuredState.getServer().isRunning); + assertTrue(configuredState.getServer().isConfigured); + assertNotNull(configuredState.getServer().version); + assertNotNull(configuredState.getServer().type); + assertNotNull(configuredState.getServer().name); + assertNotNull(configuredState.getServer().withJavaVersion); + } + = + @Test + public void serverExists() { + boolean found=3Dfalse; + for (SWTBotTreeItem item : servers.show().bot().tree().getAllItems()) { + if (item.getText().startsWith(configuredState.getServer().name)) { + found =3D true; + break; + } + } + assertTrue(found); + } + = + @Test + public void serverRunning() { + SWTBotTreeItem server =3Dnull; + SWTBotTree tree =3D servers.show().bot().tree(); + for (SWTBotTreeItem item : tree.getAllItems()) { + if (item.getText().startsWith(configuredState.getServer().name)) { + server =3D item; + break; + } + } + if (server!=3Dnull) { + ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); + assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, = IDELabel.Menu.STOP, false)).isEnabled()); + } + } + = +} Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/= ui/bot/ext/test/config/AnnotatedNotRunningServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedNotRunningServer.java = (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedNotRunningServer.java 2010-05-10 10:44:17 UTC = (rev 21984) @@ -0,0 +1,58 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.junit.Test; + + +(a)SWTBotTestRequires(server=3D@Server(state=3DServerState.NotRunning),per= spective=3D"Java EE") +public class AnnotatedNotRunningServer extends SWTTestExt { + + @Test + public void configuredState() { + assertTrue(!configuredState.getServer().isRunning); + assertTrue(configuredState.getServer().isConfigured); + assertNotNull(configuredState.getServer().version); + assertNotNull(configuredState.getServer().type); + assertNotNull(configuredState.getServer().name); + assertNotNull(configuredState.getServer().withJavaVersion); + } + = + @Test + public void serverExists() { + boolean found=3Dfalse; + for (SWTBotTreeItem item : servers.show().bot().tree().getAllItems()) { + if (item.getText().startsWith(configuredState.getServer().name)) { + found =3D true; + break; + } + } + assertTrue(found); + } + = + @Test + public void serverNotRunning() { + SWTBotTreeItem server =3Dnull; + SWTBotTree tree =3D servers.show().bot().tree(); + for (SWTBotTreeItem item : tree.getAllItems()) { + if (item.getText().startsWith(configuredState.getServer().name)) { + server =3D item; + break; + } + } + if (server!=3Dnull) { + ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); + assertFalse(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree,= IDELabel.Menu.STOP, false)).isEnabled()); + assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, = IDELabel.Menu.START, false)).isEnabled()); + } + } + = + +} Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/= ui/bot/ext/test/config/AnnotatedWithESB.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedWithESB.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedWithESB.java 2010-05-10 10:44:17 UTC (rev 2198= 4) @@ -0,0 +1,44 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.ESB; +import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; +import org.junit.Test; + +(a)SWTBotTestRequires(esb=3D@ESB(),perspective=3D"Java EE") +public class AnnotatedWithESB extends SWTTestExt { + + @Test + public void configuredState() { + assertTrue(configuredState.getEsb().isConfiured); + assertNotNull(configuredState.getEsb().version); + assertNotNull(configuredState.getEsb().name); + + } + = + @Test + public void runtimeExists() { + boolean found=3Dfalse; + SWTBot bot =3D open.preferenceOpen(ActionItem.Preference.JBossToolsJBoss= ESBRuntimes.LABEL); + SWTBotTable tbRuntimeEnvironments =3D bot.table(); + // first check if Environment doesn't exist + int numRows =3D tbRuntimeEnvironments.rowCount(); + if (numRows > 0) { + int currentRow =3D 0; + while (currentRow < numRows) { + if (tbRuntimeEnvironments.cell(currentRow, 1).equalsIgnoreCase( + configuredState.getEsb().name)) { + found =3D true; + break; + } else { + currentRow++; + } + } + } + assertTrue(found); + } + +} Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/= ui/bot/ext/test/config/AnnotatedWithSeam.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedWithSeam.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnnotatedWithSeam.java 2010-05-10 10:44:17 UTC (rev 219= 84) @@ -0,0 +1,42 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.*; +import org.jboss.tools.ui.bot.ext.gen.ActionItem; +import org.junit.Test; + +(a)SWTBotTestRequires(seam=3D@Seam(),perspective=3D"Java EE") +public class AnnotatedWithSeam extends SWTTestExt { + = + @Test + public void configuredState() { + assertTrue(configuredState.getSeam().isConfiured); + assertNotNull(configuredState.getSeam().version); + assertNotNull(configuredState.getSeam().name); + + } + = + @Test + public void runtimeExists() { + boolean found=3Dfalse; + SWTBot bot =3D open.preferenceOpen(ActionItem.Preference.JBossToolsWebSe= am.LABEL); + SWTBotTable tbRuntimeEnvironments =3D bot.table(); + // first check if Environment doesn't exist + int numRows =3D tbRuntimeEnvironments.rowCount(); + if (numRows > 0) { + int currentRow =3D 0; + while (currentRow < numRows) { + if (tbRuntimeEnvironments.cell(currentRow, 1).equalsIgnoreCase( + configuredState.getSeam().name)) { + found =3D true; + break; + } else { + currentRow++; + } + } + } + assertTrue(found); + } +} Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/= ui/bot/ext/test/config/AnonatedRunningServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnonatedRunningServer.java (rev= 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/AnonatedRunningServer.java 2010-05-10 10:44:17 UTC (rev= 21984) @@ -0,0 +1,56 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; +import org.jboss.tools.ui.bot.ext.config.Annotations.Server; +import org.jboss.tools.ui.bot.ext.config.Annotations.ServerState; +import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.junit.Test; + + +(a)SWTBotTestRequires(server=3D@Server(state=3DServerState.Running),perspe= ctive=3D"Java EE") +public class AnonatedRunningServer extends SWTTestExt { + + @Test + public void configuredState() { + assertTrue(configuredState.getServer().isRunning); + assertTrue(configuredState.getServer().isConfigured); + assertNotNull(configuredState.getServer().version); + assertNotNull(configuredState.getServer().type); + assertNotNull(configuredState.getServer().name); + assertNotNull(configuredState.getServer().withJavaVersion); + } + = + @Test + public void serverExists() { + boolean found=3Dfalse; + for (SWTBotTreeItem item : servers.show().bot().tree().getAllItems()) { + if (item.getText().startsWith(configuredState.getServer().name)) { + found =3D true; + break; + } + } + assertTrue(found); + } + = + @Test + public void serverRunning() { + SWTBotTreeItem server =3Dnull; + SWTBotTree tree =3D servers.show().bot().tree(); + for (SWTBotTreeItem item : tree.getAllItems()) { + if (item.getText().startsWith(configuredState.getServer().name)) { + server =3D item; + break; + } + } + if (server!=3Dnull) { + ContextMenuHelper.prepareTreeItemForContextMenu(tree, server); + assertTrue(new SWTBotMenu(ContextMenuHelper.getContextMenu(tree, = IDELabel.Menu.STOP, false)).isEnabled()); + } + } + = +} Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/= ui/bot/ext/test/config/ClassWithoutTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/ClassWithoutTests.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/ClassWithoutTests.java 2010-05-10 10:44:17 UTC (rev 219= 84) @@ -0,0 +1,8 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires; + +(a)SWTBotTestRequires() +public class ClassWithoutTests { + +} Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/= ui/bot/ext/test/config/NotAnnotated.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/NotAnnotated.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/NotAnnotated.java 2010-05-10 10:44:17 UTC (rev 21984) @@ -0,0 +1,11 @@ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.junit.Test; + +public class NotAnnotated { + + @Test + public void testMustRun() { + = + } +} Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/= ui/bot/ext/test/config/Suite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/Suite.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/src/org/jboss/tools/ui/= bot/ext/test/config/Suite.java 2010-05-10 10:44:17 UTC (rev 21984) @@ -0,0 +1,33 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.ui.bot.ext.test.config; + +import org.jboss.tools.ui.bot.ext.RequirementAwareSuite; +import org.junit.runner.RunWith; +import org.junit.runners.Suite.SuiteClasses; + +(a)SuiteClasses( { + NotAnnotated.class, + //ClassWithoutTests.class, + AnnotatedDefaultServer.class, + AnnotatedEPPServer.class, + AnnotatedJbossASServer.class, + AnnotatedNotRunningServer.class, + AnnotatedDefaultServer.class, + AnnotatedWithESB.class, + AnnotatedDisabledServer.class, + AnonatedRunningServer.class, = + AnnotatedWithSeam.class, +}) +(a)RunWith(RequirementAwareSuite.class) +public class Suite { + +} --===============6193063345385861883==-- From jbosstools-commits at lists.jboss.org Mon May 10 06:47:19 2010 Content-Type: multipart/mixed; boundary="===============7452021210973040400==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21985 - trunk/jst/tests/org.jboss.tools.ui.bot.ext.test. Date: Mon, 10 May 2010 06:47:19 -0400 Message-ID: <201005101047.o4AAlJhd023598@svn01.web.mwc.hst.phx2.redhat.com> --===============7452021210973040400== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: lzoubek(a)redhat.com Date: 2010-05-10 06:47:19 -0400 (Mon, 10 May 2010) New Revision: 21985 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/ Log: SWTbot extensions test - svn:ignore Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test ___________________________________________________________________ Name: svn:ignore + bin screenshots --===============7452021210973040400==-- From jbosstools-commits at lists.jboss.org Mon May 10 07:56:49 2010 Content-Type: multipart/mixed; boundary="===============6865747599656989437==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21986 - trunk/as/docs/reference/en-US. Date: Mon, 10 May 2010 07:56:49 -0400 Message-ID: <201005101156.o4ABunJI005338@svn01.web.mwc.hst.phx2.redhat.com> --===============6865747599656989437== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-10 07:56:49 -0400 (Mon, 10 May 2010) New Revision: 21986 Modified: trunk/as/docs/reference/en-US/tptp_support.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-1 - Updated TPTP Profiling sect= ion. Modified: trunk/as/docs/reference/en-US/tptp_support.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/docs/reference/en-US/tptp_support.xml 2010-05-10 10:47:19 UTC = (rev 21985) +++ trunk/as/docs/reference/en-US/tptp_support.xml 2010-05-10 11:56:49 UTC = (rev 21986) @@ -8,12 +8,21 @@ TPTP Profiling = To get TPTP profiling work on JBoss Application Se= rver you should - first download TPTP 4.5.0 Runtime and install it, i. e. just add= the content of - plugins/features - folders from downloaded directory to the same fold= ers in your eclipse - installation directory. + do the following: + = + + Download TPTP Runtime and install it, i. e. just add t= he content of + plugins/features + folders from downloaded directory to the s= ame folders in your eclipse + installation directory or use the = Help > Install New Software + command. + + Install JBoss TPTP Tools + which provide TPTP support for JBoss AS servers (find = the latest stable version of the JBoss TPTP profile feature at = + http://www.jboss.org/tools/download/stable). + = And now all profile actions should work for you. To start JBoss AS in profiling mode use @@ -52,7 +61,7 @@ All additional information on TPTP(Test and Performance Tool= s Platform) you can find in eclipse documentation. + >eclipse documentation. In summary, this reference should help you to start with JBoss AS and get = to know with functionality for work with it. --===============6865747599656989437==-- From jbosstools-commits at lists.jboss.org Mon May 10 09:17:39 2010 Content-Type: multipart/mixed; boundary="===============0598780455447319590==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21987 - in trunk: drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke and 4 other directories. Date: Mon, 10 May 2010 09:17:39 -0400 Message-ID: <201005101317.o4ADHdtr027213@svn01.web.mwc.hst.phx2.redhat.com> --===============0598780455447319590== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vpakan(a)redhat.com Date: 2010-05-10 09:17:38 -0400 (Mon, 10 May 2010) New Revision: 21987 Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/helper/DragAndDropHelper.java Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.= MF trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/ManageDroolsProject.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTEclipseExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTUtilExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/helper/ContextMenuHelper.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/EntityType.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/IDELabel.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/view/ExplorerBase.java Log: Added Guvnor repository Tests. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MA= NIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST= .MF 2010-05-10 11:56:49 UTC (rev 21986) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST= .MF 2010-05-10 13:17:38 UTC (rev 21987) @@ -13,7 +13,8 @@ org.junit4;bundle-version=3D"4.5.0", org.jboss.tools.ui.bot.ext;bundle-version=3D"1.0.0", org.drools.eclipse;bundle-version=3D"5.1.0", - org.eclipse.swtbot.eclipse.gef.finder;bundle-version=3D"0.1.0" + org.eclipse.swtbot.eclipse.gef.finder;bundle-version=3D"0.1.0", + org.apache.log4j;bundle-version=3D"1.2.13" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: JBoss by Red Hat Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2010-05-10 11:56:49= UTC (rev 21986) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2010-05-10 13:17:38= UTC (rev 21987) @@ -11,25 +11,29 @@ = package org.jboss.tools.drools.ui.bot.test.smoke; = -import static org.jboss.tools.ui.bot.ext.SWTTestExt.bot; - import java.awt.event.KeyEvent; = +import org.apache.log4j.Logger; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests; +import org.jboss.tools.ui.bot.ext.config.requirement.PrepareViews; import org.jboss.tools.ui.bot.ext.config.requirement.RequirementNotFulfill= edException; import org.jboss.tools.ui.bot.ext.config.requirement.StartServer; import org.jboss.tools.ui.bot.ext.config.requirement.StopServer; -import org.jboss.tools.ui.bot.ext.gen.ActionItem; -import org.jboss.tools.ui.bot.ext.gen.ActionItem.View.GeneralInternalWebBr= owser; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; +import org.jboss.tools.ui.bot.ext.helper.DragAndDropHelper; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; import org.jboss.tools.ui.bot.ext.parts.SWTBotBrowserExt; +import org.jboss.tools.ui.bot.ext.types.EntityType; import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.jboss.tools.ui.bot.ext.types.JobName; import org.jboss.tools.ui.bot.ext.types.PerspectiveType; -import org.jboss.tools.ui.bot.ext.types.ViewType; import org.jboss.tools.ui.bot.ext.view.GuvnorRepositories; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.SWTTestExt; @@ -42,19 +46,26 @@ * */ public class GuvnorRepositoriesTest extends SWTTestExt{ + @SuppressWarnings("unused") + private static final Logger log =3D Logger.getLogger(GuvnorRepositoriesT= est.class); + private static final String GUVNOR_TEST_FILE =3D "Dummy rule.drl"; + private static final String GUVNOR_REPOSITORY_IMPORT_TEST_FILE =3D "Unde= rage.brl"; private GuvnorRepositories guvnorRepositories =3D new GuvnorRepositories= (); = /** * Tests Guvnor Repositories */ @Test public void testGuvnorRepositories() { - //startGuvnor(); + startGuvnor(); addGuvnorRepository(); deleteGuvnorRepository(); addGuvnorRepository(); openGuvnorConsole(); - browseGuvnorRepository(); - //stopGuvnor(); + browseGuvnorRepository(GuvnorRepositoriesTest.GUVNOR_TEST_FILE); + importFileFromGuvnorRepository(GuvnorRepositoriesTest.GUVNOR_TEST_FILE, + DroolsAllBotTests.SAMPLE_DROOLS_RULE_NAME, + GuvnorRepositoriesTest.GUVNOR_REPOSITORY_IMPORT_TEST_FILE); + stopGuvnor(); } = /** @@ -114,14 +125,14 @@ KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_ENTER); } /** - * Browse Guvnor Repository + * Browse Guvnor Repository and open fileToOpenFile + * @param fileToOpen */ - private void browseGuvnorRepository(){ + private void browseGuvnorRepository(String fileToOpen){ = guvnorRepositories.show(); = - String fileToOpen =3D "Underage.brl"; - guvnorRepositories.openFile(Timing.time1S(),IDELabel.GuvnorRepositorie= s.GUVNOR_REPOSITORY_ROOT_TREE_ITEM, + guvnorRepositories.openFile(Timing.time3S(),IDELabel.GuvnorRepositorie= s.GUVNOR_REPOSITORY_ROOT_TREE_ITEM, IDELabel.GuvnorRepositories.PACKAGES_TREE_ITEM, IDELabel.GuvnorRepositories.MORTGAGE_TREE_ITEM, fileToOpen); @@ -136,6 +147,7 @@ private void startGuvnor(){ try { new StartServer().fulfill(); + new PrepareViews().fulfill(); } catch (RequirementNotFulfilledException e) { throw new RuntimeException(e); } = @@ -150,4 +162,170 @@ throw new RuntimeException(e); } = } + /** + * Imports file with fileName to Drools project + * @param fileName + * @param sampleFileName + * @param importFileName + */ + private void importFileFromGuvnorRepository(String fileName, String samp= leFileName, String importFileName){ + eclipse.openPerspective(PerspectiveType.JAVA); + guvnorRepositories.show().bot(); + SWTBotTreeItem tiGuvnorFile =3D guvnorRepositories.selectTreeItem(Timi= ng.time3S(),fileName, + new String[]{IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_TREE= _ITEM, + IDELabel.GuvnorRepositories.PACKAGES_TREE_ITEM, + IDELabel.GuvnorRepositories.MORTGAGE_TREE_ITEM}); + tiGuvnorFile.select(); + SWTBot packageExplorerBot =3D packageExplorer.show().bot(); + SWTBotTreeItem tiDroolRuleDir =3D packageExplorer.selectTreeItem(Drool= sAllBotTests.SRC_MAIN_RULES_TREE_NODE, + new String[] {DroolsAllBotTests.DROOLS_PROJECT_NAME}); + DragAndDropHelper.dragAndDropOnTo(tiGuvnorFile.widget,tiDroolRuleDir.w= idget); + bot.sleep(Timing.time5S()); + SWTBotTree packageExplorerTree =3D packageExplorerBot.tree(); + // File is renamed because there is appended Guvnor info to Tree Item = Label + // So we need to get real label of Tree Item and use it later + SWTBotTreeItem tiDroolRuleFile =3D SWTEclipseExt.getTreeItemOnPathStar= tsWith(packageExplorerBot, = + packageExplorerTree, = + Timing.time1S(), + fileName, = + new String[]{DroolsAllBotTests.DROOLS_PROJECT_NAME, + DroolsAllBotTests.SRC_MAIN_RULES_TREE_NODE}); + SWTBotEditor editor =3D packageExplorer.openFile(DroolsAllBotTests.DRO= OLS_PROJECT_NAME, = + DroolsAllBotTests.SRC_MAIN_RULES_TREE_NODE, + tiDroolRuleFile.getText()); + = + assertTrue("File moved from Guvnor Repository to Drools project was no= t opened properly. File " + fileName + " is not opened in editor", + SWTEclipseExt.existEditorWithLabel(bot,fileName)); + // Test Update from Guvnor Repository + final String changeText =3D "#$%SWTBot Change#$%"; = + final String originalEditorText =3D editor.toTextEditor().getText(); + editor.toTextEditor().insertText(0, 0, changeText); + editor.save(); + bot.sleep(Timing.time1S()); + ContextMenuHelper.prepareTreeItemForContextMenu(packageExplorerTree, t= iDroolRuleFile); + ContextMenuHelper.clickContextMenu(packageExplorerTree, + IDELabel.Menu.GUVNOR,IDELabel.Menu.GUVNOR_UPDATE); + bot.sleep(Timing.time5S()); + assertTrue("Update from Guvnor Repository was not successful. File " += fileName + " has not updated content.", + editor.toTextEditor().getText().equals(originalEditorText)); + // Test commit to Guvnor Repository + editor.toTextEditor().insertText(0, 0, changeText); + editor.save(); + bot.sleep(Timing.time1S()); + ContextMenuHelper.prepareTreeItemForContextMenu(packageExplorerTree, t= iDroolRuleFile); + ContextMenuHelper.clickContextMenu(packageExplorerTree, + IDELabel.Menu.GUVNOR,IDELabel.Menu.GUVNOR_COMMIT); + bot.sleep(Timing.time5S()); + editor.close(); + editor =3D guvnorRepositories.openFile(Timing.time2S(),IDELabel.Guvnor= Repositories.GUVNOR_REPOSITORY_ROOT_TREE_ITEM, + IDELabel.GuvnorRepositories.PACKAGES_TREE_ITEM, + IDELabel.GuvnorRepositories.MORTGAGE_TREE_ITEM, + fileName); + assertTrue("Commit to Guvnor Repository was not successful. File " + f= ileName + " was not commited properly." + + "\nIt has content: " + editor.toTextEditor().getText() + + "\nExpected content: " + changeText + originalEditorText, + editor.toTextEditor().getText().equals(changeText + originalEditorTe= xt)); + // Test Add To Repository + SWTBotTreeItem tiSampleFile =3D packageExplorer.selectTreeItem(sampleF= ileName, + new String[] {DroolsAllBotTests.DROOLS_PROJECT_NAME, + DroolsAllBotTests.SRC_MAIN_RULES_TREE_NODE}); + ContextMenuHelper.prepareTreeItemForContextMenu(packageExplorerTree, t= iSampleFile); + ContextMenuHelper.clickContextMenu(packageExplorerTree, + IDELabel.Menu.GUVNOR,IDELabel.Menu.GUVNOR_ADD); + eclipse.waitForShell(""); + SWTBotShell addToGuvnorShell =3D packageExplorerBot.activeShell(); + SWTBot addToGuvnorDialogBot =3D addToGuvnorShell.bot(); + addToGuvnorDialogBot.button(IDELabel.Button.NEXT).click(); + SWTEclipseExt.getTreeItemOnPath(addToGuvnorDialogBot, = + addToGuvnorDialogBot.tree(), + Timing.time3S(), + IDELabel.GuvnorRepositories.MORTGAGE_TREE_ITEM, = + new String[]{IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_TREE= _ITEM, + IDELabel.GuvnorRepositories.PACKAGES_TREE_ITEM}) + .select(); + addToGuvnorDialogBot.button(IDELabel.Button.FINISH).click(); + eclipse.waitForClosedShell(addToGuvnorShell); + boolean isAddedToGuvnorRepository =3D false; + try{ + guvnorRepositories.selectTreeItem(Timing.time2S(),sampleFileName, + new String[]{IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_= TREE_ITEM, + IDELabel.GuvnorRepositories.PACKAGES_TREE_ITEM, + IDELabel.GuvnorRepositories.MORTGAGE_TREE_ITEM}); + isAddedToGuvnorRepository =3D true; + } catch (WidgetNotFoundException wnfe){ + isAddedToGuvnorRepository =3D false; + } + = + assertTrue("File " + sampleFileName + " was not added to Guvnor Reposi= tory.", + isAddedToGuvnorRepository); + // Test Deleting from Guvnor Repository file is already selected in Gu= vnor Repository Tree + packageExplorerBot =3D packageExplorer.show().bot(); + packageExplorerTree =3D packageExplorerBot.tree(); + packageExplorerBot.sleep(Timing.time2S()); + ContextMenuHelper.prepareTreeItemForContextMenu(packageExplorerTree, t= iSampleFile); + ContextMenuHelper.clickContextMenu(packageExplorerTree, + IDELabel.Menu.GUVNOR,IDELabel.Menu.GUVNOR_DELETE); + SWTBot dialogBot =3D packageExplorerBot.shell(IDELabel.Shell.CONFIRM_D= ELETE).activate().bot(); + dialogBot.button(IDELabel.Button.OK).click(); + packageExplorerBot.sleep(Timing.time2S()); + boolean isRemovedFromGuvnorRepository =3D false; + try{ + guvnorRepositories.selectTreeItem(Timing.time2S(),sampleFileName, + new String[]{IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_= TREE_ITEM, + IDELabel.GuvnorRepositories.PACKAGES_TREE_ITEM, + IDELabel.GuvnorRepositories.MORTGAGE_TREE_ITEM}); + isRemovedFromGuvnorRepository =3D false; + } catch (WidgetNotFoundException wnfe){ + isRemovedFromGuvnorRepository =3D true; + } + assertTrue("File " + sampleFileName + " was not removed from Guvnor Re= pository.", + isRemovedFromGuvnorRepository); + // Import File From Repository + eclipse.createNew(EntityType.RESOURCES_FROM_GUVNOR); + bot.button(IDELabel.Button.NEXT).click(); + SWTEclipseExt.getTreeItemOnPath( + bot, + bot.tree(), + Timing.time3S(), + importFileName, + new String[] { + IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_TREE_ITEM, + IDELabel.GuvnorRepositories.PACKAGES_TREE_ITEM, + IDELabel.GuvnorRepositories.MORTGAGE_TREE_ITEM }).select(); + bot.button(IDELabel.Button.NEXT).click(); + SWTEclipseExt.getTreeItemOnPath(bot, + bot.tree(), + Timing.time1S(), + "rules", + new String[] {DroolsAllBotTests.DROOLS_PROJECT_NAME,"src","main"})= .select(); + bot.button(IDELabel.Button.FINISH).click(); + util.waitForJobs(Timing.time5S(),JobName.BUILDING_WS); + bot.sleep(Timing.time1S()); + packageExplorerBot =3D packageExplorer.show().bot(); + packageExplorerTree =3D packageExplorerBot.tree(); + boolean isAddedFromGuvnorRepository =3D false; + SWTBotTreeItem tiImportRuleFile =3D null; + try{ + tiImportRuleFile =3D SWTEclipseExt.getTreeItemOnPathStartsWith(packa= geExplorerBot, = + packageExplorerTree, = + Timing.time1S(), + importFileName, = + new String[]{DroolsAllBotTests.DROOLS_PROJECT_NAME, + DroolsAllBotTests.SRC_MAIN_RULES_TREE_NODE}); + isAddedFromGuvnorRepository =3D true; + } catch (WidgetNotFoundException wnfe){ + isAddedFromGuvnorRepository =3D false; + } + assertTrue("File " + importFileName + " was not added from Guvnor Repo= sitory.", + isAddedFromGuvnorRepository); + = + ContextMenuHelper.prepareTreeItemForContextMenu(packageExplorerTree, t= iImportRuleFile); + ContextMenuHelper.clickContextMenu(packageExplorerTree, + IDELabel.Menu.GUVNOR,IDELabel.Menu.GUVNOR_DISCONNECT); + bot.sleep(Timing.time1S()); + // name of the file has to be without Guvnor information appended to e= nd of file name + // when imported from Guvnor repository + assertTrue("File " + importFileName + " was not disconnected from Guvn= or Repository.", + tiImportRuleFile.getText().trim().equals(importFileName)); = + } } \ No newline at end of file Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/smoke/ManageDroolsProject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/ManageDroolsProject.java 2010-05-10 11:56:49 UT= C (rev 21986) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/ManageDroolsProject.java 2010-05-10 13:17:38 UT= C (rev 21987) @@ -73,7 +73,7 @@ } bot.button(IDELabel.Button.NEXT).click(); bot.button(IDELabel.Button.FINISH).click(); - SWTTestExt.util.waitForAll(20*1000L); + SWTTestExt.util.waitForAll(30*1000L); jbt.delay(); = assertTrue("Project " Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTEclipseExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-10 11:56:49 UTC (rev 21986) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-10 13:17:38 UTC (rev 21987) @@ -117,7 +117,7 @@ SWTBotMenu menu1 =3D bot.menu(IDELabel.Menu.WINDOW); SWTBotMenu menu2 =3D menu1.menu(IDELabel.Menu.SHOW_VIEW); menu2.menu(IDELabel.Menu.OTHER).click(); - + bot.shell(IDELabel.Shell.SHOW_VIEW).activate(); bot.tree().expandNode(type.getGroupLabel()).expandNode( type.getViewLabel()).select(); bot.button(IDELabel.Button.OK).click(); @@ -165,12 +165,15 @@ default: fail("Unknown perspective to open"); } - + bot.sleep(Timing.time1S()); = SWTBotMenu menu1 =3D bot.menu(IDELabel.Menu.WINDOW); + bot.sleep(Timing.time1S()); = SWTBotMenu menu2 =3D menu1.menu(IDELabel.Menu.OPEN_PERSPECTIVE); + bot.sleep(Timing.time1S()); = menu2.menu(IDELabel.Menu.OTHER).click(); + bot.sleep(Timing.time1S()); = bot.table().select(perspectiveLabel); - + bot.sleep(Timing.time1S()); // Another approach SWTBotShell openPerpectiveShell =3D bot.shell("Open Perspective"); openPerpectiveShell.activate(); @@ -818,20 +821,23 @@ = /** * Returns Tree Item with specified label and located on path - * = + * @param bot * @param tree + * @param timeOut * @param treeItemText * @param path * @return */ - public static SWTBotTreeItem getTreeItemOnPath(SWTBotTree tree, + public static SWTBotTreeItem getTreeItemOnPath(SWTBot bot,SWTBotTree tree= , int timeOut, String treeItemText, String[] path) { SWTBotTreeItem parentTreeItem =3D null; SWTBotTreeItem treeItem =3D null; if (path !=3D null && path.length > 0) { parentTreeItem =3D tree.expandNode(path[0]); + bot.sleep(timeOut); for (int index =3D 1; index < path.length; index++) { parentTreeItem =3D parentTreeItem.expandNode(path[index]); + bot.sleep(timeOut); } treeItem =3D parentTreeItem.getNode(treeItemText); } else { @@ -839,7 +845,41 @@ } return treeItem; } + /** + * Returns first Tree Item with label starting with treeItemTextStartsWit= h and located on path + * @param bot + * @param tree + * @param timeOut + * @param treeItemTextStartsWith + * @param path + * @return + */ + public static SWTBotTreeItem getTreeItemOnPathStartsWith(SWTBot bot,SWTBo= tTree tree, int timeOut, + String treeItemTextStartsWith, String[] path) { + SWTBotTreeItem[] items =3D null; + if (path.length > 0){ + String[] parentPath =3D new String[path.length - 1]; + System.arraycopy(path, 0, parentPath, 0, parentPath.length); + SWTBotTreeItem parentTreeItem =3D getTreeItemOnPath(bot, tree, time= Out, path[path.length - 1], parentPath); + parentTreeItem.expand(); + bot.sleep(timeOut); + items =3D parentTreeItem.getItems(); + }else{ + items =3D tree.getAllItems(); + } + SWTBotTreeItem treeItem =3D null; + for (int index =3D 0 ; index < items.length && treeItem =3D=3D null; in= dex++){ + if (items[index].getText().trim() + .startsWith(treeItemTextStartsWith)){ + treeItem =3D items[index]; + } + } = + if (treeItem =3D=3D null){ + throw new WidgetNotFoundException("Unable to find Tree Item with labe= l starting with " + treeItemTextStartsWith); + } + return treeItem; + } /** * Choose Run As Java Application menu for specified Tree Item * = Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTUtilExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTUtilExt.java 2010-05-10 11:56:49 UTC (rev 21986) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTUtilExt.java 2010-05-10 13:17:38 UTC (rev 21987) @@ -41,6 +41,8 @@ import org.eclipse.swtbot.swt.finder.utils.SWTUtils; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.ui.bot.ext.parts.SWTBotBrowserExt; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.ext.types.JobLists; @@ -670,6 +672,31 @@ } } /** + * Displays all tree items of parentTreeItem node + * @param tree + * @param parentTreeItem + */ + public static void displayAllTreeItemChildren (SWTBotTree tree,SWTBotTre= eItem parentTreeItem){ + SWTBotTreeItem[] items =3D parentTreeItem.getItems(); + if (items !=3D null){ + for (int index =3D 0 ; index < items.length ; index++){ + StringBuffer columnsText =3D new StringBuffer(""); + for (int column =3D 0;column < tree.columnCount(); column++){ + if (column > 0){ + columnsText.append(" "); + } + columnsText.append(column); + columnsText.append("["); + columnsText.append(items[index].cell(column)); + columnsText.append("]"); + } + System.out.println("TreeItem text: " + items[index].getText() + = + " tooltip: " + items[index].getToolTipText() + + " columns: " + columnsText.toString()); + } + } + } + /** * Returns Toolbar Button of view with specified toolTip * @param view = * @param toolTip Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/helper/ContextMenuHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/helper/ContextMenuHelper.java 2010-05-10 11:56:49 UTC (rev 21986) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/helper/ContextMenuHelper.java 2010-05-10 13:17:38 UTC (rev 21987) @@ -19,6 +19,7 @@ import java.util.List; import java.util.Vector; = +import org.apache.log4j.Logger; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Event; @@ -40,7 +41,7 @@ * */ public class ContextMenuHelper { - + protected static final Logger log =3D Logger.getLogger(ContextMenuHelper= .class); /** * Clicks the context menu matching the text. * @@ -235,6 +236,7 @@ = UIThreadRunnable.asyncExec(menuItem.getDisplay(), new VoidResult() { public void run() { + log.info("Click on menu item: " + menuItem.getText()); menuItem.notifyListeners(SWT.Selection, event); } }); Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bo= t/ext/helper/DragAndDropHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/helper/DragAndDropHelper.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/helper/DragAndDropHelper.java 2010-05-10 13:17:38 UTC (rev 21987) @@ -0,0 +1,138 @@ + /************************************************************************= ******* + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ +package org.jboss.tools.ui.bot.ext.helper; + +import static org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable.syncE= xec; + +import java.awt.AWTException; +import java.awt.Robot; +import java.awt.event.InputEvent; + +import org.apache.log4j.Logger; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.TreeItem; +import org.eclipse.swt.widgets.Widget; +import org.eclipse.swtbot.swt.finder.results.Result; +import org.eclipse.swtbot.swt.finder.results.VoidResult; +/** + * Adds DnD Bot functionality + * @author Vladimir Pakan + * + */ +public class DragAndDropHelper { + private static final Logger log =3D Logger.getLogger(DragAndDropHelper.c= lass); + private static Robot robot =3D null; + /** + * Drag&Drop sourceWidget on to targetWidget + * @param sourceWidget + * @param targetWidget + */ + public static void dragAndDropOnTo(Widget sourceWidget, Widget targetWid= get){ + try { + if (DragAndDropHelper.robot =3D=3D null){ + DragAndDropHelper.robot =3D new Robot(); + } + DragAndDropHelper.dragAndDropOnTo(calculateWidgetPositionOn(sourceWi= dget), + calculateWidgetPositionOn(targetWidget)); + } catch (AWTException e) { + throw new RuntimeException(e); + } + } + = + /** + * Drag&Drop from sourcePoint on to targetPoint + * @param sourcePoint + * @param targetPoint + */ + private static void dragAndDropOnTo(final Point sourcePoint,final Point = targetPoint){ + try { + if (DragAndDropHelper.robot =3D=3D null){ + DragAndDropHelper.robot =3D new Robot(); + } + // the x+10 motion is needed to let native functions register a drag= detect. It did not work under Windows + // otherwise and has been reported to be required for linux, too. Bu= t I could not test that. + syncExec(new VoidResult() { + public void run() { + DragAndDropHelper.robot.mouseMove(sourcePoint.x, sourcePoint.y); + DragAndDropHelper.robot.mousePress(InputEvent.BUTTON1_MASK); + DragAndDropHelper.robot.mouseMove((sourcePoint.x + 10), sourcePo= int.y); + } + }); + // now pause the test until all runnables on the Display thread have= run this is necessary for the pick up + // to register on linux + DragAndDropHelper.waitForIdle(DragAndDropHelper.robot); + = + syncExec(new VoidResult() { + public void run() { + DragAndDropHelper.robot.mouseMove((targetPoint.x + 10), targetPo= int.y); + DragAndDropHelper.robot.mouseMove(targetPoint.x, targetPoint.y); + } + }); + = + DragAndDropHelper.waitForIdle(DragAndDropHelper.robot); + = + syncExec(new VoidResult() { + public void run() { + DragAndDropHelper.robot.mouseRelease(InputEvent.BUTTON1_MASK); + } + }); + waitForIdle(DragAndDropHelper.robot); + } catch (AWTException e) { + throw new RuntimeException(e); + } + } + /** + * Needed for linux + * @param robot + */ + private static void waitForIdle(final Robot robot) { + if (SWT.getPlatform().equals("gtk")) { + robot.waitForIdle(); + } + } + /** + * Calculate position of point above widget to be used as mouse click po= int for DnD + * @param widget + * @return + */ + private static Point calculateWidgetPositionOn (final Widget widget){ + Point result =3D new Point(0,0); + final Rectangle sourceLocation =3D DragAndDropHelper.absoluteLocation(= widget); + result.x =3D sourceLocation.x + 10; + result.y =3D sourceLocation.y + 10; + return result; + } + /** + * Gets absolute location of widget + * @param widget + * @return + */ + private static Rectangle absoluteLocation(final Widget widget) { + return syncExec(new Result() { + public Rectangle run() { + if (widget instanceof TreeItem){ + return Display.getDefault().map(((TreeItem)widget).getParent(), + null, + ((TreeItem)widget).getBounds()); + } + else{ + return Display.getDefault().map(((Control)widget).getParent(), = + null, + ((Control)widget).getBounds()); = + } + } + }); + } = +} Property changes on: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jbo= ss/tools/ui/bot/ext/helper/DragAndDropHelper.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/EntityType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/EntityType.java 2010-05-10 11:56:49 UTC (rev 21986) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/EntityType.java 2010-05-10 13:17:38 UTC (rev 21987) @@ -22,7 +22,7 @@ public enum EntityType { HIBERNATE_MAPPING_FILE, JAVA_PROJECT, JAVA_CLASS, HIBERNATE_REVERSE_FILE,= HIBERNATE_CONSOLE, = HIBERNATE_CONFIGURATION_FILE, STRUTS_PROJECT, JPA_PROJECT, DROOLS_PROJECT= , DROOLS_RULE, - GUIDED_DROOLS_RULE,DSL_DROOLS_FILE; + GUIDED_DROOLS_RULE,DSL_DROOLS_FILE,RESOURCES_FROM_GUVNOR; = public List getGroupsLabels() { List groupLabel =3D new LinkedList(); @@ -40,6 +40,7 @@ case DROOLS_RULE: groupLabel.add(IDELabel.EntityGroup.DROOLS);break; case GUIDED_DROOLS_RULE: groupLabel.add(IDELabel.EntityGroup.DROOLS);bre= ak; case DSL_DROOLS_FILE: groupLabel.add(IDELabel.EntityGroup.DROOLS);break; + case RESOURCES_FROM_GUVNOR: groupLabel.add(IDELabel.EntityGroup.GUVNOR);= break; default: fail("Unknown Entity Type"); } = @@ -66,6 +67,7 @@ case DROOLS_RULE: entityLabel =3D IDELabel.EntityLabel.DROOLS_RULE; bre= ak; case GUIDED_DROOLS_RULE: entityLabel =3D IDELabel.EntityLabel.GUIDED_DR= OOLS_RULE; break; case DSL_DROOLS_FILE: entityLabel =3D IDELabel.EntityLabel.DSL_DROOLS_F= ILE; break; = + case RESOURCES_FROM_GUVNOR: entityLabel =3D IDELabel.EntityLabel.RESOUR= CES_FROM_GUVNOR; break; default: fail("Unknown Entity Type"); } = = Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/IDELabel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-10 11:56:49 UTC (rev 21986) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-10 13:17:38 UTC (rev 21987) @@ -66,6 +66,12 @@ public static final String DEBUG_AS =3D "Debug As"; public static final String DEBUG_AS_DROOLS_APPLICATION =3D "Drools App= lication"; public static final String OPEN_GUVNOR_CONSOLE =3D "Open Guvnor Consol= e"; + public static final String GUVNOR =3D "Guvnor"; + public static final String GUVNOR_UPDATE =3D "Update"; + public static final String GUVNOR_COMMIT =3D "Commit"; + public static final String GUVNOR_ADD =3D "Add..."; + public static final String GUVNOR_DELETE =3D "Delete..."; + public static final String GUVNOR_DISCONNECT =3D "Disconnect"; } = public class Button { @@ -119,7 +125,9 @@ public static final String RENAME_JAVA_PROJECT =3D "Rename Java Project= "; public static final String CONFIRM_PERSPECTIVE_SWITCH =3D "Confirm Pers= pective Switch"; public static final String NEW_SEAM_RUNTIME =3D "New Seam Runtime"; - public static final String NEW_ESB_RUNTIME =3D "New JBoss ESB Runtime"; = + public static final String NEW_ESB_RUNTIME =3D "New JBoss ESB Runtime"; + public static final String CONFIRM_DELETE =3D "Confirm Delete"; = + public static final String SHOW_VIEW =3D "Show View"; } = public class EntityGroup { @@ -130,6 +138,7 @@ public static final String JBOSS_TOOLS_WEB =3D "JBoss Tools Web"; public static final String JPA =3D "JPA"; public static final String DROOLS =3D "Drools"; + public static final String GUVNOR =3D "Guvnor"; } = public class EntityLabel { @@ -146,6 +155,7 @@ public static final String DROOLS_RULE =3D "Rule Resource"; public static final String GUIDED_DROOLS_RULE =3D "Guided Rule"; public static final String DSL_DROOLS_FILE =3D "Domain Specific Language= "; + public static final String RESOURCES_FROM_GUVNOR =3D "Resources from Guv= nor"; } = public class JavaProjectWizard { Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/view/ExplorerBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/view/ExplorerBase.java 2010-05-10 11:56:49 UTC (rev 21986) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/view/ExplorerBase.java 2010-05-10 13:17:38 UTC (rev 21987) @@ -33,19 +33,33 @@ public void selectProject(String projectName) { SWTBot viewBot =3D viewByTitle(viewObject.getName()).bot(); viewBot.tree().expandNode(projectName).select(); - } - /** - * Selects Tree Item within Package Explorer - * @param treeItemText - * @param path - * @return - */ - public SWTBotTreeItem selectTreeItem(String treeItemText, String[] path= ) { - show(); - return SWTEclipseExt.getTreeItemOnPath(viewByTitle(viewObject.getName= ()).bot().tree(), - treeItemText, path) - .select(); - } + } + + /** + * Selects Tree Item within Package Explorer + * = + * @param timeOut + * @param treeItemText + * @param path + * @return + */ + public SWTBotTreeItem selectTreeItem(int timeOut, String treeItemText, + String[] path) { + SWTBot viewBot =3D show().bot(); + return SWTEclipseExt.getTreeItemOnPath(viewBot, viewBot.tree(), timeOu= t, + treeItemText, path).select(); + } + /** + * Selects Tree Item within Package Explorer + * = + * @param treeItemText + * @param path + * @return + */ + public SWTBotTreeItem selectTreeItem(String treeItemText, + String[] path) { + return selectTreeItem(0,treeItemText,path); + } /** * deletes given project from workspace * @param projectName --===============0598780455447319590==-- From jbosstools-commits at lists.jboss.org Mon May 10 10:56:30 2010 Content-Type: multipart/mixed; boundary="===============9006529527146295946==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21988 - branches/modular_build/build. Date: Mon, 10 May 2010 10:56:30 -0400 Message-ID: <201005101456.o4AEuUpC012706@svn01.web.mwc.hst.phx2.redhat.com> --===============9006529527146295946== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-10 10:56:30 -0400 (Mon, 10 May 2010) New Revision: 21988 Modified: branches/modular_build/build/build.xml Log: make svnant.enabled more global Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-10 13:17:38 UTC (rev 219= 87) +++ branches/modular_build/build/build.xml 2010-05-10 14:56:30 UTC (rev 219= 88) @@ -167,10 +167,10 @@ - + + - @@ -266,6 +266,7 @@ = + --===============9006529527146295946==-- From jbosstools-commits at lists.jboss.org Mon May 10 11:01:53 2010 Content-Type: multipart/mixed; boundary="===============9137486246808707994==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21989 - branches/modular_build/build. Date: Mon, 10 May 2010 11:01:53 -0400 Message-ID: <201005101501.o4AF1rqE013440@svn01.web.mwc.hst.phx2.redhat.com> --===============9137486246808707994== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-10 11:01:52 -0400 (Mon, 10 May 2010) New Revision: 21989 Modified: branches/modular_build/build/build.xml Log: debug -- win7 not , apparently Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-10 14:56:30 UTC (rev 219= 88) +++ branches/modular_build/build/build.xml 2010-05-10 15:01:52 UTC (rev 219= 89) @@ -161,6 +161,7 @@ = + ${os.name}, ${os.arch}, ${os.version}, ${osgi.os} --===============9137486246808707994==-- From jbosstools-commits at lists.jboss.org Mon May 10 11:08:28 2010 Content-Type: multipart/mixed; boundary="===============0121911275369593677==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21990 - branches/modular_build/build. Date: Mon, 10 May 2010 11:08:28 -0400 Message-ID: <201005101508.o4AF8S8g020377@svn01.web.mwc.hst.phx2.redhat.com> --===============0121911275369593677== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-10 11:08:28 -0400 (Mon, 10 May 2010) New Revision: 21990 Modified: branches/modular_build/build/build.xml Log: fix istrue check; add -f parent=3Dpom.xml Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-10 15:01:52 UTC (rev 219= 89) +++ branches/modular_build/build/build.xml 2010-05-10 15:08:28 UTC (rev 219= 90) @@ -300,7 +300,7 @@ Update @{COMPONENT} - + @@ -310,7 +310,7 @@ @@ -320,7 +320,7 @@ Fetch sources from ${svn.root}/@{component} into= ${WORKINGDIR}/@{component} - + @@ -345,7 +345,7 @@ = - + - + --===============9078190027793384835== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-10 11:37:48 -0400 (Mon, 10 May 2010) New Revision: 21991 Modified: branches/modular_build/build/build.xml Log: fix platform check Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-10 15:08:28 UTC (rev 219= 90) +++ branches/modular_build/build/build.xml 2010-05-10 15:37:48 UTC (rev 219= 91) @@ -161,12 +161,13 @@ = - ${os.name}, ${os.arch}, ${os.version}, ${osgi.os} + ${os.name}, ${os.arch}, ${os.version}, ${osgi.os}<= /echo> - + - + + --===============9078190027793384835==-- From jbosstools-commits at lists.jboss.org Mon May 10 11:46:06 2010 Content-Type: multipart/mixed; boundary="===============5959613497747938448==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21992 - branches/modular_build/build. Date: Mon, 10 May 2010 11:46:06 -0400 Message-ID: <201005101546.o4AFk64i024979@svn01.web.mwc.hst.phx2.redhat.com> --===============5959613497747938448== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-10 11:46:06 -0400 (Mon, 10 May 2010) New Revision: 21992 Modified: branches/modular_build/build/build.xml Log: tweak windows performance Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-10 15:37:48 UTC (rev 219= 91) +++ branches/modular_build/build/build.xml 2010-05-10 15:46:06 UTC (rev 219= 92) @@ -180,40 +180,50 @@ = - + - - - - - - - - - - - - - - - - - - - - - - Error! + + + + + + + + + + + + + + + + + + + + + + + + + Error! Build cannot proceed! Must install svnant.jar, svnkit.jar + svnClientAdapter.jar from = ${SVNANT_MIRROR}/svnant-1.3.0.zip = into ${COMMON_TOOLS}/. - - + + + + + + Warning! = +Svnant unavailable. Will use Maven to fetch sources. + + = --===============5959613497747938448==-- From jbosstools-commits at lists.jboss.org Mon May 10 11:57:06 2010 Content-Type: multipart/mixed; boundary="===============6573430449920559790==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21993 - trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext. Date: Mon, 10 May 2010 11:57:06 -0400 Message-ID: <201005101557.o4AFv6SV026040@svn01.web.mwc.hst.phx2.redhat.com> --===============6573430449920559790== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: jpeterka Date: 2010-05-10 11:57:06 -0400 (Mon, 10 May 2010) New Revision: 21993 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTEclipseExt.java Log: SWTEclipseExt.maximizeActiveShell method added Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTEclipseExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-10 15:46:06 UTC (rev 21992) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-10 15:57:06 UTC (rev 21993) @@ -1109,5 +1109,18 @@ */ public boolean existEditorWithLabel(String editorLabel){ return SWTEclipseExt.existEditorWithLabel(bot, editorLabel); + } = + /** + * Maximizes active shell + */ + public void maximizeActiveShell() { + final Shell shell =3D (Shell)(bot.activeShell().widget); + bot.getDisplay().syncExec(new Runnable() { + + public void run() { + shell.setMaximized(true); + = + } = + }); } } \ No newline at end of file --===============6573430449920559790==-- From jbosstools-commits at lists.jboss.org Mon May 10 11:59:56 2010 Content-Type: multipart/mixed; boundary="===============1538593795169956196==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21994 - branches/modular_build/build. Date: Mon, 10 May 2010 11:59:56 -0400 Message-ID: <201005101559.o4AFxus1026059@svn01.web.mwc.hst.phx2.redhat.com> --===============1538593795169956196== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-10 11:59:56 -0400 (Mon, 10 May 2010) New Revision: 21994 Modified: branches/modular_build/build/build.xml Log: add -Dhudson.managed.sources=3Dtrue option (for running on Windows slave) Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-10 15:57:06 UTC (rev 219= 93) +++ branches/modular_build/build/build.xml 2010-05-10 15:59:56 UTC (rev 219= 94) @@ -82,7 +82,11 @@ ant -DCOMPONENT=3Djmx create.update.site; \ ant -DCOMPONENT=3Djbpm create.update.site = -Note: if tests stall on Linux, install Xvfb and this script will use that = to run Maven. +To have hudson manage sources (rather than having this script checkout/upd= ate them) use: = + -Dhudson.managed.sources=3Dtrue + = +Note: if tests stall on Linux, install Xvfb and this script will use that = to run Maven, unless use: + -DnoXvfb=3Dtrue = Here is the order in which components must be built: @@ -164,10 +168,7 @@ ${os.name}, ${os.arch}, ${os.version}, ${osgi.os}<= /echo> - - - - + @@ -254,6 +255,13 @@ = + + + + + + + @@ -293,7 +301,7 @@ = - + = @@ -339,7 +347,6 @@ destpath=3D"${WORKINGDIR}/@{component}" /> - --===============1538593795169956196==-- From jbosstools-commits at lists.jboss.org Mon May 10 14:52:15 2010 Content-Type: multipart/mixed; boundary="===============8798459697444450991==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21995 - trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/editor. Date: Mon, 10 May 2010 14:52:15 -0400 Message-ID: <201005101852.o4AIqFbK000765@svn01.web.mwc.hst.phx2.redhat.com> --===============8798459697444450991== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-10 14:52:15 -0400 (Mon, 10 May 2010) New Revision: 21995 Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/= xulrunner/editor/XulRunnerVpeUtils.java Log: https://jira.jboss.org/jira/browse/JBIDE-5101 Resizer isn't shown correctly= for buttons, imput fields. controls fixed by applying path from Volha Chukhutsina Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/too= ls/vpe/xulrunner/editor/XulRunnerVpeUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe= /xulrunner/editor/XulRunnerVpeUtils.java 2010-05-10 15:59:56 UTC (rev 21994) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe= /xulrunner/editor/XulRunnerVpeUtils.java 2010-05-10 18:52:15 UTC (rev 21995) @@ -14,7 +14,6 @@ import org.eclipse.swt.graphics.Rectangle; import org.jboss.tools.vpe.xulrunner.BrowserPlugin; import org.mozilla.interfaces.nsIBoxObject; -import org.mozilla.interfaces.nsIDOMClientRect; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNSDocument; @@ -28,45 +27,85 @@ */ public class XulRunnerVpeUtils { = - /** - * @param domElement - * @return Rectangle - */ - static public Rectangle getElementBounds(nsIDOMNode domNode) { - try { - nsIDOMElement domElement =3D (nsIDOMElement) domNode = - .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); - nsIDOMNSElement htmlElement =3D (nsIDOMNSElement)domNode.queryInterfa= ce(nsIDOMNSElement.NS_IDOMNSELEMENT_IID); - nsIDOMNSHTMLElement domElement1 =3D (nsIDOMNSHTMLElement)domNode.quer= yInterface(nsIDOMNSHTMLElement.NS_IDOMNSHTMLELEMENT_IID); - nsIDOMDocument document =3D domElement.getOwnerDocument(); - nsIDOMNSDocument nsDocument =3D (nsIDOMNSDocument) document - .queryInterface(nsIDOMNSDocument.NS_IDOMNSDOCUMENT_IID); - nsIBoxObject boxObject =3D nsDocument.getBoxObjectFor(domElement); - Rectangle rectangle =3D new Rectangle(boxObject.getX(), boxObject.get= Y(), boxObject.getWidth()-htmlElement.getClientLeft(), boxObject.getHeight(= )-htmlElement.getClientTop()); - if(BrowserPlugin.PRINT_ELEMENT_BOUNDS) { - System.out.println("getElementBounds(IDOMNode) returns " + rectangle= ); - System.out.println("nsIDOMNSHTMLElement getOffsetLeft,getOffsetTop,g= etOffsetWidth,getOffsetHeight" + new Rectangle( - domElement1.getOffsetLeft(), - domElement1.getOffsetTop(), = - domElement1.getOffsetWidth(), = - domElement1.getOffsetHeight())); - System.out.println("nsIDOMNSElement getClientLeft,getClientTop,getCl= ientWidth,getClientHeight" + new Rectangle( - htmlElement.getClientLeft(), - htmlElement.getClientTop(), = - htmlElement.getClientWidth(), = - htmlElement.getClientHeight())); - System.out.println("nsIBoxObject getX,getY,getWidth,getHeight" + new= Rectangle( - boxObject.getX(), - boxObject.getY(), - boxObject.getWidth(), = - boxObject.getHeight())); - } - return rectangle; - = - = + private static int findPosX(nsIDOMNSHTMLElement boxObject) { + int curleft =3D 0; + = + if (boxObject.getOffsetParent() !=3D null) { + while (true) { + curleft +=3D boxObject.getOffsetLeft(); + if ( boxObject.getOffsetParent() =3D=3D null) + return curleft; + boxObject =3D (nsIDOMNSHTMLElement) boxObject.getOffsetParent().queryI= nterface(nsIDOMNSHTMLElement.NS_IDOMNSHTMLELEMENT_IID); + } + } else { + curleft +=3D boxObject.getOffsetLeft(); + } + return curleft; + } = - } catch (XPCOMException xpcomException) { - return new Rectangle(0, 0, 0, 0); + private static int findPosY(nsIDOMNSHTMLElement boxObject) { + int curleft =3D 0; + = + if (boxObject.getOffsetParent() !=3D null) { + while (true) { + curleft +=3D boxObject.getOffsetTop(); + if ( boxObject.getOffsetParent() =3D=3D null) + return curleft; + boxObject =3D (nsIDOMNSHTMLElement) boxObject.getOffsetParent().queryI= nterface(nsIDOMNSHTMLElement.NS_IDOMNSHTMLELEMENT_IID); + } + } else { + curleft +=3D boxObject.getOffsetTop(); + } + return curleft; } - } + + /** + * @param domElement + * @return Rectangle + */ + static public Rectangle getElementBounds(nsIDOMNode domNode) { + try { + nsIDOMElement domElement =3D (nsIDOMElement) domNode + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + = + nsIDOMNSElement htmlElement =3D (nsIDOMNSElement) domNode + .queryInterface(nsIDOMNSElement.NS_IDOMNSELEMENT_IID); + nsIDOMNSHTMLElement domNSHTMLElement =3D (nsIDOMNSHTMLElement) domNode + .queryInterface(nsIDOMNSHTMLElement.NS_IDOMNSHTMLELEMENT_IID); + nsIDOMDocument document =3D domElement.getOwnerDocument(); + + nsIDOMNSDocument nsDocument =3D (nsIDOMNSDocument) document + .queryInterface(nsIDOMNSDocument.NS_IDOMNSDOCUMENT_IID); + nsIBoxObject boxObject =3D nsDocument.getBoxObjectFor(domElement); + Rectangle rectangle =3D new Rectangle(findPosX(domNSHTMLElement), + findPosY(domNSHTMLElement), + boxObject.getWidth(), + boxObject.getHeight()); + + if (BrowserPlugin.PRINT_ELEMENT_BOUNDS) { + System.out.println("getElementBounds(IDOMNode) returns " + + rectangle); + System.out + .println("nsIDOMNSHTMLElement getOffsetLeft,getOffsetTop,getOffsetWi= dth,getOffsetHeight" + + new Rectangle(domNSHTMLElement.getOffsetLeft(), + domNSHTMLElement.getOffsetTop(), domNSHTMLElement + .getOffsetWidth(), domNSHTMLElement + .getOffsetHeight())); + System.out + .println("nsIDOMNSElement getClientLeft,getClientTop,getClientWidth,= getClientHeight" + + new Rectangle(htmlElement.getClientLeft(), + htmlElement.getClientTop(), htmlElement + .getClientWidth(), htmlElement + .getClientHeight())); + System.out.println("nsIBoxObject getX,getY,getWidth,getHeight" + + new Rectangle(boxObject.getX(), boxObject.getY(), + boxObject.getWidth(), boxObject.getHeight())); + + } + return rectangle; + + } catch (XPCOMException xpcomException) { + return new Rectangle(0, 0, 0, 0); + } + } } --===============8798459697444450991==-- From jbosstools-commits at lists.jboss.org Mon May 10 16:43:17 2010 Content-Type: multipart/mixed; boundary="===============2673852785141816295==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21996 - branches/modular_build. Date: Mon, 10 May 2010 16:43:17 -0400 Message-ID: <201005102043.o4AKhHVl025839@svn01.web.mwc.hst.phx2.redhat.com> --===============2673852785141816295== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-10 16:43:17 -0400 (Mon, 10 May 2010) New Revision: 21996 Modified: branches/modular_build/parent-pom.xml Log: add apache snapshots repo to resolve 2.3.1-SNAPSHOT version of maven-instal= l-plugin Modified: branches/modular_build/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/parent-pom.xml 2010-05-10 18:52:15 UTC (rev 2199= 5) +++ branches/modular_build/parent-pom.xml 2010-05-10 20:43:17 UTC (rev 2199= 6) @@ -398,6 +398,16 @@ true + + apache-snapshots + http://repository.apache.org/snapshots/ + + true + + + true + + = @@ -380,7 +380,7 @@ - + = @@ -390,7 +390,7 @@ - + @@ -486,7 +486,7 @@ = - + @@ -497,28 +497,36 @@ = - - + - All components up to date: nothing to do! + + + + + All components up to date: nothing to do! To force a build of unchanged components, use -Dbuild.if.sources.unchanged= =3Dtrue = - - - - <?xml version=3D"1.0" encoding=3D"UTF-8" ?> + + + + <?xml version=3D"1.0" encoding=3D"UTF-8" ?> <testsuite failures=3D"0" time=3D"0.001" errors=3D"0" skipped=3D"0" tes= ts=3D"1" name=3D"org.jboss.tools.NoTestsRun"> <testcase time=3D"0.001" classname=3D"org.jboss.tools.NoTestsRun" nam= e=3D"NoTestsRun"/> </testsuite> - - + + + + + The following components' sources have chang= ed and will be built: + COMPONENTS.to.build =3D ${COMPONENTS.to.build} + + + - The following components' sources have changed= and will be built: - COMPONENTS.to.build =3D ${COMPONENTS.to.build} - + @@ -1229,7 +1237,7 @@ @@ -1269,7 +1277,7 @@ = - + = @@ -1281,8 +1289,8 @@ = - - + = @@ -1768,7 +1776,7 @@ info! = - + - + - + --===============6426500518807855642==-- From jbosstools-commits at lists.jboss.org Mon May 10 17:16:23 2010 Content-Type: multipart/mixed; boundary="===============5405651089527950152==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21998 - branches/modular_build/build. Date: Mon, 10 May 2010 17:16:23 -0400 Message-ID: <201005102116.o4ALGNtK003506@svn01.web.mwc.hst.phx2.redhat.com> --===============5405651089527950152== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-10 17:16:22 -0400 (Mon, 10 May 2010) New Revision: 21998 Modified: branches/modular_build/build/build.xml Log: clean out old site/ folder and do a svn revert before update Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-10 20:55:51 UTC (rev 219= 97) +++ branches/modular_build/build/build.xml 2010-05-10 21:16:22 UTC (rev 219= 98) @@ -321,7 +321,12 @@ + + + + + --===============5405651089527950152==-- From jbosstools-commits at lists.jboss.org Mon May 10 17:47:58 2010 Content-Type: multipart/mixed; boundary="===============8270247221917695983==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r21999 - trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet. Date: Mon, 10 May 2010 17:47:58 -0400 Message-ID: <201005102147.o4ALlwaM007256@svn01.web.mwc.hst.phx2.redhat.com> --===============8270247221917695983== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-10 17:47:58 -0400 (Mon, 10 May 2010) New Revision: 21999 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/p= ortlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java Log: https://jira.jboss.org/jira/browse/JBIDE-6272 Portletbridge 2.0.0.FINAL doe= sn't recognize the javax.faces.LIFECYCLE_ID parameter Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/= tools/portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/= portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java 20= 10-05-10 21:16:22 UTC (rev 21998) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/= portlet/core/internal/project/facet/SeamPortletFacetInstallDelegate.java 20= 10-05-10 21:47:58 UTC (rev 21999) @@ -10,43 +10,21 @@ *************************************************************************= ***********/ package org.jboss.tools.portlet.core.internal.project.facet; = -import java.io.File; -import java.net.URL; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.emf.common.util.EList; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jst.j2ee.model.IModelProvider; import org.eclipse.jst.javaee.web.WebApp; import org.eclipse.jst.javaee.web.WebAppVersionType; -import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType; -import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory; -import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType; -import org.eclipse.jst.jsf.facesconfig.emf.StateManagerType; -import org.eclipse.jst.jsf.facesconfig.emf.ViewHandlerType; -import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit; -import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider; -import org.eclipse.ui.wizards.datatransfer.ImportOperation; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFile; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IDelegate; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.portlet.core.IJBossWebUtil; -import org.jboss.tools.portlet.core.IPortletConstants; import org.jboss.tools.portlet.core.JBossWebUtil; import org.jboss.tools.portlet.core.JBossWebUtil25; import org.jboss.tools.portlet.core.Messages; @@ -137,11 +115,20 @@ util.configureContextParam(project, monitor, name, value, description); = - // FIXME optional for Seam portlets version 2.1.x and up - name =3D "javax.faces.LIFECYCLE_ID"; //$NON-NLS-1$ - value =3D "SEAM_PORTLET"; //$NON-NLS-1$ - util.configureContextParam(project, monitor, name, value, - description); + // optional for Seam portlets version 2.1.x and up + try { + IProjectFacet seamFacet =3D ProjectFacetsManager.getProjectFacet("jst= .seam"); //$NON-NLS-1$ + final IFacetedProject fproj =3D ProjectFacetsManager.create(project); + IProjectFacetVersion sfVersion =3D fproj.getProjectFacetVersion(seamF= acet); + if (sfVersion.getVersionString().startsWith("1") || sfVersion.getVers= ionString().startsWith("2.0")) { //$NON-NLS-1$//$NON-NLS-2$ + name =3D "javax.faces.LIFECYCLE_ID"; //$NON-NLS-1$ + value =3D "SEAM_PORTLET"; //$NON-NLS-1$ + util.configureContextParam(project, monitor, name, value, + description); + } + } catch (CoreException e) { + PortletCoreActivator.log(e); + } } }, modelPath); } --===============8270247221917695983==-- From jbosstools-commits at lists.jboss.org Mon May 10 17:53:42 2010 Content-Type: multipart/mixed; boundary="===============9098353117054997087==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22000 - branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet. Date: Mon, 10 May 2010 17:53:42 -0400 Message-ID: <201005102153.o4ALrgbP008357@svn01.web.mwc.hst.phx2.redhat.com> --===============9098353117054997087== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-10 17:53:42 -0400 (Mon, 10 May 2010) New Revision: 22000 Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/s= rc/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetInst= allDelegate.java Log: https://jira.jboss.org/jira/browse/JBIDE-6272 Portletbridge 2.0.0.FINAL doe= sn't recognize the javax.faces.LIFECYCLE_ID parameter Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .core/src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFa= cetInstallDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetIns= tallDelegate.java 2010-05-10 21:47:58 UTC (rev 21999) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/internal/project/facet/SeamPortletFacetIns= tallDelegate.java 2010-05-10 21:53:42 UTC (rev 22000) @@ -10,43 +10,21 @@ *************************************************************************= ***********/ package org.jboss.tools.portlet.core.internal.project.facet; = -import java.io.File; -import java.net.URL; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; - -import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.emf.common.util.EList; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jst.j2ee.model.IModelProvider; import org.eclipse.jst.javaee.web.WebApp; import org.eclipse.jst.javaee.web.WebAppVersionType; -import org.eclipse.jst.jsf.facesconfig.emf.ApplicationType; -import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory; -import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType; -import org.eclipse.jst.jsf.facesconfig.emf.StateManagerType; -import org.eclipse.jst.jsf.facesconfig.emf.ViewHandlerType; -import org.eclipse.jst.jsf.facesconfig.util.FacesConfigArtifactEdit; -import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider; -import org.eclipse.ui.wizards.datatransfer.ImportOperation; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFile; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IDelegate; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.portlet.core.IJBossWebUtil; -import org.jboss.tools.portlet.core.IPortletConstants; import org.jboss.tools.portlet.core.JBossWebUtil; import org.jboss.tools.portlet.core.JBossWebUtil25; import org.jboss.tools.portlet.core.Messages; @@ -137,11 +115,20 @@ util.configureContextParam(project, monitor, name, value, description); = - // FIXME optional for Seam portlets version 2.1.x and up - name =3D "javax.faces.LIFECYCLE_ID"; //$NON-NLS-1$ - value =3D "SEAM_PORTLET"; //$NON-NLS-1$ - util.configureContextParam(project, monitor, name, value, - description); + // optional for Seam portlets version 2.1.x and up + try { + IProjectFacet seamFacet =3D ProjectFacetsManager.getProjectFacet("jst= .seam"); //$NON-NLS-1$ + final IFacetedProject fproj =3D ProjectFacetsManager.create(project); + IProjectFacetVersion sfVersion =3D fproj.getProjectFacetVersion(seamF= acet); + if (sfVersion.getVersionString().startsWith("1") || sfVersion.getVers= ionString().startsWith("2.0")) { //$NON-NLS-1$//$NON-NLS-2$ + name =3D "javax.faces.LIFECYCLE_ID"; //$NON-NLS-1$ + value =3D "SEAM_PORTLET"; //$NON-NLS-1$ + util.configureContextParam(project, monitor, name, value, + description); + } + } catch (CoreException e) { + PortletCoreActivator.log(e); + } } }, modelPath); } --===============9098353117054997087==-- From jbosstools-commits at lists.jboss.org Mon May 10 18:05:04 2010 Content-Type: multipart/mixed; boundary="===============3461232966406463334==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22001 - trunk/vpe/plugins/org.jboss.tools.vpe/ve. Date: Mon, 10 May 2010 18:05:04 -0400 Message-ID: <201005102205.o4AM54IC015423@svn01.web.mwc.hst.phx2.redhat.com> --===============3461232966406463334== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-10 18:05:03 -0400 (Mon, 10 May 2010) New Revision: 22001 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html Log: https://jira.jboss.org/jira/browse/JBIDE-5101 Resizer isn't shown correctly= for buttons, imput fields. controls adjusted padding for body updated in VE host pageto have space for resizer = elements Modified: trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2010-05-10 21:53:42 = UTC (rev 22000) +++ trunk/vpe/plugins/org.jboss.tools.vpe/ve/init.html 2010-05-10 22:05:03 = UTC (rev 22001) @@ -42,7 +42,7 @@ height:100%; min-height:50px; margin:0px; - padding:0px; + padding: 7px; /* resizer max(width,height)+2 */ = -moz-user-modify: read-write; -moz-user-input: enabled; -moz-user-select: normal; --===============3461232966406463334==-- From jbosstools-commits at lists.jboss.org Mon May 10 18:06:33 2010 Content-Type: multipart/mixed; boundary="===============7449048781770813853==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22002 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: utils and 1 other directories. Date: Mon, 10 May 2010 18:06:32 -0400 Message-ID: <201005102206.o4AM6WKN015774@svn01.web.mwc.hst.phx2.redhat.com> --===============7449048781770813853== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-10 18:06:32 -0400 (Mon, 10 May 2010) New Revision: 22002 Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/J= AXRSTester.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/J= AXWSTester.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/W= STestStatus.java Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/message= s/JBossWSUI.properties trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/message= s/JBossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/W= STestUtils.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/D= elimitedStringList.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/J= AXRSWSTestView.java Log: OPEN - issue JBIDE-6253: Need a web service tester (JAX-WS and JAX-RS) in t= he tooling = https://jira.jboss.org/jira/browse/JBIDE-6253 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= messages/JBossWSUI.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUI.properties 2010-05-10 22:05:03 UTC (rev 22001) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUI.properties 2010-05-10 22:06:32 UTC (rev 22002) @@ -69,8 +69,12 @@ = JAXRSWSTestView_Action_URL_Label=3DAction URL: JAXRSWSTestView_Configure_Monitor_Button=3DConfigure Monitor +JAXRSWSTestView_Exception_Status=3DException: = JAXRSWSTestView_HTTP_Method_Label=3DHTTP Method: JAXRSWSTestView_Invoke_Label=3DInvoke +JAXRSWSTestView_Invoking_WS_Status=3DInvoking web service... +JAXRSWSTestView_JAXRS_Success_Status=3DSuccessful JAX-RS Web Service Execu= tion +JAXRSWSTestView_JAXWS_Success_Status=3DSuccessful JAX-WS Web Service Execu= tion JAXRSWSTestView_Open_Monitor_Button=3DOpen Monitor JAXRSWSTestView_Request_Body_Label=3DRequest Body JAXRSWSTestView_Request_Header_Label=3DRequest Header Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= messages/JBossWSUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUIMessages.java 2010-05-10 22:05:03 UTC (rev 22001) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUIMessages.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -92,8 +92,12 @@ public static String JBossWS_DelimitedStringList_EditValue_Dialog_Message; public static String JAXRSWSTestView_Action_URL_Label; public static String JAXRSWSTestView_Configure_Monitor_Button; + public static String JAXRSWSTestView_Exception_Status; public static String JAXRSWSTestView_HTTP_Method_Label; public static String JAXRSWSTestView_Invoke_Label; + public static String JAXRSWSTestView_Invoking_WS_Status; + public static String JAXRSWSTestView_JAXRS_Success_Status; + public static String JAXRSWSTestView_JAXWS_Success_Status; public static String JAXRSWSTestView_Open_Monitor_Button; public static String JAXRSWSTestView_Request_Body_Label; public static String JAXRSWSTestView_Request_Header_Label; Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/uti= ls/JAXRSTester.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXRSTester.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXRSTester.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -0,0 +1,227 @@ +/*************************************************************************= ****** = + * Copyright (c) 2010 Red Hat, Inc. = + * Distributed under license by Red Hat, Inc. All rights reserved. = + * This program is made available under the terms of the = + * Eclipse Public License v1.0 which accompanies this distribution, = + * and is available at http://www.eclipse.org/legal/epl-v10.html = + * = + * Contributors: = + * Red Hat, Inc. - initial API and implementation = + *************************************************************************= *****/ +package org.jboss.tools.ws.ui.utils; + +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.net.HttpURLConnection; +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.URL; +import java.net.URLEncoder; +import java.util.Iterator; +import java.util.Map; +import java.util.Map.Entry; + +/** + * Tester class for JAX-RS services + * @author bfitzpat + * + */ +public class JAXRSTester { + = + // Result message to pass back + private String resultBody; + = + // HTTP headers going in and out + private Map requestHeaders =3D null; + private Map resultHeaders =3D null; + = + // utility constant + private String EMPTY_STRING =3D ""; //$NON-NLS-1$ + + /** + * Constructor + */ + public JAXRSTester() { + // empty + } + + /** + * Return the result message = + * @return String + */ + public String getResultBody() { + return this.resultBody; + } + + /** + * Return the result HTTP headers + * @return Map + */ + public Map getResultHeaders() { + return resultHeaders; + } + = + /** + * Return the request HTTP headers + * @return Map + */ + public Map getRequestHeaders() { + return requestHeaders; + } + + /* + * Start building the web query. Append parameters to URL + */ + private String buildWebQuery(Map parameters) throws Excep= tion { + if (!parameters.isEmpty()) { + StringBuilder sb =3D new StringBuilder(); + for (Map.Entry entry : parameters.entrySet()) { + String key =3D URLEncoder.encode(entry.getKey(), "UTF-8"); //= $NON-NLS-1$ + String value =3D URLEncoder.encode(entry.getValue(), "UTF-8")= ; //$NON-NLS-1$ + sb.append(key).append("=3D").append(value).append("&"); //$NO= N-NLS-1$ //$NON-NLS-2$ + } + return sb.toString().substring(0, sb.length() - 1); + } + return EMPTY_STRING; + } + + /** + * Simplest call for JAX-RS + * @param address + * @param parameters + * @param headers + * @throws Exception + */ + public void doTest (String address, Map parameters, Ma= p headers) throws Exception { + doTest(address, parameters, headers, "GET", null, null, 0); //$NON= -NLS-1$ + } + + /** + * Call a JAX-RS service + * @param address + * @param parameters + * @param headers + * @param methodType + * @param requestBody + * @throws Exception + */ + public void doTest (String address, Map parameters, Ma= p headers, String methodType, String requestBody) throws Ex= ception { + doTest (address, parameters, headers, methodType, requestBody, null, = 0); + } + + /** + * Call a JAX-RS service + * @param address + * @param parameters + * @param headers + * @param methodType + * @param requestBody + * @param proxy + * @param port + * @throws Exception + */ + public void doTest(String address, Map parameters, Map= headers, String methodType, String requestBody, String pro= xy, String port) throws Exception { + doTest(address, parameters, headers, methodType, requestBody, prox= y, Integer.parseInt(port)); + } + + /** + * Call a JAX-RS service + * @param address + * @param parameters + * @param headers + * @param methodType + * @param requestBody + * @param proxy + * @param port + * @throws Exception + */ + public void doTest(String address, Map parameters, Map= headers, String methodType, String requestBody, String pro= xy, int port) throws Exception { + + // handle the proxy + Proxy proxyObject =3D null; + if (proxy !=3D null && proxy.length() > 0 && port > 0) { + InetSocketAddress proxyAddress =3D new InetSocketAddress(proxy= , port); + proxyObject =3D new Proxy(Proxy.Type.HTTP, proxyAddress); + } + + // clear the returned results + resultBody =3D EMPTY_STRING; + = + // get the parms string + String query =3D buildWebQuery(parameters); + + // build the complete URL + URL url =3D null; + if (query !=3D null) { + // add the ? if there are parameters + if (!address.endsWith("?") && methodType.equalsIgnoreCase("GET= ") ) { //$NON-NLS-1$//$NON-NLS-2$ + address =3D address + "?"; //$NON-NLS-1$ + } + // add parms to the url if we have some + url =3D new URL(address + query); + } else { + url =3D new URL(address); + } + + // make connection + HttpURLConnection httpurlc =3D null; + if (proxyObject =3D=3D null) { + httpurlc =3D (HttpURLConnection) url.openConnection(); + } else { + // if have proxy, pass it along + httpurlc =3D (HttpURLConnection) url.openConnection(proxyObjec= t); + } + = + // since we are expecting output back, set to true + httpurlc.setDoOutput(true); + = + // not sure what this does - may be used for authentication? + httpurlc.setAllowUserInteraction(false); + = + // set whether this is a GET or POST + httpurlc.setRequestMethod(methodType); + = + // if we have headers to add + if (headers !=3D null && !headers.isEmpty()) { + Iterator iter =3D headers.entrySet().iterator(); + while (iter.hasNext()) { + Entry entry =3D (Entry)iter.next(); + if (entry.getKey() !=3D null && entry.getKey() instanceof String) + httpurlc.addRequestProperty((String) entry.getKey(), (String) e= ntry.getValue()); + } + } + = + requestHeaders =3D httpurlc.getRequestProperties(); + = + // CONNECT! + httpurlc.connect(); + + // If we are doing a POST and we have some request body to pass al= ong, do it + if (requestBody !=3D null && ( methodType.equalsIgnoreCase("POST")= //$NON-NLS-1$ + || methodType.equalsIgnoreCase("PUT"))) { //$NON-NLS-1$ + requestBody =3D WSTestUtils.stripNLsFromXML(requestBody); + OutputStreamWriter out =3D new OutputStreamWriter(httpurlc.getOut= putStream()); + out.write(requestBody); + out.close(); + } + + // retrieve result and put string results into the response + InputStream is =3D (InputStream) httpurlc.getInputStream(); + BufferedReader br =3D new BufferedReader(new InputStreamReader(is,= "UTF-8"));//$NON-NLS-1$ + StringBuilder sb =3D new StringBuilder(); + String line; + while ((line =3D br.readLine()) !=3D null) { + sb.append(line); + sb.append("\n");//$NON-NLS-1$ + } + br.close(); + resultBody =3D sb.toString(); + = + resultHeaders =3D httpurlc.getHeaderFields(); + = + // disconnect explicitly (may not be necessary) + httpurlc.disconnect(); + } = +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/t= ools/ws/ui/utils/JAXRSTester.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/uti= ls/JAXWSTester.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXWSTester.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXWSTester.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -0,0 +1,114 @@ +/*************************************************************************= ****** = + * Copyright (c) 2010 Red Hat, Inc. = + * Distributed under license by Red Hat, Inc. All rights reserved. = + * This program is made available under the terms of the = + * Eclipse Public License v1.0 which accompanies this distribution, = + * and is available at http://www.eclipse.org/legal/epl-v10.html = + * = + * Contributors: = + * Red Hat, Inc. - initial API and implementation = + *************************************************************************= *****/ +package org.jboss.tools.ws.ui.utils; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import javax.xml.soap.MimeHeader; +import javax.xml.soap.MimeHeaders; + +import org.apache.axis.Message; +import org.apache.axis.MessageContext; +import org.apache.axis.client.Call; +import org.apache.axis.client.Service; +import org.apache.axis.message.SOAPEnvelope; + +/** + * Tester class for JAX-WS services + * @author bfitzpat + * + */ +public class JAXWSTester { + = + // the response message to pass back + private String resultBody; + = + // the result HTTP headers to pass back + private HashMap resultHeaders; + = + // utility constant + private static final String EMPTY_STRING =3D ""; //$NON-NLS-1$ + = + /** + * Constructor = + */ + public JAXWSTester() { + // empty + } + = + /** + * Return the response message + * @return = + */ + public String getResultBody() { + return this.resultBody; + } + = + /** + * Return a map of HTTP headers from the response + * @return + */ + public Map getResultHeaders() { + return this.resultHeaders; + } + = + /** + * Invoke the JAX-WS service + * @param endpointurl + * @param actionurl + * @param body + * @throws Exception + */ + public void doTest( String endpointurl, String actionurl, String body ) t= hrows Exception { + /* = + * the endpoint & action urls + the soap in are what we + * need to invoke the WS + */ + String endpoint =3D endpointurl; + String action =3D actionurl; + String soapIn =3D body; = + + /* Use AXIS to call the WS */ + String document =3D WSTestUtils.stripNLsFromXML(soapIn); + Service service =3D new Service(); + Call call=3D (Call) service.createCall(); + call.setTargetEndpointAddress( new java.net.URL(endpoint) ); + call.setOperationStyle( org.apache.axis.constants.Style.MESSAGE ); + if ( action !=3D null ) { + call.setProperty(Call.SOAPACTION_USE_PROPERTY,Boolean.TRUE); + call.setProperty(Call.SOAPACTION_URI_PROPERTY,action); + } + Message message =3D new Message(document); + SOAPEnvelope envelope =3D call.invoke( message ); + = + // Get back the response message + this.resultBody =3D EMPTY_STRING; + if (envelope !=3D null && envelope.getBody() !=3D null) { = + this.resultBody =3D envelope.getBody().toString(); + } + = + // Get back the response HTTP headers and pass back as a Map + if (call !=3D null && call.getMessageContext() !=3D null) { + MessageContext mc =3D call.getMessageContext(); + if (mc.getMessage() !=3D null && mc.getMessage().getMimeHeaders() !=3D = null) { + MimeHeaders mh =3D mc.getMessage().getMimeHeaders(); + Iterator iter =3D mh.getAllHeaders(); + resultHeaders =3D new HashMap(); + while (iter.hasNext()) { + MimeHeader next =3D (MimeHeader)iter.next(); + resultHeaders.put(next.getName(), next.getValue()); + } + } + } + } +} \ No newline at end of file Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/t= ools/ws/ui/utils/JAXWSTester.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= utils/WSTestUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= WSTestUtils.java 2010-05-10 22:05:03 UTC (rev 22001) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= WSTestUtils.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -10,24 +10,6 @@ *************************************************************************= *****/ package org.jboss.tools.ws.ui.utils; = -import java.io.BufferedReader; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.net.HttpURLConnection; -import java.net.InetSocketAddress; -import java.net.Proxy; -import java.net.URL; -import java.net.URLEncoder; -import java.util.Iterator; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.axis.Message; -import org.apache.axis.client.Call; -import org.apache.axis.client.Service; -import org.apache.axis.message.SOAPEnvelope; - /** * Static utility methods for testing JAX-RS and JAX-WS web services * @author bfitzpat @@ -35,171 +17,6 @@ */ public class WSTestUtils { = - private static Map requestHeaders =3D null; - private static Map resultHeaders =3D null; - private static String EMPTY_STRING =3D ""; //$NON-NLS-1$ - - public static Map getResultHeaders() { - return WSTestUtils.resultHeaders; - } - = - public static Map getRequestHeaders() { - return WSTestUtils.requestHeaders; - } - = - /* - * Start building the web query. Append parameters to URL - */ - private static String buildWebQuery(Map parameters) throw= s Exception { - if (!parameters.isEmpty()) { - StringBuilder sb =3D new StringBuilder(); - for (Map.Entry entry : parameters.entrySet()) { - String key =3D URLEncoder.encode(entry.getKey(), "UTF-8"); //= $NON-NLS-1$ - String value =3D URLEncoder.encode(entry.getValue(), "UTF-8")= ; //$NON-NLS-1$ - sb.append(key).append("=3D").append(value).append("&"); //$NO= N-NLS-1$ //$NON-NLS-2$ - } - return sb.toString().substring(0, sb.length() - 1); - } - return EMPTY_STRING; - } - - // static simple call, pass in url, parms, and headers - public static String callRestfulWebService(String address, Map parameters, Map headers) throws Exception { - return callRestfulWebService(address, parameters, headers, "GET", = null, null, 0); //$NON-NLS-1$ - } - - // static call - provide url, parms, headers, the method type, and req= uest body - public static String callRestfulWebService(String address, Map parameters, Map headers, String methodType, String= requestBody) throws Exception { - return callRestfulWebService(address, parameters, headers, methodT= ype, requestBody, null, 0); - } - - // static call - provide url, parms, headers, the method type, request= body, proxy string, and port # as string - public static String callRestfulWebService(String address, Map parameters, Map headers, String methodType, String= requestBody, String proxy, String port) throws Exception { - return callRestfulWebService(address, parameters, headers, methodT= ype, requestBody, proxy, Integer.parseInt(port)); - } - - // static call - provide url, parms, headers, the method type, request= body, proxy string, port # - public static String callRestfulWebService(String address, Map parameters, Map headers, String methodType, String= requestBody, String proxy, int port) throws Exception { - - // handle the proxy - Proxy proxyObject =3D null; - if (proxy !=3D null && proxy.length() > 0 && port > 0) { - InetSocketAddress proxyAddress =3D new InetSocketAddress(proxy= , port); - proxyObject =3D new Proxy(Proxy.Type.HTTP, proxyAddress); - } - - // clear the returned results - String response =3D EMPTY_STRING; - = - // get the parms string - String query =3D buildWebQuery(parameters); - - // build the complete URL - URL url =3D null; - if (query !=3D null) { - // add the ? if there are parameters - if (!address.endsWith("?") && methodType.equalsIgnoreCase("GET= ") ) { //$NON-NLS-1$//$NON-NLS-2$ - address =3D address + "?"; //$NON-NLS-1$ - } - // add parms to the url if we have some - url =3D new URL(address + query); - } else { - url =3D new URL(address); - } - - // make connection - HttpURLConnection httpurlc =3D null; - if (proxyObject =3D=3D null) { - httpurlc =3D (HttpURLConnection) url.openConnection(); - } else { - // if have proxy, pass it along - httpurlc =3D (HttpURLConnection) url.openConnection(proxyObjec= t); - } - = - // since we are expecting output back, set to true - httpurlc.setDoOutput(true); - = - // not sure what this does - may be used for authentication? - httpurlc.setAllowUserInteraction(false); - = - // set whether this is a GET or POST - httpurlc.setRequestMethod(methodType); - = - // if we have headers to add - if (headers !=3D null && !headers.isEmpty()) { - Iterator iter =3D headers.entrySet().iterator(); - while (iter.hasNext()) { - Entry entry =3D (Entry)iter.next(); - if (entry.getKey() !=3D null && entry.getKey() instanceof String) - httpurlc.addRequestProperty((String) entry.getKey(), (String) e= ntry.getValue()); - } - } - = - requestHeaders =3D httpurlc.getRequestProperties(); - = - // CONNECT! - httpurlc.connect(); - - // If we are doing a POST and we have some request body to pass al= ong, do it - if (requestBody !=3D null && ( methodType.equalsIgnoreCase("POST")= //$NON-NLS-1$ - || methodType.equalsIgnoreCase("PUT"))) { //$NON-NLS-1$ - requestBody =3D stripNLsFromXML(requestBody); - OutputStreamWriter out =3D new OutputStreamWriter(httpurlc.getOut= putStream()); - out.write(requestBody); - out.close(); - } - - // retrieve result and put string results into the response - InputStream is =3D (InputStream) httpurlc.getInputStream(); - BufferedReader br =3D new BufferedReader(new InputStreamReader(is,= "UTF-8"));//$NON-NLS-1$ - StringBuilder sb =3D new StringBuilder(); - String line; - while ((line =3D br.readLine()) !=3D null) { - sb.append(line); - sb.append("\n");//$NON-NLS-1$ - } - br.close(); - response =3D sb.toString(); - = - resultHeaders =3D httpurlc.getHeaderFields(); - = - // disconnect explicitly (may not be necessary) - httpurlc.disconnect(); - - return response; - } = - - /* - * Invokes the WS and returns a result - */ - public static String invokeWS( String endpointurl, String actionurl, Stri= ng body ) throws Exception { - = - /* = - * the endpoint & action urls + the soap in are what we - * need to invoke the WS - */ - String endpoint =3D endpointurl; - String action =3D actionurl; - String soapIn =3D body; = - - /* Use AXIS to call the WS */ - String document =3D stripNLsFromXML(soapIn); - Service service =3D new Service(); - Call call=3D (Call) service.createCall(); - call.setTargetEndpointAddress( new java.net.URL(endpoint) ); - call.setOperationStyle( org.apache.axis.constants.Style.MESSAGE ); - if ( action !=3D null ) { - call.setProperty(Call.SOAPACTION_USE_PROPERTY,Boolean.TRUE); - call.setProperty(Call.SOAPACTION_URI_PROPERTY,action); - } - Message message =3D new Message(document); - SOAPEnvelope envelope =3D call.invoke( message ); - System.out.println(envelope.getHeaders().toString()); - = - String cleanedUp =3D stripNLsFromXML(envelope.getBody().toString()); - return cleanedUp; - } - = public static String addNLsToXML( String incoming ) { String outgoing =3D null; if (incoming !=3D null) { Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/DelimitedStringList.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= DelimitedStringList.java 2010-05-10 22:05:03 UTC (rev 22001) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= DelimitedStringList.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -446,21 +446,27 @@ * @return */ private String[] parseString(String str_list) { - StringTokenizer tk =3D new StringTokenizer(str_list, this.mDelimiter); - String[] pieces =3D new String[tk.countTokens()]; - int index =3D 0; - while (tk.hasMoreTokens()) - pieces[index++] =3D tk.nextToken(); - return pieces; + if (str_list !=3D null) { + StringTokenizer tk =3D new StringTokenizer(str_list, this.mDelimiter); + String[] pieces =3D new String[tk.countTokens()]; + int index =3D 0; + while (tk.hasMoreTokens()) + pieces[index++] =3D tk.nextToken(); + return pieces; + } = + return new String[0]; } = public static String[] parseString(String str_list, String delimiter) { - StringTokenizer tk =3D new StringTokenizer(str_list, delimiter); - String[] pieces =3D new String[tk.countTokens()]; - int index =3D 0; - while (tk.hasMoreTokens()) - pieces[index++] =3D tk.nextToken(); - return pieces; + if (str_list !=3D null) { + StringTokenizer tk =3D new StringTokenizer(str_list, delimiter); + String[] pieces =3D new String[tk.countTokens()]; + int index =3D 0; + while (tk.hasMoreTokens()) + pieces[index++] =3D tk.nextToken(); + return pieces; + } + return new String[0]; } = /** Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/JAXRSWSTestView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-10 22:05:03 UTC (rev 22001) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -18,6 +18,12 @@ import java.util.Map.Entry; = import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.core.runtime.jobs.IJobChangeEvent; +import org.eclipse.core.runtime.jobs.IJobChangeListener; +import org.eclipse.core.runtime.jobs.Job; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; @@ -42,9 +48,17 @@ import org.eclipse.ui.part.ViewPart; import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor; import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorC= ore; +import org.jboss.tools.ws.ui.JBossWSUIPlugin; import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; +import org.jboss.tools.ws.ui.utils.JAXRSTester; +import org.jboss.tools.ws.ui.utils.JAXWSTester; import org.jboss.tools.ws.ui.utils.WSTestUtils; = +/** + * View for testing web services (JAX-WS & JAX-RS) + * @author bfitzpat + * + */ @SuppressWarnings("restriction") public class JAXRSWSTestView extends ViewPart { = @@ -56,6 +70,7 @@ private static final String JAX_WS =3D "JAX-WS"; //$NON-NLS-1$ private static final String JAX_RS =3D "JAX-RS"; //$NON-NLS-1$ private static final String EMPTY_STRING =3D ""; //$NON-NLS-1$ + private static final String RESULT_HEADER_DELIMITER =3D "%";//$NON-NLS-1$ = /** * The ID of the view as specified by the extension. @@ -84,7 +99,7 @@ private DelimitedStringList parmsList; private Button openTCPIPMonitorButton; private Button addTCPIPMonitorButton; - = + /** * The constructor. */ @@ -99,17 +114,17 @@ = Composite innerComposite =3D new Composite (parent, SWT.NONE); innerComposite.setLayout(new FillLayout()); - = + SashForm sashForm =3D new SashForm(innerComposite, SWT.BORDER); sashForm.setOrientation(SWT.HORIZONTAL); - = - Composite topHalf =3D new Composite (sashForm, SWT.NONE); + + Composite topHalf =3D new Composite (sashForm, SWT.NONE); topHalf.setLayout(new GridLayout(2, false)); - = + Label typeLabel =3D new Label(topHalf, SWT.NONE); typeLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Web_Service_Type_Lab= el); typeLabel.setLayoutData(new GridData()); - = + wsTypeCombo =3D new Combo(topHalf, SWT.DROP_DOWN | SWT.READ_ONLY); wsTypeCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); wsTypeCombo.add(JAX_WS); @@ -124,11 +139,11 @@ setControlsForSelectedURL(); } }); - = + Label methodLabel =3D new Label(topHalf, SWT.NONE); methodLabel.setText(JBossWSUIMessages.JAXRSWSTestView_HTTP_Method_Label); methodLabel.setLayoutData(new GridData()); - = + methodCombo =3D new Combo(topHalf, SWT.DROP_DOWN | SWT.READ_ONLY); methodCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); methodCombo.add(GET); @@ -144,11 +159,11 @@ setControlsForMethodType(methodCombo.getText()); } }); - = + Label urlLabel =3D new Label(topHalf, SWT.NONE); urlLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Service_URL_Label); urlLabel.setLayoutData(new GridData()); - = + urlCombo =3D new Combo(topHalf, SWT.BORDER | SWT.DROP_DOWN); urlCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); urlCombo.addSelectionListener(new SelectionListener() { @@ -166,15 +181,15 @@ public void keyReleased(KeyEvent e) { setControlsForSelectedURL(); if (e.keyCode =3D=3D SWT.CR) { - handleTest(); + handleTest(wsTypeCombo.getText()); } } }); - = + Label actionLabel =3D new Label(topHalf, SWT.NONE); actionLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Action_URL_Label); actionLabel.setLayoutData(new GridData()); - = + actionText =3D new Text(topHalf, SWT.BORDER); actionText.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); = @@ -191,18 +206,18 @@ GridData parmsListGD =3D new GridData(SWT.FILL, SWT.FILL, true, true); parmsListGD.horizontalSpan =3D 2; parmsList.setLayoutData(parmsListGD); - = + headerTab =3D new TabItem(tabGroup, SWT.NONE, 2); bodyText =3D new Text(tabGroup, SWT.BORDER | SWT.WRAP | SWT.V_SCROLL); GridData btGridData =3D new GridData(SWT.FILL, SWT.FILL, true, true); bodyText.setLayoutData(btGridData); bodyTab.setControl(bodyText); - = + headerTab.setText(JBossWSUIMessages.JAXRSWSTestView_Request_Header_Label= ); GridData hgGridData =3D new GridData(SWT.FILL, SWT.FILL, true, true); hgGridData.horizontalSpan =3D 2; tabGroup.setLayoutData(hgGridData); - = + dlsList =3D new DelimitedStringList(tabGroup, SWT.None); headerTab.setControl(dlsList); GridData dlsListGD =3D new GridData(SWT.FILL, SWT.FILL, true, true); @@ -214,22 +229,22 @@ buttonBarGD.horizontalSpan =3D 2; buttonBar.setLayoutData(buttonBarGD); buttonBar.setLayout(new RowLayout()); - = + testButton =3D new Button (buttonBar, SWT.PUSH); testButton.setText(JBossWSUIMessages.JAXRSWSTestView_Invoke_Label); - = + testButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { - handleTest(); + handleTest(wsTypeCombo.getText()); } public void widgetDefaultSelected(SelectionEvent e) { widgetSelected(e); } }); - = + addTCPIPMonitorButton =3D new Button(buttonBar, SWT.PUSH); addTCPIPMonitorButton.setText(JBossWSUIMessages.JAXRSWSTestView_Configur= e_Monitor_Button); - = + addTCPIPMonitorButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { configureMonitor(); @@ -241,7 +256,7 @@ = openTCPIPMonitorButton =3D new Button(buttonBar, SWT.PUSH); openTCPIPMonitorButton.setText(JBossWSUIMessages.JAXRSWSTestView_Open_Mo= nitor_Button); - = + openTCPIPMonitorButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { openMonitor(); @@ -253,8 +268,8 @@ = Button sampleButton =3D new Button(buttonBar, SWT.PUSH); sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_L= abel); - sampleButton.setVisible(false); - = + sampleButton.setVisible(true); + sampleButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { setupSample(); @@ -277,7 +292,7 @@ resultsText =3D new Text(resultTabGroup, SWT.BORDER | SWT.V_SCROLL | SWT= .WRAP | SWT.READ_ONLY ); resultsText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); resultTab.setControl(resultsText); - = + resultHeadersTab =3D new TabItem(resultTabGroup, SWT.NONE, 1); resultHeadersTab.setText(JBossWSUIMessages.JAXRSWSTestView_Results_Heade= r_Label); resultHeadersList =3D new List(resultTabGroup, SWT.V_SCROLL); @@ -291,7 +306,7 @@ setControlsForMethodType(methodCombo.getText()); setControlsForSelectedURL(); } - = + private void setControlsForSelectedURL() { if (urlCombo.getText().trim().length() > 0) { testButton.setEnabled(true); @@ -301,19 +316,19 @@ addTCPIPMonitorButton.setEnabled(false); } } - = + /* * Open the TCP/IP Monitor View = */ private void openMonitor() { try { PlatformUI.getWorkbench().getActiveWorkbenchWindow(). - getActivePage().showView(TCPIP_VIEW_ID); + getActivePage().showView(TCPIP_VIEW_ID); } catch (PartInitException e) { e.printStackTrace(); } } - = + private IMonitor findMonitor(String urlToCheck) { IMonitor monitor =3D null; = @@ -328,7 +343,7 @@ } return monitor; } - = + /* * Configure a TCP/IP Monitor entry so we can monitor it = */ @@ -337,7 +352,7 @@ String oldUrl =3D urlCombo.getText(); IMonitor monitor =3D findMonitor(oldUrl); if (monitor =3D=3D null) { - = + URL tempURL =3D null; try { tempURL =3D new URL(oldUrl); @@ -354,7 +369,7 @@ return; monitor =3D dialog.getMonitor(); } - = + if (monitor !=3D null) { monitor =3D findMonitor(oldUrl); if (monitor !=3D null) { @@ -367,7 +382,7 @@ e.printStackTrace(); } } - = + int port =3D monitor.getLocalPort(); int remotePort =3D monitor.getRemotePort(); String host =3D monitor.getRemoteHost(); @@ -397,7 +412,7 @@ bodyText.setEnabled(true); } } - = + /* * Enable/disable controls based on the WS technology type * @param wsType @@ -414,13 +429,13 @@ methodCombo.setText(POST); = String emptySOAP =3D "" = + //$NON-NLS-1$ - "" + //$NON-NLS-1$ - "" + //$NON-NLS-1$ - "" + //$NON-NLS-1$ - ""; //$NON-NLS-1$ + "" + //$NON-NLS-1$ + "" + //$NON-NLS-1$ + "" + //$NON-NLS-1$ + ""; //$NON-NLS-1$ emptySOAP =3D WSTestUtils.addNLsToXML(emptySOAP); - = + if (bodyText.getText().trim().length() =3D=3D 0) { bodyText.setText(emptySOAP); } @@ -436,7 +451,7 @@ methodCombo.setText(GET); } } - = + /* * Sets up the controls to call a public sample RESTful WS that does * a postal code lookup or a JAX-WS service that does a = @@ -455,16 +470,16 @@ } else if (wsTypeCombo.getText().equalsIgnoreCase(JAX_WS)) { String soapIn =3D "" + /= /$NON-NLS-1$ - "" + //$NON-NLS-1$ - "" + //$NON-NLS-1$ - "" + //$NON-NLS-1$ - "slings and arrows"+ //$NON-NLS-1$ - ""+ //$NON-NLS-1$ - "" + //$NON-NLS-1$ - ""; //$NON-NLS-1$ + "" + //$NON-NLS-1$ + "" + //$NON-NLS-1$ + "" + //$NON-NLS-1$ + "slings and arrows"+ //$NON-NLS-1$ + ""+ //$NON-NLS-1$ + "" + //$NON-NLS-1$ + ""; //$NON-NLS-1$ soapIn =3D WSTestUtils.addNLsToXML(soapIn); - = + urlCombo.setText("http://www.xmlme.com/WSShakespeare.asmx"); //$NON-NLS= -1$ actionText.setText("http://xmlme.com/WebServices/GetSpeech"); //$NON-NL= S-1$ bodyText.setText(soapIn); @@ -480,7 +495,8 @@ /* * Actually perform the test based on which type of activity it is = */ - private void handleTest() { + private void handleTest(final String wsTech) { + if (urlCombo.getItemCount() > 0) { java.util.List aList =3D Arrays.asList(urlCombo.getItems()); if (!aList.contains(urlCombo.getText())) { @@ -490,26 +506,82 @@ urlCombo.add(urlCombo.getText()); } = - if (wsTypeCombo.getText().equalsIgnoreCase(JAX_RS)) { - handleRSTest(); - } - else if (wsTypeCombo.getText().equalsIgnoreCase(JAX_WS)) { - handleWSTest(); - } + final String url =3D urlCombo.getText(); + final String action =3D actionText.getText(); + final String body =3D bodyText.getText(); + final String method =3D methodCombo.getText(); + final String headers =3D dlsList.getSelection(); + final String parms =3D parmsList.getSelection(); + + Job aJob =3D new Job(JBossWSUIMessages.JAXRSWSTestView_Invoking_WS_Statu= s) { + protected IStatus run(IProgressMonitor monitor) { + IStatus status =3D Status.OK_STATUS; + // execute the task ... + if (wsTech.equalsIgnoreCase(JAX_RS)) { + status =3D handleRSTest(monitor, url, method, body, parms, headers); + } + else if (wsTech.equalsIgnoreCase(JAX_WS)) { + status =3D handleWSTest(monitor, url, action, body); + } + monitor.done(); + return status; = + } + }; + // true to indicate that this job was initiated by a UI end user + aJob.setUser(true); = + aJob.schedule(); + aJob.addJobChangeListener(new IJobChangeListener() { + = + public void sleeping(IJobChangeEvent event) {}; + public void scheduled(IJobChangeEvent event) {}; + public void running(IJobChangeEvent event) {}; + public void done(IJobChangeEvent event) { + if (event.getResult() instanceof WSTestStatus) { + final WSTestStatus status =3D (WSTestStatus) event.getResult(); + PlatformUI.getWorkbench().getDisplay().syncExec(new Runnable() { + public void run() { + resultsText.setText(status.getResultsText()); + resultHeadersList.removeAll(); + String[] headers =3D + DelimitedStringList.parseString(status.getHeadersList(), RESULT_HE= ADER_DELIMITER); + if (headers !=3D null && headers.length > 0) { + for (int i =3D 0; i < headers.length; i++) { = + resultHeadersList.add(headers[i]); + } + } + } + }); + } + } + = + public void awake(IJobChangeEvent event) {}; + public void aboutToRun(IJobChangeEvent event) {}; + }); + } - = + /* * Actually call the WS and displays the result = */ - private void handleWSTest() { + private IStatus handleWSTest(final IProgressMonitor monitor, String url, = String action, String body) { try { - String result =3D WSTestUtils.invokeWS(urlCombo.getText(), actionText.g= etText(), bodyText.getText()); + = + monitor.worked(10); + JAXWSTester tester =3D new JAXWSTester(); + tester.doTest(url, action, body); + monitor.worked(70); + String result =3D tester.getResultBody(); String cleanedUp =3D WSTestUtils.addNLsToXML(result); - resultsText.setText(cleanedUp); + = + WSTestStatus status =3D new WSTestStatus(IStatus.OK, = + JBossWSUIPlugin.PLUGIN_ID, = + JBossWSUIMessages.JAXRSWSTestView_JAXWS_Success_Status); + status.setResultsText(cleanedUp); + monitor.worked(10); = - resultHeadersList.removeAll(); - if (WSTestUtils.getResultHeaders() !=3D null) { - Iterator iter =3D WSTestUtils.getResultHeaders().entrySet().iterato= r(); + String listText =3D EMPTY_STRING; + if (tester.getResultHeaders() !=3D null) { + Iterator iter =3D tester.getResultHeaders().entrySet().iterator(); while (iter.hasNext()) { String text =3D EMPTY_STRING; Entry entry =3D (Entry) iter.next(); @@ -517,38 +589,42 @@ text =3D entry.getValue().toString(); else text =3D text + entry.toString(); - resultHeadersList.add(text); + listText =3D listText + text; + if (iter.hasNext()) { + listText =3D listText + RESULT_HEADER_DELIMITER; + } } } + status.setHeadersList(listText); + monitor.worked(10); + return status; } catch (Exception e) { - resultsText.setText(e.toString()); + WSTestStatus status =3D new WSTestStatus(IStatus.ERROR, = + JBossWSUIPlugin.PLUGIN_ID, = + JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalizedMe= ssage()); + status.setResultsText(e.toString()); e.printStackTrace(); + return status; } } = /* * Actually call the RESTful WS to test it */ - private void handleRSTest() { - = - // Get the service URL - String address =3D urlCombo.getText(); - = - // Is this a GET or POST activity? - String method =3D methodCombo.getText(); - = - // If it's a GET, what's the Request body text? - String body =3D EMPTY_STRING; - if (method.equalsIgnoreCase(GET)) - body =3D bodyText.getText(); - = + private IStatus handleRSTest(final IProgressMonitor monitor, String addre= ss, String method, String body, String parms, String headersStr) { + + if (!method.equalsIgnoreCase(GET)) + body =3D EMPTY_STRING; + // if no actual text in the request body, set to null if (body.trim().length() =3D=3D 0) body =3D null; - = + + monitor.worked(10); + // Process parameters for web service call HashMap parameters =3D new HashMap(); - if (!parmsList.isDisposed() && parmsList.getSelection() !=3D null && par= msList.getSelection().length() > 0) { - String[] parsedList =3D DelimitedStringList.parseString(parmsList.getSe= lection() , ","); //$NON-NLS-1$ + if (parms !=3D null && parms.length() > 0) { + String[] parsedList =3D DelimitedStringList.parseString(parms , ","); /= /$NON-NLS-1$ if (parsedList !=3D null && parsedList.length > 0) { for (int i =3D 0; i < parsedList.length; i++) { String nameValuePair =3D parsedList[i]; @@ -559,11 +635,12 @@ } } } - = + + monitor.worked(10); // Process headers for web service call HashMap headers =3D new HashMap(); - if (!dlsList.isDisposed() && dlsList.getSelection() !=3D null && dlsList= .getSelection().length() > 0) { - String[] parsedList =3D DelimitedStringList.parseString(dlsList.getSele= ction() , ","); //$NON-NLS-1$ + if (headersStr !=3D null && headersStr.length() > 0) { + String[] parsedList =3D DelimitedStringList.parseString(headersStr , ",= "); //$NON-NLS-1$ if (parsedList !=3D null && parsedList.length > 0) { for (int i =3D 0; i < parsedList.length; i++) { String nameValuePair =3D parsedList[i]; @@ -574,40 +651,57 @@ } } } - = + // now actually call it try { - // clear the results text - resultsText.setText(EMPTY_STRING); = + JAXRSTester tester =3D new JAXRSTester(); + = // call the service - String result =3D - WSTestUtils.callRestfulWebService(address, parameters, headers, method= , body); + tester.doTest(address, parameters, headers, method, body); = + String result =3D tester.getResultBody(); + // put the results in the result text field String cleanedUp =3D WSTestUtils.addNLsToXML(result); - resultsText.setText(cleanedUp); = - resultHeadersList.removeAll(); - Iterator iter =3D WSTestUtils.getResultHeaders().entrySet().iterator= (); - while (iter.hasNext()) { - String text =3D EMPTY_STRING; - Entry entry =3D (Entry) iter.next(); - if (entry.getKey() =3D=3D null) = - text =3D entry.getValue().toString(); - else - text =3D text + entry.toString(); - resultHeadersList.add(text); + WSTestStatus status =3D new WSTestStatus(IStatus.OK, = + JBossWSUIPlugin.PLUGIN_ID, = + JBossWSUIMessages.JAXRSWSTestView_JAXRS_Success_Status); + status.setResultsText(cleanedUp); + + String listText =3D EMPTY_STRING; + if (tester.getResultHeaders() !=3D null) { + Iterator iter =3D tester.getResultHeaders().entrySet().iterator(); + while (iter.hasNext()) { + String text =3D EMPTY_STRING; + Entry entry =3D (Entry) iter.next(); + if (entry.getKey() =3D=3D null) = + text =3D entry.getValue().toString(); + else + text =3D text + entry.toString(); + listText =3D listText + text; + if (iter.hasNext()) { + listText =3D listText + RESULT_HEADER_DELIMITER; + } + } } = + System.out.println(listText); + status.setHeadersList(listText); + monitor.worked(10); + return status; + = } catch (Exception e) { - = - // if we hit an error, put it in the results text - resultsText.setText(e.toString()); + WSTestStatus status =3D new WSTestStatus(IStatus.ERROR, = + JBossWSUIPlugin.PLUGIN_ID, = + JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalizedMe= ssage()); + status.setResultsText(e.toString()); e.printStackTrace(); + return status; } } - = + /** * Passing the focus request to the control. */ @@ -615,4 +709,5 @@ // set initial focus to the URL text combo urlCombo.setFocus(); } + = } \ No newline at end of file Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/vie= ws/WSTestStatus.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= WSTestStatus.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= WSTestStatus.java 2010-05-10 22:06:32 UTC (rev 22002) @@ -0,0 +1,29 @@ +package org.jboss.tools.ws.ui.views; + +import org.eclipse.core.runtime.Status; + +public class WSTestStatus extends Status { + + private String resultsText; + private String headersList; + = + public WSTestStatus(int severity, String pluginId, String message) { + super(severity, pluginId, message); + } + + public String getResultsText() { + return resultsText; + } + + public void setResultsText(String resultsText) { + this.resultsText =3D resultsText; + } + + public String getHeadersList() { + return headersList; + } + + public void setHeadersList(String headersList) { + this.headersList =3D headersList; + } +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/t= ools/ws/ui/views/WSTestStatus.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============7449048781770813853==-- From jbosstools-commits at lists.jboss.org Tue May 11 04:09:40 2010 Content-Type: multipart/mixed; boundary="===============3601161227559210773==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22003 - in trunk: drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke and 2 other directories. Date: Tue, 11 May 2010 04:09:40 -0400 Message-ID: <201005110809.o4B89egn018203@svn01.web.mwc.hst.phx2.redhat.com> --===============3601161227559210773== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vpakan(a)redhat.com Date: 2010-05-11 04:09:39 -0400 (Tue, 11 May 2010) New Revision: 22003 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/DroolsAllBotTests.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/ManageDroolsRules.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/RuleFlowTest.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTEclipseExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTOpenExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/IDELabel.java Log: Added small fixes to Drools SWTBot Tests. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/DroolsAllBotTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-10 22:06:32 UTC (rev 2= 2002) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-11 08:09:39 UTC (rev 2= 2003) @@ -98,7 +98,8 @@ } catch (WidgetNotFoundException wnfe){ // Do nothing ignore this error } - eclipse.openPerspective(PerspectiveType.JAVA); = + eclipse.openPerspective(PerspectiveType.JAVA); + eclipse.maximizeActiveShell(); } = @AfterClass Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java 2010-05-1= 0 22:06:32 UTC (rev 22002) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/DomainSpecificLanguageEditorTest.java 2010-05-1= 1 08:09:39 UTC (rev 22003) @@ -20,6 +20,7 @@ import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.Timing; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; +import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt; import org.jboss.tools.ui.bot.ext.types.EntityType; import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.jboss.tools.ui.bot.ext.types.JobName; @@ -112,6 +113,8 @@ SWTBotEclipseEditor drlDroolsEditor =3D packageExplorer.openFile(Drool= sAllBotTests.DROOLS_PROJECT_NAME , DroolsAllBotTests.SRC_MAIN_RULES_TREE_NODE, DroolsAllBotTests.SAMPLE_DROOLS_RULE_NAME).toTextEditor(); + SWTBotEditorExt ruleEditor =3D bot.swtBotEditorExtByTitle(DroolsAllBot= Tests.SAMPLE_DROOLS_RULE_NAME); + ruleEditor.selectPage(IDELabel.DroolsEditor.TEXT_EDITOR_TAB); = // update drl file drlDroolsEditor.insertText(3,0,"\nexpander " + dslFileName + @@ -121,7 +124,9 @@ drlDroolsEditor.insertText(lineNumber,0,">"); } drlDroolsEditor.selectLine(18); + bot.sleep(Timing.time1S()); KeyboardHelper.pressKeyCode(bot.getDisplay(),(int)SWT.DEL); + bot.sleep(Timing.time1S()); drlDroolsEditor.insertText(18, 0, " Message m of type Message.G= OODBYE contains myMessage"); drlDroolsEditor.save(); util.waitForJobs(Timing.time10S(), JobName.BUILDING_WS); Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/smoke/ManageDroolsRules.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/ManageDroolsRules.java 2010-05-10 22:06:32 UTC = (rev 22002) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/ManageDroolsRules.java 2010-05-11 08:09:39 UTC = (rev 22003) @@ -98,7 +98,8 @@ DroolsAllBotTests.COM_SAMPLE_TREE_NODE}); console.clearConsole(); eclipse.debugTreeItemAsDroolsApplication(tiDroolsTest); - eclipse.closeConfirmPerspectiveSwitchShellIfOpened(true); + bot.sleep(Timing.time3S()); + eclipse.closeConfirmPerspectiveSwitchShellIfOpened(false); String consoleText =3D console.getConsoleText(3*1000L,3*1000L,true); assertTrue("Drools Rule was not debuged properly.\nConsole content sho= uld have been empty but is:\n" + consoleText, consoleText.length() =3D=3D 0); Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-10 22:06:32 UTC (rev = 22002) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-11 08:09:39 UTC (rev = 22003) @@ -34,6 +34,7 @@ import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; +import org.jboss.tools.ui.bot.ext.types.IDELabel; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -99,7 +100,11 @@ // Test if Rule Flow RF File is opened in editor assertTrue("Rule Flow RF File is not opened properly. File " + ruleFlo= wFileName + " is not opened in editor", SWTEclipseExt.existEditorWithLabel(bot,ruleFlowFileName)); - = + // Maximize editor + bot.menu(IDELabel.Menu.WINDOW) + .menu(IDELabel.Menu.NAVIGATION) + .menu(IDELabel.Menu.MAXIMIZE_ACTIVE_VIEW_OR_EDITOR) + .click(); SWTGefBot gefBot =3D new SWTGefBot(); SWTBotGefEditor gefEditor =3D gefBot.gefEditor(ruleFlowFileName); final Control editorControl =3D (Control)gefEditor.getWidget(); @@ -137,11 +142,17 @@ // Delete each component gefEditor.activateTool("Select"); for (int toolIndex =3D 0;toolIndex < tools.length;toolIndex++){ - gefEditor.mouseMoveLeftClick(xspacing * (toolIndex % 3) + xoffset + = 5, = - yspacing * (toolIndex / 3) + yoffset + 5); + gefEditor.mouseMoveLeftClick(xspacing * (toolIndex % 3) + xoffset + = 10, = + yspacing * (toolIndex / 3) + yoffset + 10); KeyboardHelper.pressKeyCode(bot.getDisplay(),(int)SWT.DEL); } + // Restore maximized editor + bot.menu(IDELabel.Menu.WINDOW) + .menu(IDELabel.Menu.NAVIGATION) + .menu(IDELabel.Menu.MAXIMIZE_ACTIVE_VIEW_OR_EDITOR) + .click(); gefEditor.save(); + gefEditor.close(); checkEmptyRFFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , ruleFlowFileN= ame); } = /** Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTEclipseExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -770,10 +770,11 @@ /** * Hide Warning Message if displayed static version */ - public static void hideWarningIfDisplayed(SWTBotExt bot) { + public static void hideWarningIfDisplayed(SWTBot bot) { try { - bot.shell(IDELabel.Shell.WARNING).activate(); - bot.button(IDELabel.Button.OK).click(); + SWTBot warningBot =3D bot.shell(IDELabel.Shell.WARNING).activate().bot= (); + warningBot.sleep(Timing.time3S()); + warningBot.button(IDELabel.Button.OK).click(); } catch (WidgetNotFoundException wnfe) { // do nothing } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTOpenExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTOpenExt.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTOpenExt.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -246,6 +246,7 @@ SWTBotShell activeShell =3D bot.activeShell(); String activeShellStr =3D bot.activeShell().getText(); bot.button(finishButtonText).click(); + SWTEclipseExt.hideWarningIfDisplayed(bot); long time =3D System.currentTimeMillis(); while (true) { log.info("Waiting until shell '" + activeShellStr + "' closes"); Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/IDELabel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-10 22:06:32 UTC (rev 22002) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-11 08:09:39 UTC (rev 22003) @@ -72,6 +72,8 @@ public static final String GUVNOR_ADD =3D "Add..."; public static final String GUVNOR_DELETE =3D "Delete..."; public static final String GUVNOR_DISCONNECT =3D "Disconnect"; + public static final String NAVIGATION =3D "Navigation"; + public static final String MAXIMIZE_ACTIVE_VIEW_OR_EDITOR =3D "Maximiz= e Active View or Editor"; } = public class Button { --===============3601161227559210773==-- From jbosstools-commits at lists.jboss.org Tue May 11 07:53:07 2010 Content-Type: multipart/mixed; boundary="===============9044883038662899021==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22004 - trunk/jsf/plugins/org.jboss.tools.jsf/resources/help. Date: Tue, 11 May 2010 07:53:07 -0400 Message-ID: <201005111153.o4BBr7f9031215@svn01.web.mwc.hst.phx2.redhat.com> --===============9044883038662899021== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-11 07:53:06 -0400 (Tue, 11 May 2010) New Revision: 22004 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf-menu.prope= rties Log: https://jira.jboss.org/jira/browse/JBIDE-6269 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf-men= u.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf-menu.prop= erties 2010-05-11 08:09:39 UTC (rev 22003) +++ trunk/jsf/plugins/org.jboss.tools.jsf/resources/help/keys-jsf-menu.prop= erties 2010-05-11 11:53:06 UTC (rev 22004) @@ -1,5 +1,6 @@ JSF.SetApplication.menu=3DEdit Application Settings... JSF.SetFactory.menu=3DEdit Factory Settings... +JSFProcess.AddRule.menu=3DNew View... JSF.AddRule.menu=3DRule... JSF.AddComponent.menu=3DComponent... JSF.AddConverter.menu=3DConverter --===============9044883038662899021==-- From jbosstools-commits at lists.jboss.org Tue May 11 09:38:16 2010 Content-Type: multipart/mixed; boundary="===============3630284674242436221==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22005 - trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/types. Date: Tue, 11 May 2010 09:38:15 -0400 Message-ID: <201005111338.o4BDcFBr024115@svn01.web.mwc.hst.phx2.redhat.com> --===============3630284674242436221== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: jpeterka Date: 2010-05-11 09:38:15 -0400 (Tue, 11 May 2010) New Revision: 22005 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/IDELabel.java Log: IDELabel updated for Smooks tests Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/IDELabel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-11 11:53:06 UTC (rev 22004) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-11 13:38:15 UTC (rev 22005) @@ -140,7 +140,8 @@ public static final String JBOSS_TOOLS_WEB =3D "JBoss Tools Web"; public static final String JPA =3D "JPA"; public static final String DROOLS =3D "Drools"; - public static final String GUVNOR =3D "Guvnor"; + public static final String GUVNOR =3D "Guvnor"; = + public static final String SMOOKS =3D "Smooks"; } = public class EntityLabel { @@ -157,6 +158,7 @@ public static final String DROOLS_RULE =3D "Rule Resource"; public static final String GUIDED_DROOLS_RULE =3D "Guided Rule"; public static final String DSL_DROOLS_FILE =3D "Domain Specific Language= "; + public static final String SMOOKS_CONF_FILE =3D "Smooks Configuration Fi= le"; public static final String RESOURCES_FROM_GUVNOR =3D "Resources from Guv= nor"; } = --===============3630284674242436221==-- From jbosstools-commits at lists.jboss.org Tue May 11 09:41:16 2010 Content-Type: multipart/mixed; boundary="===============8644243619196335531==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22006 - branches/modular_build. Date: Tue, 11 May 2010 09:41:16 -0400 Message-ID: <201005111341.o4BDfGtK024578@svn01.web.mwc.hst.phx2.redhat.com> --===============8644243619196335531== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 09:41:16 -0400 (Tue, 11 May 2010) New Revision: 22006 Added: branches/modular_build/pom.xml Log: add overall pom.xml so whole build can be run w/o ant (in theory) Added: branches/modular_build/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/pom.xml (rev 0) +++ branches/modular_build/pom.xml 2010-05-11 13:41:16 UTC (rev 22006) @@ -0,0 +1,47 @@ + + 4.0.0 + + parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + trunk + 0.0.1-SNAPSHOT + pom + + + tests + common + flow + jbpm + jmx + archives + as + drools + bpel + smooks + freemarker + profiler + portlet + modeshape + xulrunner + jst + vpe + jsf + esb + tptp + ws + cdi + struts + hibernatetools + seam + examples + birt + maven + site + + + = --===============8644243619196335531==-- From jbosstools-commits at lists.jboss.org Tue May 11 09:45:36 2010 Content-Type: multipart/mixed; boundary="===============3910490424527928268==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22007 - trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/view. Date: Tue, 11 May 2010 09:45:36 -0400 Message-ID: <201005111345.o4BDja2Q025058@svn01.web.mwc.hst.phx2.redhat.com> --===============3910490424527928268== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: jpeterka Date: 2010-05-11 09:45:35 -0400 (Tue, 11 May 2010) New Revision: 22007 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/view/ExplorerBase.java Log: ExplorerBase#isFilePresent added Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/view/ExplorerBase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/view/ExplorerBase.java 2010-05-11 13:41:16 UTC (rev 22006) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/view/ExplorerBase.java 2010-05-11 13:45:35 UTC (rev 22007) @@ -196,6 +196,34 @@ return false; } } + = + = + /*** + * Checks presence of file + * = + * @param projectName - project name + * @param path - path to file + * @return true if file is located in explorer, false if not + */ + public boolean isFilePresent(String projectName, String... path) { + SWTBot viewBot =3D open.viewOpen(viewObject).bot(); + SWTBotTree tree =3D viewBot.tree().select(projectName); + StringBuilder builder =3D new StringBuilder(projectName); + // Go through path + try { + SWTBotTreeItem item =3D tree.expandNode(projectName); + for (String nodeName : path) { + builder.append("/" + nodeName); + item =3D item.expandNode(nodeName); = + } + } catch (WidgetNotFoundException e) { + log.info("Node not found:" + builder.toString()); + return false; + } + + return true; + } + = private SWTBotTreeItem getItem(SWTBotTreeItem ancestor, String name) { try { return ancestor.expandNode(name); --===============3910490424527928268==-- From jbosstools-commits at lists.jboss.org Tue May 11 09:46:11 2010 Content-Type: multipart/mixed; boundary="===============0380162085727017008==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22008 - branches/modular_build. Date: Tue, 11 May 2010 09:46:11 -0400 Message-ID: <201005111346.o4BDkBaC025085@svn01.web.mwc.hst.phx2.redhat.com> --===============0380162085727017008== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 09:46:10 -0400 (Tue, 11 May 2010) New Revision: 22008 Modified: branches/modular_build/pom.xml Log: comment out components which don't yet have pom.xml files checked in Modified: branches/modular_build/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/pom.xml 2010-05-11 13:45:35 UTC (rev 22007) +++ branches/modular_build/pom.xml 2010-05-11 13:46:10 UTC (rev 22008) @@ -17,7 +17,7 @@ common flow jbpm - jmx + = --===============0380162085727017008==-- From jbosstools-commits at lists.jboss.org Tue May 11 09:58:53 2010 Content-Type: multipart/mixed; boundary="===============4020976569780986613==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22009 - in trunk/drools/docs/reference/en-US: images/create_new_project and 1 other directories. Date: Tue, 11 May 2010 09:58:53 -0400 Message-ID: <201005111358.o4BDwr4a026262@svn01.web.mwc.hst.phx2.redhat.com> --===============4020976569780986613== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-11 09:58:51 -0400 (Tue, 11 May 2010) New Revision: 22009 Modified: trunk/drools/docs/reference/en-US/create_new_project.xml trunk/drools/docs/reference/en-US/images/create_new_project/create_new_p= roject8.png trunk/drools/docs/reference/en-US/images/debugging_rules/debugging_rules= 1.png Log: TOOLSDOC-64-Drools ref guide contains obsolete screenshots - updated = Modified: trunk/drools/docs/reference/en-US/create_new_project.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/docs/reference/en-US/create_new_project.xml 2010-05-11 13:= 46:10 UTC (rev 22008) +++ trunk/drools/docs/reference/en-US/create_new_project.xml 2010-05-11 13:= 58:51 UTC (rev 22009) @@ -1,216 +1,216 @@ - - - - - JBoss Tools - Drools Tools - - - - Creating a New Drools Project - - In this chapter we are going to show you how to setup an executa= ble sample Drools project - to start using rules immediately. - - - -
- Creating a Sample Drools Project - - First, we suggest that you use Drools perspective<= /property> which is aimed - at work with Drools specific resources. - - To create a new Drools project follow to - File > New > Drools Project. This will open - New Drools Project wizard like on the= figure below. - - On the first page type the project name and click - Next. - -
- Creating a New Drools Project - - - - - -
- - Next you have a choice to add some default artifacts to it l= ike sample rules, decision - tables or ruleflows and Java classes for them. Let's sele= ct first two check - boxes and press - Next. - -
- Selecting Drools Project Elements - - - - - -
- - Next page asks you to specify a Drools runtime. If you have = not yet set it up, you - should do this now by clicking the - Configure Workspace Settings - link. - -
- Configuring Drools Runtime - - - - - -
- - You should see the Preferences window w= here you can configure the - workspace settings for Drools runtimes. To create a new runtim= e, press the - Add - button. The appeared dialog prompts you to enter a - name for a new runtime and a path to the Drools runtime on you= r file system. - - - Note: - A Drools runtime is a collection of jars on your file sy= stem that represent one - specific release of the Drools project jars. While creatin= g a new runtime, you must - either point to the release of your choice, or you can sim= ply create a new runtime - on your file system from the jars included in the Drools E= clipse plugin. - - -
- Adding a New Drools Runtime - - - - - -
- = - Let's simply create a new Drools 5 runtime from the jar= s embedded in the - Drools Eclipse plugin. Thus, you should press - Create a new Drools 5 runtime - button and select the folder where you want this r= untime to be created and - hit - OK. - - You will see the newly created runtime show up in your list = of Drools runtimes. Check - it and press - OK. - -
- Selecting a Drools Runtime - - - - - -
- - Now press - Finish - to complete the project creation. - -
- Completing the Drools Project Creation - - - - - -
- - This will setup a basic structure, classpath and sample rule= s and test case to get you - started. -
- - -
- Drools Project Structure Overview - - Now let's look at the structure of the organized projec= t. In the - Package Explorer you should see the f= ollowing: - -
- Drools Project in the Package Explorer - - - - - -
- - The newly created project contains an example rule file - Sample.drl - in the - src/main/rules - directory and an example java file - DroolsTest.java - that can be used to execute the rules in a Drools = engine in the folder - src/main/java - , in the - com.sample - package. All the others jar's that are necess= ary during execution - are also added to the classpath in a custom classpath containe= r called Drools - Library. - - - Tip: - Rules do not have to be kept in Java projects at all, th= is is just a convenience - for people who are already using eclipse as their Java IDE= . - - -
- -
- Creating a New Rule - - Now we are going to add a new Rule resource to the project.<= /para> - - You can either create an empty text - .drl - file or make use of the special New Rule= Resource - wizard to do it. - - To open the wizard follow to - File > New > Rule Resource - or use the menu with the JBoss Drools icon on the = toolbar. - -
- Opening the New Rule Resource Wizard - - - - - -
- - On the wizard page first select - /rules - as a top level directory to store your rules and t= ype the rule name. Next - it's mandatory to specify the rule package name. It defin= es a namespace that - groups rules together. - -
- New Rule Resource Wizard - - - - - -
- - As a result the wizard generates a rule skeleton to get you = started. - -
- New Rule - - - - - -
- -
- - + + + + + JBoss Tools + Drools Tools + + + + Creating a New Drools Project + + In this chapter we are going to show you how to setup an executa= ble sample Drools project + to start using rules immediately. + + + +
+ Creating a Sample Drools Project + + First, we suggest that you use Drools perspective<= /property> which is aimed + at work with Drools specific resources. + + To create a new Drools project follow to + File > New > Drools Project. This will open + New Drools Project wizard like on the= figure below. + + On the first page type the project name and click + Next. + +
+ Creating a New Drools Project + + + + + +
+ + Next you have a choice to add some default artifacts to it l= ike sample rules, decision + tables or ruleflows and Java classes for them. Let's sele= ct first two check + boxes and press + Next. + +
+ Selecting Drools Project Elements + + + + + +
+ + Next page asks you to specify a Drools runtime. If you have = not yet set it up, you + should do this now by clicking the + Configure Workspace Settings + link. + +
+ Configuring Drools Runtime + + + + + +
+ + You should see the Preferences window w= here you can configure the + workspace settings for Drools runtimes. To create a new runtim= e, press the + Add + button. The appeared dialog prompts you to enter a + name for a new runtime and a path to the Drools runtime on you= r file system. + + + Note: + A Drools runtime is a collection of jars on your file sy= stem that represent one + specific release of the Drools project jars. While creatin= g a new runtime, you must + either point to the release of your choice, or you can sim= ply create a new runtime + on your file system from the jars included in the Drools E= clipse plugin. + + +
+ Adding a New Drools Runtime + + + + + +
+ = + Let's simply create a new Drools 5 runtime from the jar= s embedded in the + Drools Eclipse plugin. Thus, you should press + Create a new Drools 5 runtime + button and select the folder where you want this r= untime to be created and + hit + OK. + + You will see the newly created runtime show up in your list = of Drools runtimes. Check + it and press + OK. + +
+ Selecting a Drools Runtime + + + + + +
+ + Now press + Finish + to complete the project creation. + +
+ Completing the Drools Project Creation + + + + + +
+ + This will setup a basic structure, classpath and sample rule= s and test case to get you + started. +
+ + +
+ Drools Project Structure Overview + + Now let's look at the structure of the organized projec= t. In the + Package Explorer you should see the f= ollowing: + +
+ Drools Project in the Package Explorer + + + + + +
+ + The newly created project contains an example rule file + Sample.drl + in the + src/main/rules + directory and an example java file + DroolsTest.java + that can be used to execute the rules in a Drools = engine in the folder + src/main/java + , in the + com.sample + package. All the others jar's that are necess= ary during execution + are also added to the classpath in a custom classpath containe= r called Drools + Library. + + + Tip: + Rules do not have to be kept in Java projects at all, th= is is just a convenience + for people who are already using eclipse as their Java IDE= . + + +
+ +
+ Creating a New Rule + + Now we are going to add a new Rule package to the project. + + You can either create an empty text + .drl + file or make use of the special New Rule Pac= kage... + wizard to do it. + + To open the wizard follow to + File > New > Rule Resource + or use the menu with the JBoss Drools icon on the = toolbar. + +
+ Opening the New Rule Package Wizard + + + + + +
+ + On the wizard page first select + /rules + as a top level directory to store your rules and t= ype the rule name. Next + it's mandatory to specify the rule package name. It defin= es a namespace that + groups rules together. + +
+ New Rule Package Wizard + + + + + +
+ + As a result the wizard generates a rule skeleton to get you = started. + +
+ New Rule + + + + + +
+ +
+ + \ No newline at end of file Modified: trunk/drools/docs/reference/en-US/images/create_new_project/creat= e_new_project8.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/drools/docs/reference/en-US/images/debugging_rules/debuggin= g_rules1.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============4020976569780986613==-- From jbosstools-commits at lists.jboss.org Tue May 11 10:29:11 2010 Content-Type: multipart/mixed; boundary="===============1075682291775628617==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22010 - branches/modular_build. Date: Tue, 11 May 2010 10:29:11 -0400 Message-ID: <201005111429.o4BETBnb003537@svn01.web.mwc.hst.phx2.redhat.com> --===============1075682291775628617== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 10:29:10 -0400 (Tue, 11 May 2010) New Revision: 22010 Modified: branches/modular_build/genpom.xml Log: fix hudson path check Modified: branches/modular_build/genpom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/genpom.xml 2010-05-11 13:58:51 UTC (rev 22009) +++ branches/modular_build/genpom.xml 2010-05-11 14:29:10 UTC (rev 22010) @@ -53,8 +53,14 @@ = - - + + + + + + + + --===============1075682291775628617==-- From jbosstools-commits at lists.jboss.org Tue May 11 10:30:47 2010 Content-Type: multipart/mixed; boundary="===============7933291274155795391==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22011 - branches/modular_build. Date: Tue, 11 May 2010 10:30:47 -0400 Message-ID: <201005111430.o4BEUlPV003988@svn01.web.mwc.hst.phx2.redhat.com> --===============7933291274155795391== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 10:30:47 -0400 (Tue, 11 May 2010) New Revision: 22011 Modified: branches/modular_build/genpom.xml Log: fix hudson path check Modified: branches/modular_build/genpom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/genpom.xml 2010-05-11 14:29:10 UTC (rev 22010) +++ branches/modular_build/genpom.xml 2010-05-11 14:30:47 UTC (rev 22011) @@ -66,6 +66,22 @@ = + + + + + + WORKINGDIR =3D ${WORKINGDIR} + + + + + + COMMON_TOOLS =3D ${COMMON_TOOLS} + --===============7933291274155795391==-- From jbosstools-commits at lists.jboss.org Tue May 11 10:37:21 2010 Content-Type: multipart/mixed; boundary="===============3812071626234436695==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22012 - in workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces: META-INF and 3 other directories. Date: Tue, 11 May 2010 10:37:20 -0400 Message-ID: <201005111437.o4BEbKMl005171@svn01.web.mwc.hst.phx2.redhat.com> --===============3812071626234436695== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-11 10:37:20 -0400 (Tue, 11 May 2010) New Revision: 22012 Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/resources/commons-l= ogging-1.0.4.jar Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/META-INF/MANIFEST.MF workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/build.properties workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/IceFacesActivator.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java Log: JBIDE-4710 Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/META-INF/MAN= IFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/META-INF/MANIFEST.= MF 2010-05-11 14:30:47 UTC (rev 22011) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/META-INF/MANIFEST.= MF 2010-05-11 14:37:20 UTC (rev 22012) @@ -20,4 +20,5 @@ resources/jsf-api.jar, resources/jsp-api.jar, resources/el-api.jar, - resources/servlet-api.jar + resources/servlet-api.jar, + resources/commons-logging-1.0.4.jar Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/build.proper= ties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/build.properties 2= 010-05-11 14:30:47 UTC (rev 22011) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/build.properties 2= 010-05-11 14:37:20 UTC (rev 22012) @@ -11,5 +11,6 @@ resources/jsf-api.jar,\ resources/jsp-api.jar,\ resources/el-api.jar,\ - resources/servlet-api.jar + resources/servlet-api.jar,\ + resources/commons-logging-1.0.4.jar = Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/resources/commo= ns-logging-1.0.4.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/r= esources/commons-logging-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/IceFacesActivator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/IceFacesActivator.java 2010-05-11 14:30:47 UTC (rev 2201= 1) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/IceFacesActivator.java 2010-05-11 14:37:20 UTC (rev 2201= 2) @@ -24,16 +24,11 @@ // The shared instance private static IceFacesActivator plugin; = - /** - * The constructor - */ - public IceFacesActivator() { - } - /* * (non-Javadoc) * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleC= ontext) */ + @Override public void start(BundleContext context) throws Exception { super.start(context); plugin =3D this; @@ -43,6 +38,7 @@ * (non-Javadoc) * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleCon= text) */ + @Override public void stop(BundleContext context) throws Exception { plugin =3D null; super.stop(context); Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-11 14:3= 0:47 UTC (rev 22011) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-11 14:3= 7:20 UTC (rev 22012) @@ -12,11 +12,13 @@ = import javax.faces.render.Renderer; = +import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.template.VpeTemplateManager; import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; @@ -24,21 +26,34 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; = +/** + * = + * @author mareshkau + * + */ public class IceFacesOutputTextTemplate extends VpeAbstractTemplate { = - public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - Renderer render =3D new com.icesoft.faces.renderkit.dom_html_basic.TextR= enderer(); - VpeUIComponent uiComponent =3D new VpeUIComponent((Element)sourceNode); - Node result =3D VpeRendererUtil.processRenderer(render,uiComponent); - nsIDOMNode resultVisualNode =3D VpeRendererUtil.createVisualNode(result,= visualDocument); - if(resultVisualNode.getNodeType()=3D=3DNode.TEXT_NODE) { - nsIDOMElement domElement =3D VisualDomUtil.createBorderlessContainer(vi= sualDocument); - domElement.appendChild(resultVisualNode); - resultVisualNode =3D domElement; + try { + Renderer render =3D new com.icesoft.faces.renderkit.dom_html_basic.Text= Renderer(); + VpeUIComponent uiComponent =3D new VpeUIComponent( + (Element) sourceNode); + Node result =3D VpeRendererUtil.processRenderer(render, uiComponent); + nsIDOMNode resultVisualNode =3D VpeRendererUtil.createVisualNode( + result, visualDocument); + if (resultVisualNode.getNodeType() =3D=3D Node.TEXT_NODE) { + nsIDOMElement domElement =3D VisualDomUtil + .createBorderlessContainer(visualDocument); + domElement.appendChild(resultVisualNode); + resultVisualNode =3D domElement; + } + return new VpeCreationData(resultVisualNode); + } catch (Throwable th) { + IceFacesActivator.getDefault().logError(th); } - return new VpeCreationData(resultVisualNode); + return VpeTemplateManager.getInstance().getDefTemplate().create( + pageContext, sourceNode, visualDocument); } = } --===============3812071626234436695==-- From jbosstools-commits at lists.jboss.org Tue May 11 11:24:44 2010 Content-Type: multipart/mixed; boundary="===============6275141883846477253==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22013 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 4 other directories. Date: Tue, 11 May 2010 11:24:44 -0400 Message-ID: <201005111524.o4BFOiF4016307@svn01.web.mwc.hst.phx2.redhat.com> --===============6275141883846477253== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-11 11:24:42 -0400 (Tue, 11 May 2010) New Revision: 22013 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/decorators/DecoratorWithWrongScopeBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/interceptors/InterceptorWithWrongScopeBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/interceptors/ScopedStereotype.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= preferences/CDIPreferenceInitializer.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/decorators/beans.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/interceptors/beans.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : Interceptor or decorator has any scope other than @Dependent Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/preferences/CDIPreferenceInitializer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /preferences/CDIPreferenceInitializer.java 2010-05-11 14:37:20 UTC (rev 220= 12) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /preferences/CDIPreferenceInitializer.java 2010-05-11 15:24:42 UTC (rev 220= 13) @@ -33,5 +33,7 @@ } defaultPreferences.put(CDIPreferences.INTERCEPTOR_HAS_NAME, CDIPreferenc= es.WARNING); defaultPreferences.put(CDIPreferences.DECORATOR_HAS_NAME, CDIPreferences= .WARNING); + defaultPreferences.put(CDIPreferences.ILLEGAL_SCOPE_FOR_INTERCEPTOR, CDI= Preferences.WARNING); + defaultPreferences.put(CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR, CDIPr= eferences.WARNING); } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-11 14:37:20 UTC (rev 220= 12) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-11 15:24:42 UTC (rev 220= 13) @@ -827,6 +827,38 @@ } } } + + /* + * 2.4.1. Built-in scope types + * - interceptor or decorator has any scope other than @Dependent = (Non-Portable behavior) + */ + boolean interceptor =3D bean instanceof IInterceptor; + boolean decorator =3D bean instanceof IDecorator; + if(interceptor || decorator) { + IScope scope =3D bean.getScope(); + if(!CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME.equals(scope.getSourceT= ype().getFullyQualifiedName())) { + String key; + String message; + ITextSourceReference declaration =3D null; + if(!scopes.isEmpty()) { + declaration =3D scopes.iterator().next(); + } + if(interceptor) { + key =3D CDIPreferences.ILLEGAL_SCOPE_FOR_INTERCEPTOR; + message =3D CDIValidationMessages.ILLEGAL_SCOPE_FOR_INTERCEPTOR; + if(declaration=3D=3Dnull) { + declaration =3D ((IInterceptor)bean).getInterceptorAnnotation(); + } + } else { + key =3D CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR; + message =3D CDIValidationMessages.ILLEGAL_SCOPE_FOR_DECORATOR; + if(declaration=3D=3Dnull) { + declaration =3D ((IDecorator)bean).getDecoratorAnnotation(); + } + } + addError(message, key, declaration, bean.getResource()); + } + } } = /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-11 14:37:20 UTC (rev 22012) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-11 15:24:42 UTC (rev 22013) @@ -7,6 +7,10 @@ 2.4.1. Built-in scope types - interceptor or decorator has any scope other than @Dependent (Non-Portab= le behavior) = + + + + 2.4.3. Declaring the bean scope - bean class or producer method or field specifies multiple scope type ann= otations = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-11 14:37:20 UTC (rev 22012) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-11 15:24:42 UTC (rev 22013) @@ -67,8 +67,8 @@ {CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerMethod_label}, {CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerField_label}, // {CDIPreferences.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, C= DIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeWhenTyp= eInjectionPointIsInjected_label}, -// {CDIPreferences.ILLEGAL_SCOPE_FOR_INTERCEPTOR, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_illegalScopeForInterceptor_label}, -// {CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_illegalScopeForDecorator_label}, + {CDIPreferences.ILLEGAL_SCOPE_FOR_INTERCEPTOR, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_illegalScopeForInterceptor_label}, + {CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR, CDIPreferencesMessages.CDI= ValidatorConfigurationBlock_pb_illegalScopeForDecorator_label}, }, CDICorePlugin.PLUGIN_ID ); Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/decorators/DecoratorWithWrongScopeBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/decorators/DecoratorWithWrongScopeBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/decorators/DecoratorWithWrongScopeBroken.java 2010-05-11 15:24:42= UTC (rev 22013) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.decorators; + +import javax.decorator.Decorator; +import javax.enterprise.context.ApplicationScoped; + +(a)Decorator +(a)ApplicationScoped +public class DecoratorWithWrongScopeBroken { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/decorators/DecoratorWithWrongScopeBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests= /jbt/validation/decorators/beans.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/decorators/beans.xml 2010-05-11 14:37:20 UTC (rev 22012) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/decorators/beans.xml 2010-05-11 15:24:42 UTC (rev 22013) @@ -1,5 +1,6 @@ = org.jboss.jsr299.tck.tests.jdt.validation.decorators.NamedDec= oratorBroken + org.jboss.jsr299.tck.tests.jdt.validation.decorators.Decorato= rWithWrongScopeBroken Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/interceptors/InterceptorWithWrongScopeBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/InterceptorWithWrongScopeBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/InterceptorWithWrongScopeBroken.java 2010-05-11 15:2= 4:42 UTC (rev 22013) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.interceptors; + +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; + +(a)Interceptor +(a)ScopedStereotype +public class InterceptorWithWrongScopeBroken { + + @AroundInvoke + public Object alwaysReturnThis(InvocationContext ctx) throws Exception { + return ctx.proceed(); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/interceptors/InterceptorWithWrongScopeBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/interceptors/ScopedStereotype.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/ScopedStereotype.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/ScopedStereotype.java 2010-05-11 15:24:42 UTC (rev 2= 2013) @@ -0,0 +1,38 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.jsr299.tck.tests.jbt.validation.interceptors; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Stereotype; + +(a)Stereotype +(a)Target( { TYPE, METHOD, FIELD }) +(a)Retention(RUNTIME) +(a)RequestScoped +(a)Inherited +(a)interface ScopedStereotype { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/interceptors/ScopedStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests= /jbt/validation/interceptors/beans.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/beans.xml 2010-05-11 14:37:20 UTC (rev 22012) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/beans.xml 2010-05-11 15:24:42 UTC (rev 22013) @@ -2,5 +2,6 @@ org.jboss.jsr299.tck.tests.jdt.validation.interceptors.NamedI= nterceptorBroken org.jboss.jsr299.tck.tests.jdt.validation.interceptors.FordIn= terceptor + org.jboss.jsr299.tck.tests.jdt.validation.interceptors.Interc= eptorWithWrongScopeBroken \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-11 14:37:20 UTC (rev 22012) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-11 15:24:42 UTC (rev 22013) @@ -21,6 +21,56 @@ public class ValidationTest extends TCKTest { = /** + * 2.2.2. Restricting the bean types of a bean + * - bean class or producer method or field specifies a @Typed anno= tation, = + * and the value member specifies a class which does not correspond to= a type = + * in the unrestricted set of bean types of a bean + * = + * @throws Exception + */ + public void testLegalTypesInTyped() throws Exception { + IFile petShopFile =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tc= k/tests/lookup/typesafe/resolution/PetShop.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(petShopFile, AbstractRe= sourceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_D= ECLARATION, 25); + int markerNumbers =3D getMarkersNumber(petShopFile); + assertEquals("PetShop.java should has the only error marker.", markerNum= bers, 1); + } + + /** + * 2.4.1. Built-in scope types + * - interceptor has any scope other than @Dependent (Non-Portable = behavior) + * = + * @throws Exception + */ + public void testInterceptorWithWrongScope() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/interceptors/InterceptorWithWrongScopeBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_INTERCEPTOR,= 7); + } + + /** + * 2.4.1. Built-in scope types + * - decorator has any scope other than @Dependent (Non-Portable be= havior) + * = + * @throws Exception + */ + public void testDecoratorWithWrongScope() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/decorators/DecoratorWithWrongScopeBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_DECORATOR, 7= ); + } + + /** + * 2.5.3. Beans with no EL name + * - interceptor or decorator has a name (Non-Portable behavior) + * + * @throws Exception + */ + public void testNamedInterceptor() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/interceptors/NamedInterceptorBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.INTERCEPTOR_HAS_NAME, 9); + file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/v= alidation/interceptors/NamedStereotypedInterceptorBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.INTERCEPTOR_HAS_NAME, 7); + } + + /** * 2.7.1.3. Stereotype declares a non-empty @Named annotation (Non-Port= able behavior) * = * @throws Exception @@ -60,19 +110,6 @@ * * @throws Exception */ - public void testNamedInterceptor() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/interceptors/NamedInterceptorBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.INTERCEPTOR_HAS_NAME, 9); - file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/v= alidation/interceptors/NamedStereotypedInterceptorBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.INTERCEPTOR_HAS_NAME, 7); - } - - /** - * 2.5.3. Beans with no EL name - * - interceptor or decorator has a name (Non-Portable behavior) - * - * @throws Exception - */ public void testNamedDecorator() throws Exception { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/decorators/NamedDecoratorBroken.java"); AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.DECORATOR_HAS_NAME, 10); @@ -81,21 +118,6 @@ } = /** - * 2.2.2. Restricting the bean types of a bean - * - bean class or producer method or field specifies a @Typed anno= tation, = - * and the value member specifies a class which does not correspond to= a type = - * in the unrestricted set of bean types of a bean - * = - * @throws Exception - */ - public void testLegalTypesInTyped() throws Exception { - IFile petShopFile =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tc= k/tests/lookup/typesafe/resolution/PetShop.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(petShopFile, AbstractRe= sourceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_D= ECLARATION, 25); - int markerNumbers =3D getMarkersNumber(petShopFile); - assertEquals("PetShop.java should has the only error marker.", markerNum= bers, 1); - } - - /** * 2.7.1.3. Stereotype declares any other qualifier annotation * = * @throws Exception @@ -303,7 +325,7 @@ } = /** - * 3.4. Producer methods + * 3.4. Producer fields. * - producer field type is a type variable * = * @throws Exception --===============6275141883846477253==-- From jbosstools-commits at lists.jboss.org Tue May 11 12:11:44 2010 Content-Type: multipart/mixed; boundary="===============8020957875617688205==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22014 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 4 other directories. Date: Tue, 11 May 2010 12:11:44 -0400 Message-ID: <201005111611.o4BGBitY027961@svn01.web.mwc.hst.phx2.redhat.com> --===============8020957875617688205== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-11 12:11:41 -0400 (Tue, 11 May 2010) New Revision: 22014 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/decorators/AlternativeDecoratorBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/interceptors/AlternativeInterceptorBroken.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= preferences/CDIPreferenceInitializer.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDIValidationMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/decorators/beans.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/interceptors/beans.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : Interceptor or decorator is an alternative. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/preferences/CDIPreferenceInitializer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /preferences/CDIPreferenceInitializer.java 2010-05-11 15:24:42 UTC (rev 220= 13) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /preferences/CDIPreferenceInitializer.java 2010-05-11 16:11:41 UTC (rev 220= 14) @@ -35,5 +35,6 @@ defaultPreferences.put(CDIPreferences.DECORATOR_HAS_NAME, CDIPreferences= .WARNING); defaultPreferences.put(CDIPreferences.ILLEGAL_SCOPE_FOR_INTERCEPTOR, CDI= Preferences.WARNING); defaultPreferences.put(CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR, CDIPr= eferences.WARNING); + defaultPreferences.put(CDIPreferences.INTERCEPTOR_OR_DECORATOR_IS_ALTERN= ATIVE, CDIPreferences.WARNING); } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-11 15:24:42 UTC (rev 220= 13) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-11 16:11:41 UTC (rev 220= 14) @@ -724,8 +724,8 @@ = private void validateInterceptor(IInterceptor interceptor) { /* - * 2.5.3. Beans with no EL name - interceptor has a name (Non-Portable - * behavior) + * 2.5.3. Beans with no EL name = + * - interceptor has a name (Non-Portable behavior) */ if(interceptor.getName()!=3Dnull) { ITextSourceReference declaration =3D interceptor.getAnnotation(CDIConst= ants.NAMED_QUALIFIER_TYPE_NAME); @@ -737,6 +737,15 @@ } addError(CDIValidationMessages.INTERCEPTOR_HAS_NAME, CDIPreferences.INT= ERCEPTOR_HAS_NAME, declaration, interceptor.getResource()); } + + /* + * 2.6.1. Declaring an alternative + * - interceptor is an alternative (Non-Portable behavior) + */ + ITextSourceReference declaration =3D interceptor.getAlternativeDeclarati= on(); + if(declaration!=3Dnull) { + addError(CDIValidationMessages.INTERCEPTOR_IS_ALTERNATIVE, CDIPreferenc= es.INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, declaration, interceptor.getRes= ource()); + } } = private void validateDecorator(IDecorator decorator) { @@ -754,6 +763,15 @@ } addError(CDIValidationMessages.DECORATOR_HAS_NAME, CDIPreferences.DECOR= ATOR_HAS_NAME, declaration, decorator.getResource()); } + + /* + * 2.6.1. Declaring an alternative + * - decorator is an alternative (Non-Portable behavior) + */ + ITextSourceReference declaration =3D decorator.getAlternativeDeclaration= (); + if(declaration!=3Dnull) { + addError(CDIValidationMessages.DECORATOR_IS_ALTERNATIVE, CDIPreferences= .INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, declaration, decorator.getResourc= e()); + } } = private IAnnotationDeclaration getNamedStereotypeDeclaration(IStereotyped= stereotyped) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDIValidationMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-11 15:24:42 UTC (re= v 22013) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-11 16:11:41 UTC (re= v 22014) @@ -81,7 +81,8 @@ public static String ILLEGAL_INTERCEPTOR_BINDING_METHOD; public static String CONFLICTING_INTERCEPTOR_BINDINGS; public static String OBSERVER_IN_INTERCEPTOR_OR_DECORATOR; - public static String INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE; + public static String INTERCEPTOR_IS_ALTERNATIVE; + public static String DECORATOR_IS_ALTERNATIVE; public static String MISSING_INTERCEPTOR_BINDING; = public static String ILLEGAL_SPECIALIZING_MANAGED_BEAN; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-11 15:24:42 UTC (rev 22013) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-11 16:11:41 UTC (rev 22014) @@ -1,4 +1,5 @@ Definition Errors + 2.2.2. Restricting the bean types of a bean - bean class or producer method or field specifies a @Typed annotation, = and the value member specifies a class which does not correspond to a ty= pe = @@ -7,10 +8,6 @@ 2.4.1. Built-in scope types - interceptor or decorator has any scope other than @Dependent (Non-Portab= le behavior) = - - - - 2.4.3. Declaring the bean scope - bean class or producer method or field specifies multiple scope type ann= otations = @@ -32,6 +29,10 @@ - stereotype declares any other qualifier annotation - stereotype is annotated @Typed = + + + + 3.1. Managed beans - the bean class of a managed bean is annotated with both = the @Interceptor and @Decorator stereotypes Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-11 15:24:42 UTC (rev 22013) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-11 16:11:41 UTC (rev 22014) @@ -61,7 +61,8 @@ ILLEGAL_INTERCEPTOR_BINDING_METHOD=3DNon-static, non-private, final method= of a managed bean has a interceptor binding (either method level, or decla= ring class level) CONFLICTING_INTERCEPTOR_BINDINGS=3DThe set of interceptor bindings of a be= an or interceptor, including bindings inherited from stereotypes and other = interceptor bindings, has two instances of a certain interceptor binding ty= pe and the instances have different values of some annotation member OBSERVER_IN_INTERCEPTOR_OR_DECORATOR=3DInterceptor or decorator has a meth= od with a parameter annotated @Observes -INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE=3DInterceptor or decorator is an a= lternative +INTERCEPTOR_IS_ALTERNATIVE=3DInterceptor is an alternative +DECORATOR_IS_ALTERNATIVE=3DDecorator is an alternative MISSING_INTERCEPTOR_BINDING=3DInterceptor declared using @Interceptor does= not declare any interceptor binding = ILLEGAL_SPECIALIZING_MANAGED_BEAN=3DManaged bean class annotated @Speciali= zes does not directly extend the bean class of another managed bean Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-11 15:24:42 UTC (rev 22013) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-11 16:11:41 UTC (rev 22014) @@ -113,7 +113,7 @@ // {CDIPreferences.ILLEGAL_INTERCEPTOR_BINDING_METHOD, CDIPreferencesMe= ssages.CDIValidatorConfigurationBlock_pb_illegalInterceptorBindingMethod_la= bel}, // {CDIPreferences.CONFLICTING_INTERCEPTOR_BINDINGS, CDIPreferencesMess= ages.CDIValidatorConfigurationBlock_pb_conflictingInterceptorBindings_label= }, // {CDIPreferences.OBSERVER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferences= Messages.CDIValidatorConfigurationBlock_pb_observerInInterceptorOrDecorator= _label}, -// {CDIPreferences.INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, CDIPreferen= cesMessages.CDIValidatorConfigurationBlock_pb_interceptorOrDecoratorIsAlter= native_label}, + {CDIPreferences.INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, CDIPreference= sMessages.CDIValidatorConfigurationBlock_pb_interceptorOrDecoratorIsAlterna= tive_label}, // {CDIPreferences.MISSING_INTERCEPTOR_BINDING, CDIPreferencesMessages.= CDIValidatorConfigurationBlock_pb_missingInterceptorBinding_label}, }, CDICorePlugin.PLUGIN_ID Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/decorators/AlternativeDecoratorBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/decorators/AlternativeDecoratorBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/decorators/AlternativeDecoratorBroken.java 2010-05-11 16:11:41 UT= C (rev 22014) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.decorators; + +import javax.decorator.Decorator; +import javax.enterprise.inject.Alternative; + +(a)Decorator +(a)Alternative +public class AlternativeDecoratorBroken { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/decorators/AlternativeDecoratorBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests= /jbt/validation/decorators/beans.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/decorators/beans.xml 2010-05-11 15:24:42 UTC (rev 22013) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/decorators/beans.xml 2010-05-11 16:11:41 UTC (rev 22014) @@ -2,5 +2,6 @@ org.jboss.jsr299.tck.tests.jdt.validation.decorators.NamedDec= oratorBroken org.jboss.jsr299.tck.tests.jdt.validation.decorators.Decorato= rWithWrongScopeBroken + org.jboss.jsr299.tck.tests.jdt.validation.decorators.Alternat= iveDecoratorBroken - + \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/interceptors/AlternativeInterceptorBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/AlternativeInterceptorBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/AlternativeInterceptorBroken.java 2010-05-11 16:11:4= 1 UTC (rev 22014) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.interceptors; + +import javax.enterprise.inject.Alternative; +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; + +(a)Interceptor +(a)Alternative +public class AlternativeInterceptorBroken { + + @AroundInvoke + public Object alwaysReturnThis(InvocationContext ctx) throws Exception { + return ctx.proceed(); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/interceptors/AlternativeInterceptorBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests= /jbt/validation/interceptors/beans.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/beans.xml 2010-05-11 15:24:42 UTC (rev 22013) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/beans.xml 2010-05-11 16:11:41 UTC (rev 22014) @@ -3,5 +3,6 @@ org.jboss.jsr299.tck.tests.jdt.validation.interceptors.NamedI= nterceptorBroken org.jboss.jsr299.tck.tests.jdt.validation.interceptors.FordIn= terceptor org.jboss.jsr299.tck.tests.jdt.validation.interceptors.Interc= eptorWithWrongScopeBroken + org.jboss.jsr299.tck.tests.jdt.validation.interceptors.Altren= ativeInterceptorBroken \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-11 15:24:42 UTC (rev 22013) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-11 16:11:41 UTC (rev 22014) @@ -58,8 +58,35 @@ } = /** + * 2.4.3. Declaring the bean scope + * - bean class or producer method or field specifies multiple sc= ope type annotations + * = + * @throws Exception + */ + public void testMultipleBeanScope() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /definition/scope/broken/tooManyScopes/BeanWithTooManyScopeTypes_Broken.jav= a"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.MULTIPLE_SCOPE_TYPE_ANNOTATION= S, 22, 23); + int markerNumbers =3D getMarkersNumber(file); + assertEquals("StereotypeWithTyped_Broken.java should has two error marke= rs.", markerNumbers, 2); + } + + /** + * 2.4.4. Default scope + * - bean does not explicitly declare a scope when there is no de= fault scope = + * (there are two different stereotypes declared by the bean that= declare different default scopes) + * = + * @throws Exception + */ + public void testBeanWithMultipleScopedStereotypes() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /definition/stereotype/broken/scopeConflict/Scallop_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.MISSING_SCOPE_WHEN_THERE_IS_NO= _DEFAULT_SCOPE, 24, 25); + int markerNumbers =3D getMarkersNumber(file); + assertEquals("Scallop_Broken.java should has two error markers.", marker= Numbers, 2); + } + + /** * 2.5.3. Beans with no EL name - * - interceptor or decorator has a name (Non-Portable behavior) + * - interceptor has a name (Non-Portable behavior) * * @throws Exception */ @@ -71,54 +98,69 @@ } = /** - * 2.7.1.3. Stereotype declares a non-empty @Named annotation (Non-Port= able behavior) - * = + * 2.5.3. Beans with no EL name + * - decorator has a name (Non-Portable behavior) + * * @throws Exception */ - public void testNonEmptyNamedForStereotype() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Bro= ken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.STEREOTYPE_DECLARES_NON_EMPTY_= NAME, 31); - int markerNumbers =3D getMarkersNumber(file); - assertEquals("StereotypeWithNonEmptyNamed_Broken.java should has the onl= y error marker.", markerNumbers, 1); + public void testNamedDecorator() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/decorators/NamedDecoratorBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.DECORATOR_HAS_NAME, 10); + file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/v= alidation/decorators/NamedStereotypedDecoratorBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.DECORATOR_HAS_NAME, 8); } = /** - * 3.5.1. Declaring a resource - * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) - * = + * 2.6.1. Declaring an alternative + * - interceptor is an alternative (Non-Portable behavior) + * * @throws Exception */ - public void testResourceWithELName() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/resources/ProducerFieldsBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_E= L_NAME, 15, 19, 24, 27, 31); + public void testAlternativeInterceptor() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/interceptors/AlternativeInterceptorBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.INTERCEPTOR_IS_ALTERNATIVE, 9); } = /** - * 3.11. The qualifier @Named at injection points - * - injection point other than injected field declares a @Named annotat= ion that does not specify the value member + * 2.6.1. Declaring an alternative + * - decorator is an alternative (Non-Portable behavior) + * + * @throws Exception + */ + public void testAlternativeDecorator() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/decorators/AlternativeDecoratorBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.DECORATOR_IS_ALTERNATIVE, 7); + } + + /** + * 2.7.1.1. Declaring the default scope for a stereotype + * - stereotype declares more than one scope * = * @throws Exception */ - public void testNamedInjectPoint() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/inject/NamedInjectionBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PARAM_INJECTION_DECLARES_EMPTY= _NAME, 10, 16); + public void testStereotypeScope() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes= _Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.STEREOTYPE_DECLARES_MORE_THAN_= ONE_SCOPE, 32, 33); + int markerNumbers =3D getMarkersNumber(file); + assertEquals("StereotypeWithTooManyScopeTypes_Broken.java should has two= error markers.", markerNumbers, 2); } = /** - * 2.5.3. Beans with no EL name - * - interceptor or decorator has a name (Non-Portable behavior) - * + * 2.7.1.3. Declaring a @Named stereotype + * - stereotype declares a non-empty @Named annotation (Non-Portable beh= avior) + * = * @throws Exception */ - public void testNamedDecorator() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/decorators/NamedDecoratorBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.DECORATOR_HAS_NAME, 10); - file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/v= alidation/decorators/NamedStereotypedDecoratorBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.DECORATOR_HAS_NAME, 8); + public void testNonEmptyNamedForStereotype() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /definition/stereotype/broken/nonEmptyNamed/StereotypeWithNonEmptyNamed_Bro= ken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.STEREOTYPE_DECLARES_NON_EMPTY_= NAME, 31); + int markerNumbers =3D getMarkersNumber(file); + assertEquals("StereotypeWithNonEmptyNamed_Broken.java should has the onl= y error marker.", markerNumbers, 1); } = /** - * 2.7.1.3. Stereotype declares any other qualifier annotation + * 2.7.1.3. Declaring a @Named stereotype + * - stereotype declares any other qualifier annotation * = * @throws Exception */ @@ -130,7 +172,8 @@ } = /** - * 2.7.1.3. Stereotype is annotated @Typed + * 2.7.1.3. Declaring a @Named stereotype + * - stereotype is annotated @Typed = * = * @throws Exception */ @@ -142,46 +185,28 @@ } = /** - * 2.7.1.1. Declaring the default scope for a stereotype - * - stereotype declares more than one scope + * 3.5.1. Declaring a resource + * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) * = * @throws Exception */ - public void testStereotypeScope() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /definition/stereotype/broken/tooManyScopes/StereotypeWithTooManyScopeTypes= _Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.STEREOTYPE_DECLARES_MORE_THAN_= ONE_SCOPE, 32, 33); - int markerNumbers =3D getMarkersNumber(file); - assertEquals("StereotypeWithTooManyScopeTypes_Broken.java should has two= error markers.", markerNumbers, 2); + public void testResourceWithELName() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/resources/ProducerFieldsBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_E= L_NAME, 15, 19, 24, 27, 31); } = /** - * 2.4.3. Declaring the bean scope - * - bean class or producer method or field specifies multiple sc= ope type annotations + * 3.11. The qualifier @Named at injection points + * - injection point other than injected field declares a @Named annotat= ion that does not specify the value member * = * @throws Exception */ - public void testMultipleBeanScope() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /definition/scope/broken/tooManyScopes/BeanWithTooManyScopeTypes_Broken.jav= a"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.MULTIPLE_SCOPE_TYPE_ANNOTATION= S, 22, 23); - int markerNumbers =3D getMarkersNumber(file); - assertEquals("StereotypeWithTyped_Broken.java should has two error marke= rs.", markerNumbers, 2); + public void testNamedInjectPoint() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/inject/NamedInjectionBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PARAM_INJECTION_DECLARES_EMPTY= _NAME, 10, 16); } = /** - * 2.4.4. Default scope - * - bean does not explicitly declare a scope when there is no de= fault scope = - * (there are two different stereotypes declared by the bean that= declare different default scopes) - * = - * @throws Exception - */ - public void testBeanWithMultipleScopedStereotypes() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /definition/stereotype/broken/scopeConflict/Scallop_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.MISSING_SCOPE_WHEN_THERE_IS_NO= _DEFAULT_SCOPE, 24, 25); - int markerNumbers =3D getMarkersNumber(file); - assertEquals("Scallop_Broken.java should has two error markers.", marker= Numbers, 2); - } - - /** * 3.3.6. Declaring a disposer method * - method has more than one parameter annotated @Disposes * = --===============8020957875617688205==-- From jbosstools-commits at lists.jboss.org Tue May 11 13:13:08 2010 Content-Type: multipart/mixed; boundary="===============5004589055725883974==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22015 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test. Date: Tue, 11 May 2010 13:13:07 -0400 Message-ID: <201005111713.o4BHD7HU008806@svn01.web.mwc.hst.phx2.redhat.com> --===============5004589055725883974== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-11 13:13:07 -0400 (Tue, 11 May 2010) New Revision: 22015 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam= /core/test/SeamValidatorsTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6264 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/too= ls/seam/core/test/SeamValidatorsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/SeamValidatorsTest.java 2010-05-11 16:11:41 UTC (rev 22014) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/SeamValidatorsTest.java 2010-05-11 17:13:07 UTC (rev 22015) @@ -746,7 +746,7 @@ } = // See https://jira.jboss.org/jira/browse/JBIDE-4515 - public void testRevalidationUnresolvedELs() { + public void testRevalidationUnresolvedELs() throws CoreException{ refreshProject(project); JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPre= ferences.RE_VALIDATE_UNRESOLVED_EL, SeamPreferences.ENABLE); JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPre= ferences.UNKNOWN_EL_VARIABLE_NAME, SeamPreferences.ERROR); @@ -758,8 +758,9 @@ = refreshProject(project); = - int n =3D getMarkersNumber(xhtmlFile, SEAM_MARKER_FILTER); - assertEquals("There should be an unresolved EL in testElRevalidation.xht= ml.", 1, n); + IMarker[] markers =3D findMarkers(xhtmlFile, IMarker.PROBLEM, "\"testElR= evalidation\" cannot be resolved"); + assertEquals("There should be an unresolved EL in testElRevalidation.xht= ml.", 1, markers.length); + = = JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPre= ferences.RE_VALIDATE_UNRESOLVED_EL, SeamPreferences.DISABLE); // Check if the validator was not invoked. @@ -767,8 +768,8 @@ = refreshProject(project); = - n =3D getMarkersNumber(xhtmlFile, SEAM_MARKER_FILTER); - assertEquals("There should be an unresolved EL in testElRevalidation.xht= ml.", 1, n); + markers =3D findMarkers(xhtmlFile, IMarker.PROBLEM, "\"testElRevalidatio= n\" cannot be resolved"); + assertEquals("There should be an unresolved EL in testElRevalidation.xht= ml.", 1, markers.length); = JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPre= ferences.RE_VALIDATE_UNRESOLVED_EL, SeamPreferences.ENABLE); JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPre= ferences.UNKNOWN_EL_VARIABLE_NAME, SeamPreferences.IGNORE); --===============5004589055725883974==-- From jbosstools-commits at lists.jboss.org Tue May 11 14:37:28 2010 Content-Type: multipart/mixed; boundary="===============6193993840777856664==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22016 - in trunk: drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke and 2 other directories. Date: Tue, 11 May 2010 14:37:28 -0400 Message-ID: <201005111837.o4BIbSOb025099@svn01.web.mwc.hst.phx2.redhat.com> --===============6193993840777856664== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vpakan(a)redhat.com Date: 2010-05-11 14:37:27 -0400 (Tue, 11 May 2010) New Revision: 22016 Added: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/OpenDroolsPerspective.java Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/DroolsAllBotTests.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/RuleFlowTest.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTEclipseExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/IDELabel.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/PerspectiveType.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/ViewType.java Log: Added tests of opening Drools perspective and synchronization between Rule = Flow editor and Properties View. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/DroolsAllBotTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-11 17:13:07 UTC (rev 2= 2015) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/DroolsAllBotTests.java 2010-05-11 18:37:27 UTC (rev 2= 2016) @@ -22,6 +22,7 @@ import org.jboss.tools.drools.ui.bot.test.smoke.ManageDroolsProject; import org.jboss.tools.drools.ui.bot.test.smoke.ManageDroolsRules; import org.jboss.tools.drools.ui.bot.test.smoke.DroolsRulesEditorTest; +import org.jboss.tools.drools.ui.bot.test.smoke.OpenDroolsPerspective; import org.jboss.tools.drools.ui.bot.test.smoke.RuleFlowTest; import org.jboss.tools.ui.bot.ext.SWTTestExt; import org.jboss.tools.ui.bot.ext.SWTUtilExt; @@ -41,7 +42,8 @@ * = */ @RunWith(Suite.class) -(a)SuiteClasses({ManageDroolsRuntime.class, +(a)SuiteClasses({OpenDroolsPerspective.class, + ManageDroolsRuntime.class, ManageDroolsProject.class, ManageDroolsRules.class, DroolsRulesEditorTest.class, Added: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/= tools/drools/ui/bot/test/smoke/OpenDroolsPerspective.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/OpenDroolsPerspective.java = (rev 0) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/OpenDroolsPerspective.java 2010-05-11 18:37:27 = UTC (rev 22016) @@ -0,0 +1,50 @@ + /************************************************************************= ******* + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ + +package org.jboss.tools.drools.ui.bot.test.smoke; + +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.jboss.tools.ui.bot.ext.types.PerspectiveType; +import org.junit.Test; +/** + * Test opening perspective + * @author Vladimir Pakan + * + */ +public class OpenDroolsPerspective extends SWTTestExt{ + /** + * Test Opening Drools Rules + */ + @Test + public void testManageDroolsProject() { + openDroolsPerspective(); + } + /** + * Open Drools Perspective + */ + private void openDroolsPerspective(){ + eclipse.openPerspective(PerspectiveType.DROOLS); + boolean wasFound =3D false; + try{ + bot.toolbarDropDownButtonWithTooltip(IDELabel.Button.DROOLS_WORKBENC= H); + wasFound =3D true; + } catch (WidgetNotFoundException wnfe){ + wasFound =3D false; + } + eclipse.openPerspective(PerspectiveType.JAVA); + assertTrue("Drools Perspective was not opened properly. Button " + + IDELabel.Button.DROOLS_WORKBENCH + " is not present in Workbench", + wasFound); + } +} + Property changes on: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/= src/org/jboss/tools/drools/ui/bot/test/smoke/OpenDroolsPerspective.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-11 17:13:07 UTC (rev = 22015) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-11 18:37:27 UTC (rev = 22016) @@ -28,6 +28,8 @@ import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor; import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.results.Result; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests; import org.jboss.tools.ui.bot.ext.SWTEclipseExt; @@ -35,6 +37,7 @@ import org.jboss.tools.ui.bot.ext.SWTUtilExt; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; import org.jboss.tools.ui.bot.ext.types.IDELabel; +import org.jboss.tools.ui.bot.ext.types.ViewType; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -139,6 +142,15 @@ gefEditor.mouseMoveLeftClick(xspacing + xoffset + 5, yoffset + 5); gefEditor.save(); checkFullRFFile(DroolsAllBotTests.DROOLS_PROJECT_NAME , ruleFlowFileNa= me); + // check synchronization with Properties View + gefEditor.activateTool("Select"); + gefEditor.mouseMoveLeftClick(xoffset + 5, yoffset + 5); + SWTBotTree tree =3D eclipse.showView(ViewType.PROPERTIES).tree(); + String id =3D tree.getTreeItem("Id").cell(1); + String name =3D tree.getTreeItem("Name").cell(1); + assertTrue("First editor element has to have Id=3D1 and Name=3DStart."= + + "\nBut it has Id=3D" + id + + " Name=3D" + name, id.equals("1") && name.equals("Start")); // Delete each component gefEditor.activateTool("Select"); for (int toolIndex =3D 0;toolIndex < tools.length;toolIndex++){ Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTEclipseExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-11 17:13:07 UTC (rev 22015) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-11 18:37:27 UTC (rev 22016) @@ -162,6 +162,9 @@ case GUVNOR_REPOSITORY_EXPLORING: perspectiveLabel =3D IDELabel.SelectPerspectiveDialog.GUVNOR_REPOSIT= ORY_EXPLORING; break; + case DROOLS: + perspectiveLabel =3D IDELabel.SelectPerspectiveDialog.DROOLS; + break; default: fail("Unknown perspective to open"); } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/IDELabel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-11 17:13:07 UTC (rev 22015) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-11 18:37:27 UTC (rev 22016) @@ -93,6 +93,7 @@ public static final String REMOVE =3D "Remove"; public static final String EDIT =3D "Edit..."; public static final String ADD_WITHOUT_DOTS =3D "Add"; + public static final String DROOLS_WORKBENCH =3D "Drools workbench"; } = public class Shell { @@ -187,6 +188,7 @@ public static final String PROBLEMS =3D "Problems"; public static final String DEBUG =3D "Debug"; public static final String GUVNOR_REPOSITORIES =3D "Guvnor Repositories"; + public static final String PROPERTIES =3D "Properties"; } = public class ViewGroup { @@ -208,6 +210,7 @@ public static final String JPA =3D "JPA"; public static final String DEBUG =3D "Debug"; public static final String GUVNOR_REPOSITORY_EXPLORING =3D "Guvnor Repos= itory Exploring"; + public static final String DROOLS =3D "Drools"; } /** * Hibernate Console Wizard (ConsoleConfigurationCreationWizard) Labels ( Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/PerspectiveType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/PerspectiveType.java 2010-05-11 17:13:07 UTC (rev 22015) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/PerspectiveType.java 2010-05-11 18:37:27 UTC (rev 22016) @@ -16,6 +16,7 @@ * */ public enum PerspectiveType { - SEAM, JAVA, WEB_DEVELOPMENT, HIBERNATE, DB_DEVELOPMENT, JPA, DEBUG, GUVNO= R_REPOSITORY_EXPLORING; + SEAM, JAVA, WEB_DEVELOPMENT, HIBERNATE, DB_DEVELOPMENT, JPA, DEBUG, GUVNO= R_REPOSITORY_EXPLORING, + DROOLS; } = Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/ViewType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/ViewType.java 2010-05-11 17:13:07 UTC (rev 22015) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/ViewType.java 2010-05-11 18:37:27 UTC (rev 22016) @@ -19,7 +19,7 @@ */ public enum ViewType { PACKAGE_EXPLORER, PROJECT_EXPLORER, WELCOME, DATA_SOURCE_EXPLORER, - SERVERS,WEB_PROJECTS,PROBLEMS,DEBUG,GUVNOR_REPOSITORIES; + SERVERS,WEB_PROJECTS,PROBLEMS,DEBUG,GUVNOR_REPOSITORIES,PROPERTIES; = = public String getGroupLabel() { @@ -33,6 +33,7 @@ case PROBLEMS: viewLabel =3D IDELabel.ViewGroup.GENERAL; break; case DEBUG: viewLabel =3D IDELabel.ViewGroup.DEBUG; break; case GUVNOR_REPOSITORIES: viewLabel =3D IDELabel.ViewGroup.GUVNOR; brea= k; + case PROPERTIES: viewLabel =3D IDELabel.ViewGroup.GENERAL; break; default: fail("Unknown View Type"); } return viewLabel; = @@ -49,6 +50,7 @@ case PROBLEMS: viewLabel =3D IDELabel.View.PROBLEMS; break; case DEBUG: viewLabel =3D IDELabel.View.DEBUG; break; case GUVNOR_REPOSITORIES: viewLabel =3D IDELabel.View.GUVNOR_REPOSITORI= ES; break; + case PROPERTIES: viewLabel =3D IDELabel.View.PROPERTIES; break; default: fail("Unknown View Type"); } return viewLabel; --===============6193993840777856664==-- From jbosstools-commits at lists.jboss.org Tue May 11 14:44:18 2010 Content-Type: multipart/mixed; boundary="===============1926194405816704152==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22017 - in branches/modular_build/drools: plugins/org.jboss.tools.flow.ruleflow and 1 other directory. Date: Tue, 11 May 2010 14:44:18 -0400 Message-ID: <201005111844.o4BIiIuN025587@svn01.web.mwc.hst.phx2.redhat.com> --===============1926194405816704152== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 14:44:17 -0400 (Tue, 11 May 2010) New Revision: 22017 Added: branches/modular_build/drools/plugins/org.jboss.tools.flow.ruleflow/pom.= xml branches/modular_build/drools/pom.xml Modified: branches/modular_build/drools/build.xml Log: make pom run build.xml instead of build.xml being run before pom Modified: branches/modular_build/drools/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/build.xml 2010-05-11 18:37:27 UTC (rev 22= 016) +++ branches/modular_build/drools/build.xml 2010-05-11 18:44:17 UTC (rev 22= 017) @@ -1,8 +1,27 @@ = - + + + = + + + + + + + + + WORKINGDIR =3D ${WORKINGDIR} + + + + + + + + - = + @@ -27,8 +46,12 @@ = - + + + + + = Added: branches/modular_build/drools/plugins/org.jboss.tools.flow.ruleflow/= pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/plugins/org.jboss.tools.flow.ruleflow/pom= .xml (rev 0) +++ branches/modular_build/drools/plugins/org.jboss.tools.flow.ruleflow/pom= .xml 2010-05-11 18:44:17 UTC (rev 22017) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.flow.ruleflow = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: branches/modular_build/drools/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/pom.xml (rev 0) +++ branches/modular_build/drools/pom.xml 2010-05-11 18:44:17 UTC (rev 2201= 7) @@ -0,0 +1,68 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + drools + 0.0.1-SNAPSHOT + pom + + plugins + features + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 1.3 + + + compile + compile + + + + + + + run + + + + + + commons-net + commons-net + 1.4.1 + + + org.apache.ant + ant-commons-net + 1.7.1 + + + org.apache.ant + ant-apache-regexp + 1.7.1 + + + ant-contrib + ant-contrib + 1.0b3 + + + + + + + + = --===============1926194405816704152==-- From jbosstools-commits at lists.jboss.org Tue May 11 15:06:12 2010 Content-Type: multipart/mixed; boundary="===============2858484823726100762==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22018 - branches/modular_build/drools. Date: Tue, 11 May 2010 15:06:11 -0400 Message-ID: <201005111906.o4BJ6BaA002257@svn01.web.mwc.hst.phx2.redhat.com> --===============2858484823726100762== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 15:06:11 -0400 (Tue, 11 May 2010) New Revision: 22018 Modified: branches/modular_build/drools/build.xml Log: fix bootstrapping for drools build Modified: branches/modular_build/drools/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/build.xml 2010-05-11 18:44:17 UTC (rev 22= 017) +++ branches/modular_build/drools/build.xml 2010-05-11 19:06:11 UTC (rev 22= 018) @@ -31,11 +31,21 @@ usetimestamp=3D"true" /> + = = + + + + + + @@ -43,6 +53,7 @@ + = --===============2858484823726100762==-- From jbosstools-commits at lists.jboss.org Tue May 11 15:06:24 2010 Content-Type: multipart/mixed; boundary="===============8054682917704899093==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22019 - branches/modular_build/build. Date: Tue, 11 May 2010 15:06:24 -0400 Message-ID: <201005111906.o4BJ6Onm002267@svn01.web.mwc.hst.phx2.redhat.com> --===============8054682917704899093== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 15:06:24 -0400 (Tue, 11 May 2010) New Revision: 22019 Modified: branches/modular_build/build/build.xml Log: fix bootstrapping for drools build Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-11 19:06:11 UTC (rev 220= 18) +++ branches/modular_build/build/build.xml 2010-05-11 19:06:24 UTC (rev 220= 19) @@ -322,7 +322,7 @@ - + @@ -531,7 +531,7 @@ - + @@ -1178,6 +1178,27 @@ = + + + ${WORKINGDIR}/${COMPONENT}/features + + + + + + + + + + + + + + + @@ -1204,8 +1225,8 @@ - - + + --===============8054682917704899093==-- From jbosstools-commits at lists.jboss.org Tue May 11 15:09:40 2010 Content-Type: multipart/mixed; boundary="===============1598865260715583244==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22020 - branches/modular_build/build. Date: Tue, 11 May 2010 15:09:40 -0400 Message-ID: <201005111909.o4BJ9eBL002307@svn01.web.mwc.hst.phx2.redhat.com> --===============1598865260715583244== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 15:09:39 -0400 (Tue, 11 May 2010) New Revision: 22020 Modified: branches/modular_build/build/build.xml Log: fix bootstrapping for drools build; add constraint for custom build.xml: ru= n only if pom.xml does not call custom build.xml directly Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-11 19:06:24 UTC (rev 220= 19) +++ branches/modular_build/build/build.xml 2010-05-11 19:09:39 UTC (rev 220= 20) @@ -574,8 +574,17 @@ + - + + + + + + + Run custom @{COMPONENT}/build.xml --===============1598865260715583244==-- From jbosstools-commits at lists.jboss.org Tue May 11 15:13:03 2010 Content-Type: multipart/mixed; boundary="===============6925469898179781196==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22021 - branches/modular_build/drools. Date: Tue, 11 May 2010 15:13:03 -0400 Message-ID: <201005111913.o4BJD3JA002783@svn01.web.mwc.hst.phx2.redhat.com> --===============6925469898179781196== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 15:13:03 -0400 (Tue, 11 May 2010) New Revision: 22021 Modified: branches/modular_build/drools/ Log: svn:ignore drools-5.1.0.SNAPSHOT-eclipse-all.zip Property changes on: branches/modular_build/drools ___________________________________________________________________ Name: svn:ignore + drools-5.1.0.SNAPSHOT-eclipse-all.zip --===============6925469898179781196==-- From jbosstools-commits at lists.jboss.org Tue May 11 15:15:29 2010 Content-Type: multipart/mixed; boundary="===============3478299394816067976==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22022 - in branches/modular_build/drools/plugins: org.drools.eclipse and 3 other directories. Date: Tue, 11 May 2010 15:15:28 -0400 Message-ID: <201005111915.o4BJFSsZ003205@svn01.web.mwc.hst.phx2.redhat.com> --===============3478299394816067976== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 15:15:28 -0400 (Tue, 11 May 2010) New Revision: 22022 Added: branches/modular_build/drools/plugins/org.drools.eclipse.task/ branches/modular_build/drools/plugins/org.drools.eclipse.task/pom.xml branches/modular_build/drools/plugins/org.drools.eclipse/ branches/modular_build/drools/plugins/org.drools.eclipse/pom.xml branches/modular_build/drools/plugins/org.eclipse.webdav/ branches/modular_build/drools/plugins/org.eclipse.webdav/pom.xml branches/modular_build/drools/plugins/org.guvnor.tools/ branches/modular_build/drools/plugins/org.guvnor.tools/pom.xml branches/modular_build/drools/plugins/pom.xml Log: add generated pom.xml for drools build Added: branches/modular_build/drools/plugins/org.drools.eclipse/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/plugins/org.drools.eclipse/pom.xml = (rev 0) +++ branches/modular_build/drools/plugins/org.drools.eclipse/pom.xml 2010-0= 5-11 19:15:28 UTC (rev 22022) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.drools.eclipse = + 5.1.0-SNAPSHOT + eclipse-plugin + Property changes on: branches/modular_build/drools/plugins/org.drools.eclip= se/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/drools/plugins/org.drools.eclipse.task/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/plugins/org.drools.eclipse.task/pom.xml = (rev 0) +++ branches/modular_build/drools/plugins/org.drools.eclipse.task/pom.xml 2= 010-05-11 19:15:28 UTC (rev 22022) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.drools.eclipse.task = + 5.1.0-SNAPSHOT + eclipse-plugin + Property changes on: branches/modular_build/drools/plugins/org.drools.eclip= se.task/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/drools/plugins/org.eclipse.webdav/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/plugins/org.eclipse.webdav/pom.xml = (rev 0) +++ branches/modular_build/drools/plugins/org.eclipse.webdav/pom.xml 2010-0= 5-11 19:15:28 UTC (rev 22022) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.eclipse.webdav = + 3.0.101 + eclipse-plugin + Property changes on: branches/modular_build/drools/plugins/org.eclipse.webd= av/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/drools/plugins/org.guvnor.tools/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/plugins/org.guvnor.tools/pom.xml = (rev 0) +++ branches/modular_build/drools/plugins/org.guvnor.tools/pom.xml 2010-05-= 11 19:15:28 UTC (rev 22022) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.guvnor.tools = + 5.1.0-SNAPSHOT + eclipse-plugin + Property changes on: branches/modular_build/drools/plugins/org.guvnor.tools= /pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/drools/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/plugins/pom.xml (= rev 0) +++ branches/modular_build/drools/plugins/pom.xml 2010-05-11 19:15:28 UTC (= rev 22022) @@ -0,0 +1,22 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + drools.plugins + 0.0.1-SNAPSHOT + pom + + org.drools.eclipse + org.drools.eclipse.task + org.eclipse.webdav + org.guvnor.tools + org.jboss.tools.flow.ruleflow + + + = \ No newline at end of file Property changes on: branches/modular_build/drools/plugins/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain --===============3478299394816067976==-- From jbosstools-commits at lists.jboss.org Tue May 11 15:19:40 2010 Content-Type: multipart/mixed; boundary="===============2760098845940997556==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22023 - in branches/modular_build/drools: features and 3 other directories. Date: Tue, 11 May 2010 15:19:40 -0400 Message-ID: <201005111919.o4BJJeOJ003370@svn01.web.mwc.hst.phx2.redhat.com> --===============2760098845940997556== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 15:19:40 -0400 (Tue, 11 May 2010) New Revision: 22023 Added: branches/modular_build/drools/features/ branches/modular_build/drools/features/org.drools.eclipse.feature/ branches/modular_build/drools/features/org.drools.eclipse.feature/pom.xml branches/modular_build/drools/features/org.drools.eclipse.task.feature/ branches/modular_build/drools/features/org.drools.eclipse.task.feature/p= om.xml branches/modular_build/drools/features/org.guvnor.tools.feature/ branches/modular_build/drools/features/org.guvnor.tools.feature/pom.xml branches/modular_build/drools/features/pom.xml Log: add generated pom.xml for drools build Added: branches/modular_build/drools/features/org.drools.eclipse.feature/po= m.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/features/org.drools.eclipse.feature/pom.x= ml (rev 0) +++ branches/modular_build/drools/features/org.drools.eclipse.feature/pom.x= ml 2010-05-11 19:19:40 UTC (rev 22023) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.drools.eclipse.feature = + 5.1.0-SNAPSHOT + eclipse-feature + Property changes on: branches/modular_build/drools/features/org.drools.ecli= pse.feature/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/drools/features/org.drools.eclipse.task.featu= re/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/features/org.drools.eclipse.task.feature/= pom.xml (rev 0) +++ branches/modular_build/drools/features/org.drools.eclipse.task.feature/= pom.xml 2010-05-11 19:19:40 UTC (rev 22023) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.drools.eclipse.task.feature = + 5.1.0-SNAPSHOT + eclipse-feature + Property changes on: branches/modular_build/drools/features/org.drools.ecli= pse.task.feature/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/drools/features/org.guvnor.tools.feature/pom.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/features/org.guvnor.tools.feature/pom.xml= (rev 0) +++ branches/modular_build/drools/features/org.guvnor.tools.feature/pom.xml= 2010-05-11 19:19:40 UTC (rev 22023) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.guvnor.tools.feature = + 5.1.0-SNAPSHOT + eclipse-feature + Property changes on: branches/modular_build/drools/features/org.guvnor.tool= s.feature/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: branches/modular_build/drools/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/features/pom.xml = (rev 0) +++ branches/modular_build/drools/features/pom.xml 2010-05-11 19:19:40 UTC = (rev 22023) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + drools.features + 0.0.1-SNAPSHOT + pom + + org.drools.eclipse.feature + org.drools.eclipse.task.feature + org.guvnor.tools.feature + + + = \ No newline at end of file Property changes on: branches/modular_build/drools/features/pom.xml ___________________________________________________________________ Name: svn:mime-type + text/plain --===============2760098845940997556==-- From jbosstools-commits at lists.jboss.org Tue May 11 15:36:49 2010 Content-Type: multipart/mixed; boundary="===============0012174283585628744==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22024 - trunk/documentation/guides/GettingStartedGuide/en-US. Date: Tue, 11 May 2010 15:36:49 -0400 Message-ID: <201005111936.o4BJan9R005972@svn01.web.mwc.hst.phx2.redhat.com> --===============0012174283585628744== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-11 15:36:49 -0400 (Tue, 11 May 2010) New Revision: 22024 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml Log: TOOLSDOC-30 - fixing links = Modified: trunk/documentation/guides/GettingStartedGuide/en-US/getting_star= ted.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xm= l 2010-05-11 19:19:40 UTC (rev 22023) +++ trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xm= l 2010-05-11 19:36:49 UTC (rev 22024) @@ -1,917 +1,917 @@ - - - - - - JBoss Developer Studio - Eclipse - Java - JBoss - - - Getting Started with JBoss Developer Studio - -
- What is JBDS? - JBoss Developer Studio is a set of eclipse-ba= sed development tools that - are pre-configured for JBoss Enterprise Middleware Platforms and Red Ha= t Enterprise Linux. - Developers are not required to use JBoss Developer Studio to develop on - JBoss Enterprise Middleware and/or Red Hat Linux. But, many find these = pre-configured tools offer - significant time-savings and value, making them more productive and spe= eding time to deployment. - This guide covers the first steps to get started working with JBoss Developer - Studio. You will learn how to install and configure necessa= ry software for your OS - (currently Linux, Microsoft Windows or Mac OSX). - Thus this guide will provide you with detailed info on how to star= t JDK, JBDS and JBoss - Tools. -
- -
- Key Features of JBoss Developer Studio and Requirements - For a start, we propose you to look through the table of main featu= res of JBoss Developer Studio: - -
- = - Key Functionality of JBoss Developer Studio - - = - - - = - = - - - Feature - Benefit - = - - - = - - = - - JBoss Enterprise Application Platform - JBoss Developer Studio includes and integrates JBoss Ent= erprise Application Platform, the same version of the middleware platform t= hat Red Hat supports in production for 5 years. - - = - - New Seam Tools - JBoss Developer Studio includes brand new tools for Seam= . They provide wizards for creating new Seam projects, validation tools, ex= pression language code completion, testing tools, and wizards for generatin= g entity objects. - - = - - Visual Page Editor - JBoss Developer Studio includes a Visual Page Editor for= combined visual and source editing of Web pages. The Visual Page Editor ev= en renders AJAX-enabled RichFaces components. - - = - - AJAX Capabilities - JBoss Developer Studio includes a Technology Preview of = JBoss RichFaces. RichFaces provides nearly 70 skinnable components, includi= ng calendar, tree, dropdown menu, drag-and-drop components, and more. JBoss= Developer Studio=E2=80=99s Visual Page Editor can render RichFaces compone= nts. - - = - - JBoss Tools Palette - The JBoss Tools Palette contains a developer=E2=80=99s p= roject tag libraries and enables inserting tags into a JSP with one click. = The Tools Palette supports custom and 3rd party tags. - - = - - JBoss jBPM Tools - JBoss Developer Studio includes jBPM tooling for definin= g Seam page flows. - - = - - Spring Tools - JBoss Developer Studio includes Spring IDE for developin= g Spring applications. - - = - - Struts Tools - JBoss Developer Studio includes Struts tools for Struts = 1.x applications. - - = - - Optimized JBoss Application Server adapter - JBoss Developer Studio=E2=80=99s advanced JBoss AS adapt= er includes features like incremental deployment for fast development and i= s pre-configured for the included JBoss Application server. - - = - - Red Hat Enterprise Linux and RHN Access - JBoss Developer Studio includes access to Red Hat Enterp= rise Linux, Linux development tools, and Red Hat Network for development pu= rposes. - - = - - Project Examples - Tooling for easy installation of Examples. - - = - - JBossWeb Service - JBoss WS is a web service framework developed as a part = of the JBoss Application Server. It implements the JAX-WS specification tha= t defines a programming model and run-time architecture for implementing we= b services in Java, targeted at the Java Platform, Enterprise Edition 5 (Ja= va EE 5). - - - -
- = - JBDS requires JDK 5+ (JDK 6 in case of EAP 5.0= ). Also it's important that = - the JVM's architecture matches the particular JBDS build, i.e. if you're on a = - 64-bit system and use the 64-bit JVM, you need the 64-bit JBDS. - = - For the 32-bit version of JBDS use the 32-bit JVM or just use -vm flag to = - tell JBDS to use 32-bit java if the 64-bit one is found as the default. - = - - Note: - On Linux system with 64-bit JVM the visual editor may fail to star= t. In this case you need the libstdc++.so.5 library. - See also the FAQ. - - - = -
- - Configuring Your Java Environment - You must have a working installation of JDK before you install JBoss Developer - Studio. Thus in this - guide we will show you how to install a 32-bit Sun JDK 5.0 on a Linux P= latform and Microsoft - Windows Platform. - -
- Installing and Configuring 32-bit Sun JDK 5.0 on Linux - To install 32-bit Sun JDK 5.0 on Linux and configure it, you shou= ld follow the next steps: - - - Download the Sun JDK 5.0 - (Java 2 Development Kit) from Sun's website. Choose &q= uot;JDK 5.0 Update - <x>" (where "x" is the latest update number) for - download and then select "Red Hat Package Manager in self-extra= cting" file - for Linux. Read the instructions on Sun's website for installin= g the JDK. - - - If you don't want to use SysV service scripts you can inst= all the - "self-extracting file" for Linux instead of choosing the &= quot;RPM in - self-extracting" file. In that case you can skip the next step = mentioned here. But it - is recommended to use the SysV service scripts for production server= s. - - - Download and install the appropriate -compat RPM from JPackage = here. - Please ensure you choose a matching version of the -compat package t= o the JDK you've - installed. - - - Create an environment variable that points to the JDK installat= ion directory and call it - JAVA_HOME. Add - $JAVA_HOME/bin - to the system path to be able to run java from the comma= nd line. You can do this - by adding the following lines to the .bashrc file in your home direc= tory. - - - - - - Note: - - =EF=BB=BFIf you have JDK already installed and added in your sys= tem path, you should add - $JAVA_HOME/bin before the old $PATH (not after it) - so that the new version of JDK can be found first, i. e. - export PATH=3D$JAVA_HOME/bin:$PATH - This way, the machine will pick up the new JVM first. You= only need to run - "alternative" as a safe guard for the right JVM. - - - Set this variable for your account doing the installation and als= o for the user account - that will run the server. - - - If you have more than one version of JVM installed on your mach= ine, make sure you are - using the JDK 1.5 installation as the default java and javac. You ca= n do this using the - alternatives system. The alternatives system allows different versio= ns of Java from different - sources to co-exist on your system. - - -
- Select alternatives for java, javac and java_sdk_1.5.0 - - - As a root user, type the following command at the shell prompt= and you should see - something like this: - - - - Make sure the Sun version [jre-1.5.0-sun in this case] is select= ed (marked with a - '+' in the output), or select it by entering its number as = prompted. - - - Repeat the same for javac and java_sdk_1.5.0. - - - - You should verify that java, javac and java_sdk_1.5.0 all point = to the same manufacturer - and version. - - Note: - You can always override this step by setting the JAVA_HOME envi= ronment variable as - explained in the previous step. - - - - Make sure that the java executable is in your path and that yo= u are using an appropriate - version. To verify your Java environment, type "java -version&= quot; at the shell - prompt and you should see something like this: - - - -
- -
-
- Installing and Configuring 32-bit Sun JDK 5.0 on Microsoft Windo= ws - - To install and configure 32-bit Sun JDK 5.0 on Microsoft Windows,= follow these steps: - - - Download the Sun JDK 5.0 - (Java 2 Development Kit) from Sun's website. Choose &q= uot;JDK 5.0 Update - <x>" (where "x" is the latest update number) for - download and then select your Windows Platform options to perform th= e installation. - - - Create an environment variable called JAVA_HOME that points to = the JDK installation - directory, for example: - C:\Program Files\Java\jdk1.5.0_11\ - - - - - In order to run java from the command line, add the jre= \bin directory - to your path, for example: - - C:\Program Files\Java\jdk1.5.0_11\jre\bin - - To do this, open the - Control Panel - from the - Start - menu, switch to Classic View if necessary, open the System= Control Panel applet ( - System - ), select the - Advanced - Tab, and click on the - Environment Variables - button. - Now, when 32-bit Sun JDK 5.0 has been successfully installed, we = can pass on to the next - step. -
- -
- -
- - JBoss Developer Studio Installation - - This chapter will provide you with detailed information on how to = install JBoss - Developer Studio. - - JBDS comes with a simple installer, bundled with tested/pre-config= ured versions of Eclipse, - WTP, JBossEAP, Seam, and SpringIDE. Thus, to start perform the next ste= ps: - - - - First of all you need the appropriate installation file for your= platform from = - Red Hat - website. - - - Then run in console: - - - - Follow the instructions presented by the installation wizard: - - - -
- JBoss Developer Studio Installation Wizard - - - - - -
- - - - Provide the installation path - - - Select Java VM - - - -
- Select Java VM - - - - - -
- - - Tip: - By selecting - Default Java VM - you set default Java VM of your system (to verify your Jav= a environment, type - "java -version" in console). - - - Selecting - Specific Java VM - you can provide the path to non-default Java VM. - - - Note: - JBoss Developer Studio 3.0 comes integrated with JBoss EAP 5.0 th= at requires JDK 6.0 to run = - and "gij" isn't available on every platform. - - - - - Installation process includes JBoss Enterprise Application - Platform. Select - Yes to use it in JBoss Developer S= tudio. - - Note: - Like in the previous version of JBDS, JBDS 3.0.0.GA comes inte= grated with JBoss EAP 5.0 = - that supports EAP 5 adapter and Seam 2.2. - - = - This step lets you configure locally available JBoss Applicatio= n Servers: = - - - -
- JBoss Enterprise Application Platform Installing - - - - - -
- - - You can fill the list automatically using the <= property>Find button: click Find<= /property>, select a folder where search of available JBoss Appl= ication Servers should be started and click on Ok: - - = -
- Finding Servers in the Selected Directory - - - - - -
- - = - - All available servers in the selected directory will = be added to the list with the following information specified: Name, Type, = Version and Location. = - - - = - - You can also add servers one by one using the = - Add button: - - - = -
- Add Server to be Configured - - - - - -
- - -Click on Browse and select= the server location. Fields Name, Type and Version will be filled in autom= atically: - = -
- Specify Server Location - - - - - -
- - = - = - Click on Ok. The server = is added to the list with the details on its type, version and location. - = - = - = - The Remove button will t= he remove the selected server from the list. If necessary, you can edit the= server details clicking on the Edit button: - = -
- Edit Server - - - - - -
- - = - - - - - Click Next. Check your= installation paths and see the components to install. If you'd like to cha= nge - something, press the - Previous - button. Click - Next - to start installation. - - - - - -
- Summary Information - - - - - -
- -
- -
- - JBoss Developer Studio and JBoss Tools - - This section uncovers the points on the differences between JBoss Developer - Studio and JBoss Tools and provides the= steps on JBoss - Tools installation as well. - -
- What is the difference? - - JBoss Tools is what went into our = JBoss Developer - Studio which comes as an easy-to-install Eclipse based IDE = fully configured and ready - to run with the bundled JBoss Enterprise Application Platfor= m. - - In short JBoss Tools are just a set of Eclip= se plugins and - JBoss Developer Studio adds: - - - An installer - - - Eclipse and Web Tools preconfigured - - - JBoss EAP with JBoss AS and Seam preconfigured - - - 3rd party plugins bundled and configured - - - Access to RHEL and Red Hat Network - - - Access to the JBoss/Red Hat supported software - - - For additional information see JBoss.com -
- -
- JBoss Tools Installation and Update - Here, let's consider the installation of the JBoss= Tools - modules. - JBoss Tools is an umbrella project for the J= Boss developed plugins - that will make it into JBoss Developer Studio. Th= e JBoss Tools modules are: - - - JBoss AS Tools - - - Seam Tools - - - Hibernate Tools - - - Visual Page Editor - - - JST Tools - - - JBPM Tools - - - Smooks Tools - - - - To install the JBoss Tools plugins for Eclipse, you need the foll= owing: - - - - Get Eclipse and Web Tools (make sure you have the = - appropriate version of Ecl= ipse). - - - The current version of JBoss Tools (3.1.0.GA) targets at Eclipse = 3.5.2 Galileo JEE Bundle which is available from eclipse.org. - - - Tip: - We recommend you do not use Eclipse.org update site to go from o= ld version of Eclipse to new one. - Instead we suggest that you download the full binary from here. - - - If you can only use Eclipse 3.3 use JBoss Tools 2.1.2, but - JBoss Tools 2.x will not have any of the new features. - - - Note: - Remember to choose the download that matches your OS and use Jav= a 6 when you run - it. - - If you need to install any standalone plug-in from JBoss Tools v= isit a JBoss= Tools Wiki page to read - about dependencies between standalone plug-ins. = - For more information about how to install JBoss Tools 3.0 and JBo= ss Tools 3.1 please read the following docs: - - - JBoss Tools 3.0 Installation - JBoss Tools 3.1 Installation - - = -
- Installation From Update Site - = - = - Instead of downloading installation/updating manually, it's = also possible to - get the latest release of JBoss Tools from one of= our update sites: = - - - Stable Updates: http://download.jboss.org/jbosstools/updates/stable - - - Development Updates: http://download.jboss.org/jbosstools/updates/development<= /para> - - - Nightly Builds: http://download.jboss.org/jbosstools/updates/nightly/trunk/ - - - - - - Note: - During the JBT installation/updating process using some of Jboss = - update sites No repository found containing... err= or - can appear.It is a Eclipse P2 bug.To work around it try:1.Restart your = Eclipse. 2. = - Add the update site again. 3. = - Do the update again. - - To install/update Jboss Tools from one of the update sites you shou= ld follow the steps: - First, download the correct version of Eclipse = - for your platform which is compatible with the version of JBoss - Tools you plan to install.For example if you want to install - 3.1.0.GA Eclipse 3.5.2 Galileo JEE Bundle is required. - If you do not already have Java 5 or 6 installed and in y= our path, - download and install it. - When Eclipse is started, go to - Help->Software Updates... ->Available Software->Manage S= ites...->Add...(Eclipse 3.4) - Help->Install New Software->Add..(Eclipse 3.5)= - - - After clicking Add button = Add Site View should appear. - In the Location field you should paste one of the u= pdate sites described - above.On some platforms, - you can also drag and drop the link from your browser directly into Ecli= pse.In Name you can write any name you like. - In the end press the Ok button. -
- Add Update Site - - - - - -
- - In the Install Vie= w select features to install, then click Next. -
- Jboss Tools installation - - - - - -
- - = - And the system checks whether all necessary requirements and - dependencies are installed on your Eclipse. -
- Requirements and - dependencies check - - - - - -
= - If some of them are missing an error message will appear and - the installation process will be terminated. - - - Note: - Sometimes when a user changes the list of plugins for download an= d clicks - Next, after required dependences check, = - the list of missing dependencies of the previous attempt is showed. = - In this case the completely close of the Install New Softwar= e dialog can help. - - If Jboss Tools are already installed on your Eclipse and you are d= oing updating but not = - installation the following messages will appear in your Detail= s section. - Ignore them and press Next. -
- Possible messages - - - - - -
- - When you click Finish the prosses of Installation/Updatin= g starts up. - Install. Restart when prompted. -
- Message dialog - - - - - -
= - - After fetching all the features and plugins for installat= ion, - you may be prompted that your selection contains unsigned jars. - This is normal,simply accept the warning and continue. -
- Warning Message - - - - - -
= - - - - - Note: - While installing JBoss Tools on GNU/Linux (64-bit) through the ec= lipse installation manager you may run into some problems which can interru= pt your installation process. - Please, read the = - Manual installation of JBoss Tool= s 3.1.x on Eclipse 3.5 on GNU/Linux (64-bit) = - wiki article which provides you with the necessary steps to do it corr= ect. - -
-
- Installation From Zip file - You can download Jboss tools in a zip file from one of the pages = below: - - - Stable Releases: http://www.jboss.org/tools/download/stable.html - - - Development Updates: http://www.jboss.org/tools/download/dev.html - - - Nightly Builds: http://download.jboss.org/jbosstools/updates/nightly/ - - - When you downloaded Jboss Tools Zip please DO NOT UNZIP = IT and follow the steps described below: - - When Eclipse is started, go to Help -> Install= New Software... -> Add... -> Archive... - Browse for the update site zip.In the Name field you can write any name you like. - In the end press Ok button. -
- Installation from a zip file - - - - - -
= - - All the other steps are the same as it was described in = the - Installation From Update Site section. - = - - = -
- = -
-
- -
- Welcome to JBoss Developer Studio - In this section we'll show you how to work with the welcome page o= f the JBoss - Developer Studio. - The welcome page is the first page you see when you first launch <= property>JBoss Developer - Studio. - -
- Welcome to JBoss Developer Studio - - - - - -
- - With the help of its page you will be able: - - - to get quick access to Getting Started Documentation (guides, tu= torials and - viewlets) - - - -
- Getting Started Documentation - - - - - -
- - - - to create new Seam projects, jBPM Process, JSF or Struts project= s using JBDS - wizards - - - -
- Create New... - - - - - -
- - - - to get short description of perspectives that JBDS offers for mo= re productive - development - - - -
- Perspectives - - - - - -
- - - - to visit JBoss Developer Studio web resources. - - - -
- Web Resources - - - - - -
- - Start work with JBoss Developer Studio by cli= cking on - Workbench - button or simply close the Welcome page. - -
- -
- - Upgrading - As opposed to upgrading your JBDS from 2.0 to 2.1 using the update= site, = - to upgrade your JBDS from 2.1 to 3.0 you have to uninstall your 2.= 1 version and install the new one - because of some platform change. - = -
- -
- - Uninstalling - - - Make sure JBoss Developer Studio is not run= ning - - - Uninstall your current version of JBoss Developer Stud= io by running - Uninstaller - - -
- -
- - Support - If you have comments or questions, you can discuss them at our JBoss - Developer Studio Forum. - When writing to the forum for questions, please include the follow= ing information: - - - JBoss Developer Studio version - - - Exact error message - - - Steps to reproduce the issue - - - - JBDS subscribers can get necessary support on= our Suppo= rt Portal. -
- - -
- - Other relevant resources on the topic - JBDS on RedHat: JBoss Developer - Studio - Forum: JBoss - Forum - - Wiki: JBo= ssToolsWiki = - = - Subscription: JBDS - Subscription - = - The latest documentation builds are available here. - = - - Matrix of supported platforms= , runtimes and technologies in JBossTools/JBDS -
- - + + + + + + JBoss Developer Studio + Eclipse + Java + JBoss + + + Getting Started with JBoss Developer Studio + +
+ What is JBDS? + JBoss Developer Studio is a set of eclipse-ba= sed development tools that + are pre-configured for JBoss Enterprise Middleware Platforms and Red Ha= t Enterprise Linux. + Developers are not required to use JBoss Developer Studio to develop on + JBoss Enterprise Middleware and/or Red Hat Linux. But, many find these = pre-configured tools offer + significant time-savings and value, making them more productive and spe= eding time to deployment. + This guide covers the first steps to get started working with JBoss Developer + Studio. You will learn how to install and configure necessa= ry software for your OS + (currently Linux, Microsoft Windows or Mac OSX). + Thus this guide will provide you with detailed info on how to star= t JDK, JBDS and JBoss + Tools. +
+ +
+ Key Features of JBoss Developer Studio and Requirements + For a start, we propose you to look through the table of main featu= res of JBoss Developer Studio: + + + = + Key Functionality of JBoss Developer Studio + + = + + + = + = + + + Feature + Benefit + = + + + = + + = + + JBoss Enterprise Application Platform + JBoss Developer Studio includes and integrates JBoss Ent= erprise Application Platform, the same version of the middleware platform t= hat Red Hat supports in production for 5 years. + + = + + New Seam Tools + JBoss Developer Studio includes brand new tools for Seam= . They provide wizards for creating new Seam projects, validation tools, ex= pression language code completion, testing tools, and wizards for generatin= g entity objects. + + = + + Visual Page Editor + JBoss Developer Studio includes a Visual Page Editor for= combined visual and source editing of Web pages. The Visual Page Editor ev= en renders AJAX-enabled RichFaces components. + + = + + AJAX Capabilities + JBoss Developer Studio includes a Technology Preview of = JBoss RichFaces. RichFaces provides nearly 70 skinnable components, includi= ng calendar, tree, dropdown menu, drag-and-drop components, and more. JBoss= Developer Studio=E2=80=99s Visual Page Editor can render RichFaces compone= nts. + + = + + JBoss Tools Palette + The JBoss Tools Palette contains a developer=E2=80=99s p= roject tag libraries and enables inserting tags into a JSP with one click. = The Tools Palette supports custom and 3rd party tags. + + = + + JBoss jBPM Tools + JBoss Developer Studio includes jBPM tooling for definin= g Seam page flows. + + = + + Spring Tools + JBoss Developer Studio includes Spring IDE for developin= g Spring applications. + + = + + Struts Tools + JBoss Developer Studio includes Struts tools for Struts = 1.x applications. + + = + + Optimized JBoss Application Server adapter + JBoss Developer Studio=E2=80=99s advanced JBoss AS adapt= er includes features like incremental deployment for fast development and i= s pre-configured for the included JBoss Application server. + + = + + Red Hat Enterprise Linux and RHN Access + JBoss Developer Studio includes access to Red Hat Enterp= rise Linux, Linux development tools, and Red Hat Network for development pu= rposes. + + = + + Project Examples + Tooling for easy installation of Examples. + + = + + JBossWeb Service + JBoss WS is a web service framework developed as a part = of the JBoss Application Server. It implements the JAX-WS specification tha= t defines a programming model and run-time architecture for implementing we= b services in Java, targeted at the Java Platform, Enterprise Edition 5 (Ja= va EE 5). + + + +
+ = + JBDS requires JDK 5+ (JDK 6 in case of EAP 5.0= ). Also it's important that = + the JVM's architecture matches the particular JBDS build, i.e. if you're on a = + 64-bit system and use the 64-bit JVM, you need the 64-bit JBDS. + = + For the 32-bit version of JBDS use the 32-bit JVM or just use -vm flag to = + tell JBDS to use 32-bit java if the 64-bit one is found as the default. + = + + Note: + On Linux system with 64-bit JVM the visual editor may fail to star= t. In this case you need the libstdc++.so.5 library. + See also the FAQ. + +
+ = +
+ + Configuring Your Java Environment + You must have a working installation of JDK before you install JBoss Developer + Studio. Thus in this + guide we will show you how to install a 32-bit Sun JDK 5.0 on a Linux P= latform and Microsoft + Windows Platform. + +
+ Installing and Configuring 32-bit Sun JDK 5.0 on Linux + To install 32-bit Sun JDK 5.0 on Linux and configure it, you shou= ld follow the next steps: + + + Download the Sun JDK 5.0 + (Java 2 Development Kit) from Sun's website. Choose &q= uot;JDK 5.0 Update + <x>" (where "x" is the latest update number) for + download and then select "Red Hat Package Manager in self-extra= cting" file + for Linux. Read the instructions on Sun's website for installin= g the JDK. + + + If you don't want to use SysV service scripts you can inst= all the + "self-extracting file" for Linux instead of choosing the &= quot;RPM in + self-extracting" file. In that case you can skip the next step = mentioned here. But it + is recommended to use the SysV service scripts for production server= s. + + + Download and install the appropriate -compat RPM from JPackage = here. + Please ensure you choose a matching version of the -compat package t= o the JDK you've + installed. + + + Create an environment variable that points to the JDK installat= ion directory and call it + JAVA_HOME. Add + $JAVA_HOME/bin + to the system path to be able to run java from the comma= nd line. You can do this + by adding the following lines to the .bashrc file in your home direc= tory. + + + + + + Note: + + =EF=BB=BFIf you have JDK already installed and added in your sys= tem path, you should add + $JAVA_HOME/bin before the old $PATH (not after it) + so that the new version of JDK can be found first, i. e. + export PATH=3D$JAVA_HOME/bin:$PATH + This way, the machine will pick up the new JVM first. You= only need to run + "alternative" as a safe guard for the right JVM. + + + Set this variable for your account doing the installation and als= o for the user account + that will run the server. + + + If you have more than one version of JVM installed on your mach= ine, make sure you are + using the JDK 1.5 installation as the default java and javac. You ca= n do this using the + alternatives system. The alternatives system allows different versio= ns of Java from different + sources to co-exist on your system. + + +
+ Select alternatives for java, javac and java_sdk_1.5.0 + + + As a root user, type the following command at the shell prompt= and you should see + something like this: + + + + Make sure the Sun version [jre-1.5.0-sun in this case] is select= ed (marked with a + '+' in the output), or select it by entering its number as = prompted. + + + Repeat the same for javac and java_sdk_1.5.0. + + + + You should verify that java, javac and java_sdk_1.5.0 all point = to the same manufacturer + and version. + + Note: + You can always override this step by setting the JAVA_HOME envi= ronment variable as + explained in the previous step. + + + + Make sure that the java executable is in your path and that yo= u are using an appropriate + version. To verify your Java environment, type "java -version&= quot; at the shell + prompt and you should see something like this: + + + +
+ +
+
+ Installing and Configuring 32-bit Sun JDK 5.0 on Microsoft Windo= ws + + To install and configure 32-bit Sun JDK 5.0 on Microsoft Windows,= follow these steps: + + + Download the Sun JDK 5.0 + (Java 2 Development Kit) from Sun's website. Choose &q= uot;JDK 5.0 Update + <x>" (where "x" is the latest update number) for + download and then select your Windows Platform options to perform th= e installation. + + + Create an environment variable called JAVA_HOME that points to = the JDK installation + directory, for example: + C:\Program Files\Java\jdk1.5.0_11\ + + + + + In order to run java from the command line, add the jre= \bin directory + to your path, for example: + + C:\Program Files\Java\jdk1.5.0_11\jre\bin + + To do this, open the + Control Panel + from the + Start + menu, switch to Classic View if necessary, open the System= Control Panel applet ( + System + ), select the + Advanced + Tab, and click on the + Environment Variables + button. + Now, when 32-bit Sun JDK 5.0 has been successfully installed, we = can pass on to the next + step. +
+ +
+ +
+ + JBoss Developer Studio Installation + + This chapter will provide you with detailed information on how to = install JBoss + Developer Studio. + + JBDS comes with a simple installer, bundled with tested/pre-config= ured versions of Eclipse, + WTP, JBossEAP, Seam, and SpringIDE. Thus, to start perform the next ste= ps: + + + + First of all you need the appropriate installation file for your= platform from = + Red Hat + website. + + + Then run in console: + + + + Follow the instructions presented by the installation wizard: + + + +
+ JBoss Developer Studio Installation Wizard + + + + + +
+ + + + Provide the installation path + + + Select Java VM + + + +
+ Select Java VM + + + + + +
+ + + Tip: + By selecting + Default Java VM + you set default Java VM of your system (to verify your Jav= a environment, type + "java -version" in console). + + + Selecting + Specific Java VM + you can provide the path to non-default Java VM. + + + Note: + JBoss Developer Studio 3.0 comes integrated with JBoss EAP 5.0 th= at requires JDK 6.0 to run = + and "gij" isn't available on every platform. + + + + + Installation process includes JBoss Enterprise Application + Platform. Select + Yes to use it in JBoss Developer S= tudio. + + Note: + Like in the previous version of JBDS, JBDS 3.0.0.GA comes inte= grated with JBoss EAP 5.0 = + that supports EAP 5 adapter and Seam 2.2. + + = + This step lets you configure locally available JBoss Applicatio= n Servers: = + + + +
+ JBoss Enterprise Application Platform Installing + + + + + +
+ + + You can fill the list automatically using the <= property>Find button: click Find<= /property>, select a folder where search of available JBoss Appl= ication Servers should be started and click on Ok: + + = +
+ Finding Servers in the Selected Directory + + + + + +
+ + = + + All available servers in the selected directory will = be added to the list with the following information specified: Name, Type, = Version and Location. = + + + = + + You can also add servers one by one using the = + Add button: + + + = +
+ Add Server to be Configured + + + + + +
+ + +Click on Browse and select= the server location. Fields Name, Type and Version will be filled in autom= atically: + = +
+ Specify Server Location + + + + + +
+ + = + = + Click on Ok. The server = is added to the list with the details on its type, version and location. + = + = + = + The Remove button will t= he remove the selected server from the list. If necessary, you can edit the= server details clicking on the Edit button: + = +
+ Edit Server + + + + + +
+ + = + + + + + Click Next. Check your= installation paths and see the components to install. If you'd like to cha= nge + something, press the + Previous + button. Click + Next + to start installation. + + + + + +
+ Summary Information + + + + + +
+ +
+ +
+ + JBoss Developer Studio and JBoss Tools + + This section uncovers the points on the differences between JBoss Developer + Studio and JBoss Tools and provides the= steps on JBoss + Tools installation as well. + +
+ What is the difference? + + JBoss Tools is what went into our = JBoss Developer + Studio which comes as an easy-to-install Eclipse based IDE = fully configured and ready + to run with the bundled JBoss Enterprise Application Platfor= m. + + In short JBoss Tools are just a set of Eclip= se plugins and + JBoss Developer Studio adds: + + + An installer + + + Eclipse and Web Tools preconfigured + + + JBoss EAP with JBoss AS and Seam preconfigured + + + 3rd party plugins bundled and configured + + + Access to RHEL and Red Hat Network + + + Access to the JBoss/Red Hat supported software + + + For additional information see JBoss.com +
+ +
+ JBoss Tools Installation and Update + Here, let's consider the installation of the JBoss= Tools + modules. + JBoss Tools is an umbrella project for the J= Boss developed plugins + that will make it into JBoss Developer Studio. Th= e JBoss Tools modules are: + + + JBoss AS Tools + + + Seam Tools + + + Hibernate Tools + + + Visual Page Editor + + + JST Tools + + + JBPM Tools + + + Smooks Tools + + + + To install the JBoss Tools plugins for Eclipse, you need the foll= owing: + + + + Get Eclipse and Web Tools (make sure you have the = + appropriate version of Ecl= ipse). + + + The current version of JBoss Tools (3.1.0.GA) targets at Eclipse = 3.5.2 Galileo JEE Bundle which is available from eclipse.org. + + + Tip: + We recommend you do not use Eclipse.org update site to go from o= ld version of Eclipse to new one. + Instead we suggest that you download the full binary from here. + + + If you can only use Eclipse 3.3 use JBoss Tools 2.1.2, but + JBoss Tools 2.x will not have any of the new features. + + + Note: + Remember to choose the download that matches your OS and use Jav= a 6 when you run + it. + + If you need to install any standalone plug-in from JBoss Tools vi= sit a J= Boss Tools Wiki page to read + about dependencies between standalone plug-ins. = + For more information about how to install JBoss Tools 3.0 and JBo= ss Tools 3.1 please read the following docs: + + + JBoss Tools 3.0 Installation + JBoss Tools 3.1 Installation + + = +
+ Installation From Update Site + = + = + Instead of downloading installation/updating manually, it's = also possible to + get the latest release of JBoss Tools from one of= our update sites: = + + + Stable Updates: http://download.jboss.org/jbosstools/updates/stable + + + Development Updates: http://download.jboss.org/jbosstools/updates/development<= /para> + + + Nightly Builds: http://download.jboss.org/jbosstools/updates/nightly/trunk/ + + + + + + Note: + During the JBT installation/updating process using some of Jboss = + update sites No repository found containing... err= or + can appear.It is a Eclipse P2 bug.To work around it try:1.Restart your = Eclipse. 2. = + Add the update site again. 3. = + Do the update again. + + To install/update Jboss Tools from one of the update sites you shou= ld follow the steps: + First, download the correct version of Eclipse = + for your platform which is compatible with the version of JBoss + Tools you plan to install.For example if you want to install + 3.1.0.GA Eclipse 3.5.2 Galileo JEE Bundle is required. + If you do not already have Java 5 or 6 installed and in y= our path, + download and install it. + When Eclipse is started, go to + Help->Software Updates... ->Available Software->Manage S= ites...->Add...(Eclipse 3.4) + Help->Install New Software->Add..(Eclipse 3.5)= + + + After clicking Add button = Add Site View should appear. + In the Location field you should paste one of the u= pdate sites described + above.On some platforms, + you can also drag and drop the link from your browser directly into Ecli= pse.In Name you can write any name you like. + In the end press the Ok button. +
+ Add Update Site + + + + + +
+ + In the Install Vie= w select features to install, then click Next. +
+ Jboss Tools installation + + + + + +
+ + = + And the system checks whether all necessary requirements and + dependencies are installed on your Eclipse. +
+ Requirements and + dependencies check + + + + + +
= + If some of them are missing an error message will appear and + the installation process will be terminated. + + + Note: + Sometimes when a user changes the list of plugins for download an= d clicks + Next, after required dependences check, = + the list of missing dependencies of the previous attempt is showed. = + In this case the completely close of the Install New Softwar= e dialog can help. + + If Jboss Tools are already installed on your Eclipse and you are d= oing updating but not = + installation the following messages will appear in your Detail= s section. + Ignore them and press Next. +
+ Possible messages + + + + + +
+ + When you click Finish the prosses of Installation/Updatin= g starts up. + Install. Restart when prompted. +
+ Message dialog + + + + + +
= + + After fetching all the features and plugins for installat= ion, + you may be prompted that your selection contains unsigned jars. + This is normal,simply accept the warning and continue. +
+ Warning Message + + + + + +
= + + + + + Note: + While installing JBoss Tools on GNU/Linux (64-bit) through the ec= lipse installation manager you may run into some problems which can interru= pt your installation process. + Please, read the = + Manual installation of JBoss Tool= s 3.1.x on Eclipse 3.5 on GNU/Linux (64-bit) = + wiki article which provides you with the necessary steps to do it corr= ect. + +
+
+ Installation From Zip file + You can download Jboss tools in a zip file from one of the pages = below: + + + Stable Releases: http://www.jboss.org/tools/download/stable.html + + + Development Updates: http://www.jboss.org/tools/download/dev.html + + + Nightly Builds: http://download.jboss.org/jbosstools/updates/nightly/ + + + When you downloaded Jboss Tools Zip please DO NOT UNZIP = IT and follow the steps described below: + + When Eclipse is started, go to Help -> Install= New Software... -> Add... -> Archive... + Browse for the update site zip.In the Name field you can write any name you like. + In the end press Ok button. +
+ Installation from a zip file + + + + + +
= + + All the other steps are the same as it was described in = the + Installation From Update Site section. + = + + = +
+ = +
+
+ +
+ Welcome to JBoss Developer Studio + In this section we'll show you how to work with the welcome page o= f the JBoss + Developer Studio. + The welcome page is the first page you see when you first launch <= property>JBoss Developer + Studio. + +
+ Welcome to JBoss Developer Studio + + + + + +
+ + With the help of its page you will be able: + + + to get quick access to Getting Started Documentation (guides, tu= torials and + viewlets) + + + +
+ Getting Started Documentation + + + + + +
+ + + + to create new Seam projects, jBPM Process, JSF or Struts project= s using JBDS + wizards + + + +
+ Create New... + + + + + +
+ + + + to get short description of perspectives that JBDS offers for mo= re productive + development + + + +
+ Perspectives + + + + + +
+ + + + to visit JBoss Developer Studio web resources. + + + +
+ Web Resources + + + + + +
+ + Start work with JBoss Developer Studio by cli= cking on + Workbench + button or simply close the Welcome page. + +
+ +
+ + Upgrading + As opposed to upgrading your JBDS from 2.0 to 2.1 using the update= site, = + to upgrade your JBDS from 2.1 to 3.0 you have to uninstall your 2.= 1 version and install the new one + because of some platform change. + = +
+ +
+ + Uninstalling + + + Make sure JBoss Developer Studio is not run= ning + + + Uninstall your current version of JBoss Developer Stud= io by running + Uninstaller + + +
+ +
+ + Support + If you have comments or questions, you can discuss them at our JBoss + Developer Studio Forum. + When writing to the forum for questions, please include the follow= ing information: + + + JBoss Developer Studio version + + + Exact error message + + + Steps to reproduce the issue + + + + JBDS subscribers can get necessary support on= our Suppo= rt Portal. +
+ + +
+ + Other relevant resources on the topic + JBDS on RedHat: JBoss Developer + Studio + Forum: JBoss + Forum + + Wiki: JBo= ssToolsWiki = + = + Subscription: JBDS + Subscription + = + The latest documentation builds are available here. + = + + Matrix of supported platforms= , runtimes and technologies in JBossTools/JBDS +
+ + \ No newline at end of file --===============0012174283585628744==-- From jbosstools-commits at lists.jboss.org Tue May 11 16:12:41 2010 Content-Type: multipart/mixed; boundary="===============5557434867770043707==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22025 - branches/modular_build/drools. Date: Tue, 11 May 2010 16:12:40 -0400 Message-ID: <201005112012.o4BKCeu8016032@svn01.web.mwc.hst.phx2.redhat.com> --===============5557434867770043707== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 16:12:40 -0400 (Tue, 11 May 2010) New Revision: 22025 Modified: branches/modular_build/drools/pom.xml Log: disable running ant because it happens too late Modified: branches/modular_build/drools/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/pom.xml 2010-05-11 19:36:49 UTC (rev 2202= 4) +++ branches/modular_build/drools/pom.xml 2010-05-11 20:12:40 UTC (rev 2202= 5) @@ -16,53 +16,19 @@ plugins features - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - compile - compile - - - - - - - run - - - - - - commons-net - commons-net - 1.4.1 - - - org.apache.ant - ant-commons-net - 1.7.1 - - - org.apache.ant - ant-apache-regexp - 1.7.1 - - - ant-contrib - ant-contrib - 1.0b3 - - - - - - + + = --===============5557434867770043707==-- From jbosstools-commits at lists.jboss.org Tue May 11 16:19:13 2010 Content-Type: multipart/mixed; boundary="===============5588021787385353476==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22026 - branches/modular_build/build. Date: Tue, 11 May 2010 16:19:13 -0400 Message-ID: <201005112019.o4BKJDA5016591@svn01.web.mwc.hst.phx2.redhat.com> --===============5588021787385353476== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 16:19:13 -0400 (Tue, 11 May 2010) New Revision: 22026 Modified: branches/modular_build/build/build.xml Log: fix bootstrapping for drools build Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-11 20:12:40 UTC (rev 220= 25) +++ branches/modular_build/build/build.xml 2010-05-11 20:19:13 UTC (rev 220= 26) @@ -589,6 +589,7 @@ Run custom @{COMPONENT}/build.xml + --===============5588021787385353476==-- From jbosstools-commits at lists.jboss.org Tue May 11 16:30:22 2010 Content-Type: multipart/mixed; boundary="===============0789538156250019418==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22027 - branches/modular_build/build. Date: Tue, 11 May 2010 16:30:21 -0400 Message-ID: <201005112030.o4BKULkg018531@svn01.web.mwc.hst.phx2.redhat.com> --===============0789538156250019418== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 16:30:21 -0400 (Tue, 11 May 2010) New Revision: 22027 Modified: branches/modular_build/build/build.xml Log: exclude non-test result files from report = Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-11 20:19:13 UTC (rev 220= 26) +++ branches/modular_build/build/build.xml 2010-05-11 20:30:21 UTC (rev 220= 27) @@ -589,7 +589,7 @@ Run custom @{COMPONENT}/build.xml - + @@ -730,7 +730,7 @@ - + @@ -784,9 +784,14 @@ /> - + + + + + + --===============0789538156250019418==-- From jbosstools-commits at lists.jboss.org Tue May 11 16:50:40 2010 Content-Type: multipart/mixed; boundary="===============0172629150229913440==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22028 - branches/modular_build. Date: Tue, 11 May 2010 16:50:40 -0400 Message-ID: <201005112050.o4BKoebk020685@svn01.web.mwc.hst.phx2.redhat.com> --===============0172629150229913440== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 16:50:40 -0400 (Tue, 11 May 2010) New Revision: 22028 Modified: branches/modular_build/genpom.xml Log: report when pom.xml files exist and are not overwritten by pomgen Modified: branches/modular_build/genpom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/genpom.xml 2010-05-11 20:30:21 UTC (rev 22027) +++ branches/modular_build/genpom.xml 2010-05-11 20:50:40 UTC (rev 22028) @@ -90,6 +90,8 @@ = + + @@ -134,6 +136,17 @@ /> Agg dir: ${activeDir}, artifactType: ${arti= factType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion}, = parentpom: @{parentpom} + + + + + + + + + + + @@ -223,6 +236,17 @@ /> Mod dir: ${activeDir}, artifactType: ${arti= factType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion}, = parentpom: @{parentpom} + + + + + + + + + + + @@ -505,7 +529,15 @@ ${WORKINGDIR}/${COMPONENT} :: Modules: ${modulecoun= t}, Aggregations: ${aggregatorcount} - + + + + + + + ${show.pom.exists.warning.count} pom.xml file(= s) already exist. To overwrite, use -Doverwrite.existing.pom.xml=3Dtrue + + = --===============0172629150229913440==-- From jbosstools-commits at lists.jboss.org Tue May 11 16:51:21 2010 Content-Type: multipart/mixed; boundary="===============1507034966896486042==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22029 - branches/modular_build. Date: Tue, 11 May 2010 16:51:21 -0400 Message-ID: <201005112051.o4BKpLuD020706@svn01.web.mwc.hst.phx2.redhat.com> --===============1507034966896486042== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-11 16:51:21 -0400 (Tue, 11 May 2010) New Revision: 22029 Modified: branches/modular_build/genpom.xml Log: report when pom.xml files exist and are not overwritten by pomgen Modified: branches/modular_build/genpom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/genpom.xml 2010-05-11 20:50:40 UTC (rev 22028) +++ branches/modular_build/genpom.xml 2010-05-11 20:51:21 UTC (rev 22029) @@ -535,7 +535,7 @@ - ${show.pom.exists.warning.count} pom.xml file(= s) already exist. To overwrite, use -Doverwrite.existing.pom.xml=3Dtrue + ${show.pom.exists.warning.count} ${COMPONENT} = pom.xml file(s) already exist. To overwrite, use -Doverwrite.existing.pom.x= ml=3Dtrue --===============1507034966896486042==-- From jbosstools-commits at lists.jboss.org Wed May 12 04:53:39 2010 Content-Type: multipart/mixed; boundary="===============7986363954367956989==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22030 - in trunk/jsf/plugins/org.jboss.tools.jsf: src/org/jboss/tools/jsf/jsf2 and 8 other directories. Date: Wed, 12 May 2010 04:53:39 -0400 Message-ID: <201005120853.o4C8rd3E017090@svn01.web.mwc.hst.phx2.redhat.com> --===============7986363954367956989== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yzhishko Date: 2010-05-12 04:53:34 -0400 (Wed, 12 May 2010) New Revision: 22030 Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/model= /JSF2ComponentModelManager.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refac= toring/ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refac= toring/JSF2RenameParticipant.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refac= toring/JSf2MoveParticipant.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/= JSF2ComponentUtil.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/= JSF2ResourceUtil.java Removed: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/util/JSF2ComponentModelManager.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/util/JSF2ComponentUtil.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/util/JSF2ResourceUtil.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/J= SFUIMessages.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/m= essages.properties trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/JSF2ComponentsValidator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/JSF2SourceValidator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/JSF2XMLValidator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/JSF2CompositeAttrsProposal.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/JSF2CompositeComponentProposal.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/JSF2QuickFixProcessor.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/action/JSF2ResourcesFolderProposal.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/components/JSF2AttrTempComponent.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/components/JSF2ComponentFactory.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/components/JSF2CompositeTempComponent.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/components/JSF2URITempComponent.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/jsf2/util/JSF2ComponentRecognizer.java Log: https://jira.jboss.org/jira/browse/JBIDE-5942 - refactor to JSF2 composite = components (rename/move) was added Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-05-11 20:51:21 UT= C (rev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml 2010-05-12 08:53:34 UT= C (rev 22030) @@ -529,6 +529,9 @@ caseSensitive=3D"false" ext=3D"jsp"> + + @@ -592,4 +595,54 @@ super=3D"org.eclipse.wst.sse.ui.temp.warning"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Copied: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/= model/JSF2ComponentModelManager.java (from rev 21981, trunk/jsf/plugins/org= .jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2Compo= nentModelManager.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/mode= l/JSF2ComponentModelManager.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/mode= l/JSF2ComponentModelManager.java 2010-05-12 08:53:34 UTC (rev 22030) @@ -0,0 +1,507 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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.jsf.jsf2.model; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Scanner; +import java.util.Set; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.content.IContentType; +import org.eclipse.jdt.internal.core.JarEntryFile; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.ui.ide.IDE; +import org.eclipse.wst.html.core.internal.encoding.HTMLModelLoader; +import org.eclipse.wst.sse.core.StructuredModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocum= ent; +import org.eclipse.wst.sse.core.internal.text.JobSafeStructuredDocument; +import org.eclipse.wst.validation.ValidationFramework; +import org.eclipse.wst.xml.core.internal.document.ElementImpl; +import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; +import org.eclipse.wst.xml.core.internal.provisional.format.DocumentNodeFo= rmatter; +import org.jboss.tools.jsf.JSFModelPlugin; +import org.jboss.tools.jsf.jsf2.util.JSF2ComponentUtil; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * = + * @author yzhishko + * = + */ + +(a)SuppressWarnings("restriction") +public class JSF2ComponentModelManager { + + private static JSF2ComponentModelManager instance =3D new JSF2ComponentMo= delManager(); + + private JSF2ComponentModelManager() { + + } + + public static JSF2ComponentModelManager getManager() { + return instance; + } + + public IFile updateJSF2CompositeComponentFile( + final IFile componentFileContatiner, final String[] attrNames) { + IFile file =3D updateFileContent(new EditableDOMFile() { + + @Override + public IFile getFile() { + return componentFileContatiner; + } + + @Override + protected void edit(IDOMModel model) throws CoreException, + IOException { + IDOMDocument document =3D model.getDocument(); + updateJSF2CompositeComponent(document, attrNames); + IStructuredDocument structuredDocument =3D document + .getStructuredDocument(); + String text =3D structuredDocument.getText(); + model.reload(new ByteArrayInputStream(text.getBytes())); + model.save(); + } + }); + return file; + } + + public void renameCompositeComponents(IResource resource, String URI, + String oldName, String newName) throws CoreException { + if (resource instanceof IFile) { + IFile file =3D (IFile) resource; + renameCompositeComponentsInFile(file, URI, oldName, newName); + } else if (resource instanceof IProject) { + IResource[] children =3D ((IProject) resource).members(); + if (children !=3D null) { + for (int i =3D 0; i < children.length; i++) { + renameCompositeComponents(children[i], URI, oldName, + newName); + } + } + } else if (resource instanceof IFolder) { + IResource[] children =3D ((IFolder) resource).members(); + if (children !=3D null) { + for (int i =3D 0; i < children.length; i++) { + renameCompositeComponents(children[i], URI, oldName, + newName); + } + } + } + } + + private boolean isFileCorrect(IFile file) { + if (file =3D=3D null) { + return false; + } + if (!"xhtml".equals(file.getFileExtension()) && !"jsp".equals(file.getFi= leExtension())) { //$NON-NLS-1$ //$NON-NLS-2$ + IContentType contentType =3D IDE.getContentType(file); + if (contentType =3D=3D null) { + return false; + } + String id =3D contentType.getId(); + if (!"org.eclipse.jst.jsp.core.jspsource".equals(id) && !"org.eclipse.w= st.html.core.htmlsource".equals(id)) { //$NON-NLS-1$ //$NON-NLS-2$ + return false; + } + } + return true; + } + + private void renameCompositeComponentsInFile(final IFile file, + final String URI, final String oldName, final String newName) { + if (!isFileCorrect(file)) { + return; + } + updateFileContent(new EditableDOMFile() { + + @Override + public IFile getFile() { + return file; + } + + @Override + protected void edit(IDOMModel model) throws CoreException, + IOException { + IDOMDocument document =3D model.getDocument(); + Map> compositeComponentsMap =3D JSF2ComponentUtil + .findCompositeComponents(document); + List compositeComponents =3D compositeComponentsMap + .get(URI); + if (compositeComponents !=3D null) { + for (Element element : compositeComponents) { + if (oldName.equals(element.getLocalName())) { + renameElement((IDOMElement) element, oldName, + newName); + } + } + model.save(); + ValidationFramework.getDefault().validate(file, + new NullProgressMonitor()); + } + } + }); + } + + public void renameURIs(IResource resource, Map urisMap) + throws CoreException { + if (resource instanceof IFile) { + IFile file =3D (IFile) resource; + renameURIsInFile(file, urisMap); + } else if (resource instanceof IProject) { + IResource[] children =3D ((IProject) resource).members(); + if (children !=3D null) { + for (int i =3D 0; i < children.length; i++) { + renameURIs(children[i], urisMap); + } + } + } else if (resource instanceof IFolder) { + IResource[] children =3D ((IFolder) resource).members(); + if (children !=3D null) { + for (int i =3D 0; i < children.length; i++) { + renameURIs(children[i], urisMap); + } + } + } + } + + private void renameURIsInFile(final IFile file, + final Map urisMap) { + if (!isFileCorrect(file)) { + return; + } + updateFileContent(new EditableDOMFile() { + + @Override + public IFile getFile() { + return file; + } + + @Override + protected void edit(IDOMModel model) throws CoreException, + IOException { + IDOMDocument document =3D model.getDocument(); + IDOMAttr[] uriAttrs =3D JSF2ComponentUtil + .findURIContainers(document); + for (int i =3D 0; i < uriAttrs.length; i++) { + if (urisMap.containsKey(uriAttrs[i].getValue())) { + renameURIAttr(uriAttrs[i], urisMap.get(uriAttrs[i] + .getValue())); + } + } + model.save(); + ValidationFramework.getDefault().validate(file, + new NullProgressMonitor()); + } + + }); + } + + private void renameURIAttr(IDOMAttr idomAttr, final String replaceValue) { + int startOffset =3D idomAttr.getStartOffset(); + String attrValue =3D idomAttr.getValue(); + IStructuredDocument document =3D idomAttr.getStructuredDocument(); + String value =3D document.getText().substring(idomAttr.getStartOffset()); + value =3D value.substring(0, value.indexOf(attrValue) + + idomAttr.getValue().length()); + try { + document.replace(startOffset + value.indexOf(attrValue), attrValue + .length(), replaceValue); + } catch (BadLocationException e) { + JSFModelPlugin.getPluginLog().logError(e); + } + idomAttr.getName(); + } + + private void renameElement(final IDOMElement element, final String oldNam= e, + final String newName) { + String sourceString =3D element.getSource(); + IStructuredDocument structuredDocument =3D element + .getStructuredDocument(); + int startOffset =3D element.getStartOffset(); + int endStartOffset =3D element.getEndStartOffset(); + int endOffset =3D element.getEndOffset(); + try { + if (endOffset !=3D endStartOffset) { + structuredDocument.replace(sourceString.lastIndexOf(oldName) + + startOffset, oldName.length(), newName); + } + structuredDocument.replace(element.getStartOffset() + + sourceString.indexOf(oldName), oldName.length(), newName); + } catch (BadLocationException e) { + JSFModelPlugin.getPluginLog().logError(e); + } + } + + private void updateJSF2CompositeComponent(IDOMDocument componentDoc, + String[] attrNames) { + IDOMElement[] interfaceElement =3D new IDOMElement[1]; + findInterfaceComponent(componentDoc, interfaceElement); + createCompositeCompInterface(interfaceElement[0], attrNames); + } + + private void findInterfaceComponent(Node node, + IDOMElement[] interfaceElement) { + if (node instanceof IDOMDocument) { + IDOMDocument document =3D (IDOMDocument) node; + findInterfaceComponent(document.getDocumentElement(), + interfaceElement); + } + if (node instanceof ElementImpl) { + ElementImpl impl =3D (ElementImpl) node; + String nameSpace =3D impl.getNamespaceURI(); + if (JSF2ResourceUtil.JSF2_URI_PREFIX.equals(nameSpace)) { + String nodeName =3D impl.getLocalName(); + if ("interface".equals(nodeName)) { //$NON-NLS-1$ + interfaceElement[0] =3D impl; + return; + } + } else { + NodeList nodeList =3D node.getChildNodes(); + if (nodeList !=3D null) { + for (int i =3D 0; i < nodeList.getLength(); i++) { + findInterfaceComponent(nodeList.item(i), + interfaceElement); + } + } + } + } + } + + private void createCompositeCompInterface(IDOMElement element, + String[] attrNames) { + Document document =3D (Document) element.getOwnerDocument(); + String prefix =3D element.getPrefix(); + Set existInerfaceAttrs =3D getInterfaceAttrs(element); + if (prefix !=3D null && !"".equals(prefix)) { //$NON-NLS-1$ + for (int i =3D 0; i < attrNames.length; i++) { + if (!existInerfaceAttrs.contains(attrNames[i])) { + Element attrEl =3D document.createElementNS( + JSF2ResourceUtil.JSF2_URI_PREFIX, prefix + + ":attribute"); //$NON-NLS-1$ + attrEl.setAttribute("name", attrNames[i]); //$NON-NLS-1$ + element.appendChild(attrEl); + } + } + } else { + for (int i =3D 0; i < attrNames.length; i++) { + if (!existInerfaceAttrs.contains(attrNames[i])) { + Element attrEl =3D document.createElementNS( + JSF2ResourceUtil.JSF2_URI_PREFIX, "attribute"); //$NON-NLS-1$ + attrEl.setAttribute("name", attrNames[i]); //$NON-NLS-1$ + element.appendChild(attrEl); + } + } + } + DocumentNodeFormatter formatter =3D new DocumentNodeFormatter(); + formatter.format(document); + } + + public IFile revalidateCompositeComponentFile(IFile file) { + IDOMDocument document =3D getReadableDOMDocument(file); + if (document =3D=3D null) { + return null; + } + IDOMElement interfaceElement =3D checkCompositeInterface(document); + if (interfaceElement =3D=3D null) { + return null; + } + return file; + } + + public IDOMElement checkCompositeInterface(IDOMDocument document) { + if (document =3D=3D null) { + return null; + } + Element element =3D document.getDocumentElement(); + if (element =3D=3D null) { + return null; + } + if (!"html".equals(element.getNodeName())) { //$NON-NLS-1$ + return null; + } + ElementImpl elementImpl =3D (ElementImpl) element; + if (!"http://www.w3.org/1999/xhtml".equals(elementImpl.getNamespaceURI()= )) { //$NON-NLS-1$ + return null; + } + IDOMElement[] interfaceElement =3D new IDOMElement[1]; + findInterfaceComponent(element, interfaceElement); + return interfaceElement[0]; + } + + public static IDOMDocument getReadableDOMDocument(IFile file) { + IDOMDocument document =3D null; + IModelManager manager =3D StructuredModelManager.getModelManager(); + if (manager =3D=3D null) { + return document; + } + IStructuredModel model =3D null; + try { + model =3D manager.getModelForRead(file); + if (model instanceof IDOMModel) { + IDOMModel domModel =3D (IDOMModel) model; + document =3D domModel.getDocument(); + } + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } catch (IOException e) { + JSFModelPlugin.getPluginLog().logError(e); + } finally { + if (model !=3D null) { + model.releaseFromRead(); + } + } + return document; + } + + public static IDOMDocument getReadableDOMDocument(JarEntryFile file) { + IDOMDocument document =3D null; + IStructuredModel model =3D null; + InputStream inputStream; + try { + inputStream =3D file.getContents(); + if (inputStream !=3D null) { + StringBuffer buffer =3D new StringBuffer(""); //$NON-NLS-1$ + Scanner in =3D new Scanner(inputStream); + while (in.hasNextLine()) { + buffer.append(in.nextLine()); + } + model =3D new HTMLModelLoader().newModel(); + model.setStructuredDocument(new JobSafeStructuredDocument( + new XMLSourceParser())); + model.getStructuredDocument().set(buffer.toString()); + if (model instanceof IDOMModel) { + document =3D ((IDOMModel) model).getDocument(); + } + } + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } finally { + model =3D null; + } + return document; + } + + public static IDOMDocument getReadableDOMDocument(IDocument textDocument)= { + IDOMDocument document =3D null; + if (!(textDocument instanceof IStructuredDocument)) { + return document; + } + IModelManager manager =3D StructuredModelManager.getModelManager(); + if (manager =3D=3D null) { + return document; + } + IStructuredModel model =3D null; + try { + model =3D manager.getModelForRead((IStructuredDocument) textDocument); + if (model instanceof IDOMModel) { + IDOMModel domModel =3D (IDOMModel) model; + document =3D domModel.getDocument(); + } + } finally { + if (model !=3D null) { + model.releaseFromRead(); + } + } + return document; + } + + public Set getInterfaceAttrs(IDOMElement interfaceElement) { + Set interfaceAttrs =3D new HashSet(0); + if (interfaceElement !=3D null) { + String prefix =3D interfaceElement.getPrefix(); + String nodeName =3D "attribute"; //$NON-NLS-1$ + if (prefix !=3D null && !"".equals(prefix)) { //$NON-NLS-1$ + nodeName =3D prefix + ":" + nodeName; //$NON-NLS-1$ + } + NodeList attrsElements =3D interfaceElement + .getElementsByTagName(nodeName); + if (attrsElements !=3D null) { + for (int i =3D 0; i < attrsElements.getLength(); i++) { + Node el =3D attrsElements.item(i); + if (el instanceof IDOMElement) { + IDOMElement element =3D (IDOMElement) el; + String attrvalue =3D element.getAttribute("name"); //$NON-NLS-1$ + if (attrvalue !=3D null && !"".equals(attrvalue)) { //$NON-NLS-1$ + interfaceAttrs.add(attrvalue); + } + } + } + } + } + return interfaceAttrs; + } + + private abstract class EditableDOMFile { + + public EditableDOMFile() { + } + + public IFile editFile() { + IFile file =3D getFile(); + if (file =3D=3D null) { + return file; + } + IModelManager manager =3D StructuredModelManager.getModelManager(); + if (manager =3D=3D null) { + return file; + } + IStructuredModel model =3D null; + try { + model =3D manager.getModelForEdit(file); + if (model instanceof IDOMModel) { + IDOMModel domModel =3D (IDOMModel) model; + edit(domModel); + } + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } catch (IOException e) { + JSFModelPlugin.getPluginLog().logError(e); + } finally { + if (model !=3D null) { + model.releaseFromEdit(); + } + } + return file; + }; + + protected abstract void edit(IDOMModel model) throws CoreException, + IOException; + + public abstract IFile getFile(); + + } + + private IFile updateFileContent(EditableDOMFile domFile) { + return domFile.editFile(); + } + +} Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/r= efactoring/JSF2RenameParticipant.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refa= ctoring/JSF2RenameParticipant.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refa= ctoring/JSF2RenameParticipant.java 2010-05-12 08:53:34 UTC (rev 22030) @@ -0,0 +1,117 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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.jsf.jsf2.refactoring; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.core.runtime.content.IContentType; +import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContex= t; +import org.eclipse.ltk.core.refactoring.participants.RenameParticipant; +import org.eclipse.ui.ide.IDE; +import org.jboss.tools.jsf.jsf2.model.JSF2ComponentModelManager; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; +import org.jboss.tools.jsf.messages.JSFUIMessages; + +/** + * = + * @author yzhishko + * = + */ + +public class JSF2RenameParticipant extends RenameParticipant { + + private IProject project; + private String URI; + private String oldFileName; + + @Override + public RefactoringStatus checkConditions(IProgressMonitor pm, + CheckConditionsContext context) throws OperationCanceledException { + return new RefactoringStatus(); + } + + @Override + public Change createChange(IProgressMonitor pm) throws CoreException, + OperationCanceledException { + String newFileName =3D getArguments().getNewName(); + if (project =3D=3D null || newFileName =3D=3D null || oldFileName =3D=3D= null) { + return null; + } + oldFileName =3D oldFileName.substring(0, oldFileName.lastIndexOf('.')); + newFileName =3D newFileName.substring(0, newFileName.lastIndexOf('.')); + JSF2ComponentModelManager.getManager().renameCompositeComponents( + project, URI, oldFileName, newFileName); + project =3D null; + URI =3D null; + oldFileName =3D null; + return null; + } + + @Override + public String getName() { + return JSFUIMessages.Rename_JSF_2_Composite_Components; + } + + @Override + protected boolean initialize(Object element) { + if (element instanceof IFile) { + IFile file =3D (IFile) element; + URI =3D calcURIFromPath(file.getFullPath()); + if (checkContentType(file)) { + project =3D file.getProject(); + oldFileName =3D file.getName(); + return true; + } + } + return false; + } + + private boolean checkContentType(IFile file) { + if (URI =3D=3D null || URI.equals("")) { //$NON-NLS-1$ + return false; + } + if (!"xhtml".equals(file.getFileExtension())) { //$NON-NLS-1$ + return false; + } + IContentType contentType =3D IDE.getContentType(file); + if (!"org.eclipse.wst.html.core.htmlsource".equals(contentType.getId()))= { //$NON-NLS-1$ + return false; + } + if ((JSF2ComponentModelManager.getManager() + .checkCompositeInterface(JSF2ComponentModelManager + .getReadableDOMDocument(file))) =3D=3D null) { + return false; + } + return true; + } + + private String calcURIFromPath(IPath path) { + StringBuilder uri =3D new StringBuilder(""); //$NON-NLS-1$ + String[] segments =3D path.segments(); + if (segments.length > 3) { + if (segments[2].equals("resources")) { //$NON-NLS-1$ + for (int i =3D 3; i < segments.length - 1; i++) { + uri.append("/" + segments[i]); //$NON-NLS-1$ + } + uri.insert(0, JSF2ResourceUtil.JSF2_URI_PREFIX); + } + } + return uri.toString(); + } + +} Added: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/r= efactoring/JSf2MoveParticipant.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refa= ctoring/JSf2MoveParticipant.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refa= ctoring/JSf2MoveParticipant.java 2010-05-12 08:53:34 UTC (rev 22030) @@ -0,0 +1,133 @@ +package org.jboss.tools.jsf.jsf2.refactoring; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContex= t; +import org.eclipse.ltk.core.refactoring.participants.MoveParticipant; +import org.jboss.tools.jsf.JSFModelPlugin; +import org.jboss.tools.jsf.jsf2.model.JSF2ComponentModelManager; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; +import org.jboss.tools.jsf.messages.JSFUIMessages; + +public class JSf2MoveParticipant extends MoveParticipant { + + private IProject project; + private Map urisMap; + + @Override + public RefactoringStatus checkConditions(IProgressMonitor pm, + CheckConditionsContext context) throws OperationCanceledException { + return new RefactoringStatus(); + } + + @Override + public Change createChange(IProgressMonitor pm) throws CoreException, + OperationCanceledException { + if (project !=3D null) { + JSF2ComponentModelManager.getManager().renameURIs(project, urisMap); + } + return null; + } + + @Override + public String getName() { + return JSFUIMessages.Refactoring_JSF_2_resources; + } + + @Override + protected boolean initialize(Object element) { + if (element instanceof IFolder) { + IFolder folder =3D (IFolder) element; + if (checkResourceFolderPath(folder.getFullPath())) { + Object object =3D getArguments().getDestination(); + if (object instanceof IFolder) { + if (folder.getProject() !=3D ((IFolder) object).getProject()) { + return false; + } + if (checkDistFolderPath(((IFolder) object).getFullPath())) { + project =3D folder.getProject(); + invokePossibleURIs(folder, (IFolder) object); + return true; + } + } + } + } + return false; + } + + private boolean checkDistFolderPath(IPath fullPath) { + String[] segments =3D fullPath.segments(); + if (segments.length > 2) { + if (segments[2].equals("resources")) { //$NON-NLS-1$ + return true; + } + } + return false; + } + + private void invokePossibleURIs(IFolder srcFolder, IFolder distFolder) { + String newFirstURIPart =3D createJSF2URIFromPath(distFolder.getFullPath(= )); + String oldFirstURIPart =3D createJSF2URIFromPath(srcFolder.getFullPath()= ); + oldFirstURIPart =3D oldFirstURIPart.substring(0, oldFirstURIPart + .lastIndexOf('/')); + Set oldURIs =3D new HashSet(); + invokeOldPossibleURIs(srcFolder, oldURIs); + urisMap =3D new HashMap(); + for (String oldURI : oldURIs) { + urisMap.put(oldURI, newFirstURIPart + + oldURI.replaceFirst(oldFirstURIPart, "")); //$NON-NLS-1$ + } + } + + private void invokeOldPossibleURIs(IFolder srcFolder, Set uris) { + uris.add(createJSF2URIFromPath(srcFolder.getFullPath())); + try { + IResource[] children =3D srcFolder.members(); + if (children !=3D null) { + for (int i =3D 0; i < children.length; i++) { + if (children[i] instanceof IFolder) { + invokeOldPossibleURIs((IFolder) children[i], uris); + } + } + } + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } + } + + private boolean checkResourceFolderPath(IPath path) { + String[] segments =3D path.segments(); + if (segments.length > 3) { + if (segments[2].equals("resources")) { //$NON-NLS-1$ + return true; + } + } + return false; + } + + private String createJSF2URIFromPath(IPath path) { + StringBuilder uri =3D new StringBuilder(""); //$NON-NLS-1$ + String[] segments =3D path.segments(); + if (segments.length > 3) { + if (segments[2].equals("resources")) { //$NON-NLS-1$ + for (int i =3D 3; i < segments.length; i++) { + uri.append("/" + segments[i]); //$NON-NLS-1$ + } + } + } + uri.insert(0, JSF2ResourceUtil.JSF2_URI_PREFIX); + return uri.toString(); + } + +} Copied: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/= util/JSF2ComponentUtil.java (from rev 21981, trunk/jsf/plugins/org.jboss.to= ols.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ComponentUtil.= java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util= /JSF2ComponentUtil.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util= /JSF2ComponentUtil.java 2010-05-12 08:53:34 UTC (rev 22030) @@ -0,0 +1,129 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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.jsf.jsf2.util; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.eclipse.wst.xml.core.internal.document.ElementImpl; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * = + * @author yzhishko + * = + */ + +(a)SuppressWarnings("restriction") +public class JSF2ComponentUtil { + + public static Map> findCompositeComponents(Node nod= e) { + Map> elementsMap =3D new HashMap>( + 0); + findChildCompositeComponents(node, elementsMap); + return elementsMap; + } + + private static void findChildCompositeComponents(Node node, + Map> elementsMap) { + if (node instanceof IDOMDocument) { + node =3D ((IDOMDocument) node).getDocumentElement(); + findChildCompositeComponents(node, elementsMap); + } else if (node instanceof ElementImpl) { + ElementImpl elementImpl =3D (ElementImpl) node; + String namespaceURI =3D elementImpl.getNamespaceURI(); + if (namespaceURI !=3D null + && namespaceURI + .startsWith(JSF2ResourceUtil.JSF2_URI_PREFIX) + && !namespaceURI.equals(JSF2ResourceUtil.JSF2_URI_PREFIX)) { + List elements =3D elementsMap.get(namespaceURI); + if (elements =3D=3D null) { + elements =3D new ArrayList(0); + } + elements.add(elementImpl); + elementsMap.put(namespaceURI, elements); + } + NodeList children =3D node.getChildNodes(); + if (children !=3D null) { + for (int i =3D 0; i < children.getLength(); i++) { + findChildCompositeComponents(children.item(i), elementsMap); + } + } + } + } + + public static IDOMAttr[] findURIContainers(Node scanNode) { + List attrs =3D new ArrayList(0); + findChildURIContainers(scanNode, attrs); + return attrs.toArray(new IDOMAttr[0]); + } + + private static void findChildURIContainers(Node node, + List attrsList) { + if (node instanceof IDOMDocument) { + node =3D ((IDOMDocument) node).getDocumentElement(); + findChildURIContainers(node, attrsList); + } else if (node instanceof ElementImpl) { + ElementImpl elementImpl =3D (ElementImpl) node; + NamedNodeMap attrsMap =3D elementImpl.getAttributes(); + if (attrsMap !=3D null && attrsMap.getLength() !=3D 0) { + for (int i =3D 0; i < attrsMap.getLength(); i++) { + IDOMAttr attr =3D (IDOMAttr) attrsMap.item(i); + String attrValue =3D attr.getValue(); + if (attrValue !=3D null + && attrValue + .indexOf(JSF2ResourceUtil.JSF2_URI_PREFIX) > -1) { + String compPath =3D attrValue.replaceFirst( + JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ + if (!"".equals(compPath.trim())) { //$NON-NLS-1$ + if (isCorrectCompositeShemaAttrName(attr.getName())) { + attrsList.add(attr); + } + } + } + } + } + NodeList children =3D node.getChildNodes(); + if (children !=3D null) { + for (int i =3D 0; i < children.getLength(); i++) { + findChildURIContainers((IDOMNode) children.item(i), + attrsList); + } + } + } + } + + private static boolean isCorrectCompositeShemaAttrName(String attrName) { + if (attrName =3D=3D null) { + return false; + } + if ("xmlns".equals(attrName.trim()) || "uri".equals(attrName.trim())) { = //$NON-NLS-1$ //$NON-NLS-2$ + return true; + } + if (attrName.indexOf(':') < 0) { + return false; + } + attrName =3D attrName.substring(0, attrName.indexOf(':')).trim(); + if ("xmlns".equals(attrName)) { //$NON-NLS-1$ + return true; + } + return false; + } + +} Copied: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/= util/JSF2ResourceUtil.java (from rev 21981, trunk/jsf/plugins/org.jboss.too= ls.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/util/JSF2ResourceUtil.ja= va) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util= /JSF2ResourceUtil.java (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util= /JSF2ResourceUtil.java 2010-05-12 08:53:34 UTC (rev 22030) @@ -0,0 +1,253 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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.jsf.jsf2.util; + +import java.util.zip.ZipEntry; +import org.eclipse.core.resources.IContainer; +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.IPackageFragmentRoot; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.internal.core.JarEntryDirectory; +import org.eclipse.jdt.internal.core.JarEntryFile; +import org.eclipse.jdt.internal.core.JarEntryResource; +import org.eclipse.jdt.internal.core.JarPackageFragmentRoot; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; +import org.eclipse.wst.xml.core.internal.document.ElementImpl; +import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; +import org.jboss.tools.jsf.JSFModelPlugin; +import org.jboss.tools.jsf.jsf2.model.JSF2ComponentModelManager; +import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2TemplateManager; + +/** + * = + * @author yzhishko + * = + */ + +(a)SuppressWarnings("restriction") +public class JSF2ResourceUtil { + + public static final String JSF2_URI_PREFIX =3D "http://java.sun.com/jsf/c= omposite"; //$NON-NLS-1$ + + public static final String COMPONENT_RESOURCE_PATH_KEY =3D "component_res= ource_path_key"; //$NON-NLS-1$ + + public static final int JAR_FILE_RESOURCE_TYPE =3D 1; + + public static final int JAR_DIRECTORY_RESOURCE_TYPE =3D JAR_FILE_RESOURCE= _TYPE << 1; + + public static Object findCompositeComponentContainer(IProject project, + IDOMElement jsf2Element) { + ElementImpl elementImpl =3D (ElementImpl) jsf2Element; + String nameSpaceURI =3D elementImpl.getNamespaceURI(); + if (nameSpaceURI =3D=3D null || nameSpaceURI.indexOf(JSF2_URI_PREFIX) = =3D=3D -1) { + return null; + } + String nodeName =3D jsf2Element.getLocalName(); + String relativeLocation =3D "/resources" + nameSpaceURI.replaceFirst( //= $NON-NLS-1$ + JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ + IVirtualComponent component =3D ComponentCore.createComponent(project); + if (component !=3D null) { + IVirtualFolder webRootFolder =3D component.getRootFolder().getFolder( + new Path("/")); //$NON-NLS-1$ + IContainer folder =3D webRootFolder.getUnderlyingFolder(); + IPath path =3D folder.getFullPath().append(relativeLocation).append( + "/" + nodeName + ".xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ + IFile file =3D ResourcesPlugin.getWorkspace().getRoot().getFile(path); + if (file.isAccessible()) { + return file; + } + } + return searchInClassPath(project, "META-INF" + relativeLocation //$NON-N= LS-1$ + + "/" + nodeName + ".xhtml", JAR_FILE_RESOURCE_TYPE); //$NON-NLS-1$ //= $NON-NLS-2$ + } + + private static JarEntryResource searchInClassPath(IProject project, + String classPathResource, int jarResourceType) { + IJavaProject javaProject =3D JavaCore.create(project); + try { + for (IPackageFragmentRoot fragmentRoot : javaProject + .getAllPackageFragmentRoots()) { + if (fragmentRoot instanceof JarPackageFragmentRoot) { + JarPackageFragmentRoot jarPackageFragmentRoot =3D (JarPackageFragment= Root) fragmentRoot; + ZipEntry zipEntry =3D jarPackageFragmentRoot.getJar() + .getEntry(classPathResource); + if (zipEntry !=3D null) { + if (jarResourceType =3D=3D JAR_FILE_RESOURCE_TYPE) { + JarEntryFile fileInJar =3D new JarEntryFile( + classPathResource); + fileInJar.setParent(jarPackageFragmentRoot); + return fileInJar; + } + if (jarResourceType =3D=3D JAR_DIRECTORY_RESOURCE_TYPE) { + JarEntryDirectory directoryInJar =3D new JarEntryDirectory( + classPathResource); + directoryInJar.setParent(jarPackageFragmentRoot); + return directoryInJar; + } + } + } + } + } catch (JavaModelException e) { + JSFModelPlugin.getPluginLog().logError(e); + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } + return null; + } + + public static Object findResourcesFolderContainerByNameSpace( + IProject project, String nameSpaceURI) { + if (nameSpaceURI =3D=3D null || nameSpaceURI.indexOf(JSF2_URI_PREFIX) = =3D=3D -1) { + return null; + } + String relativeLocation =3D "/resources" + nameSpaceURI.replaceFirst( //= $NON-NLS-1$ + JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ + IVirtualComponent component =3D ComponentCore.createComponent(project); + if (component !=3D null) { + IVirtualFolder webRootFolder =3D component.getRootFolder().getFolder( + new Path("/")); //$NON-NLS-1$ + IContainer folder =3D webRootFolder.getUnderlyingFolder(); + IPath path =3D folder.getFullPath().append(relativeLocation); + IFolder resFolder =3D ResourcesPlugin.getWorkspace().getRoot() + .getFolder(path); + if (resFolder.isAccessible()) { + return resFolder; + } + } + return searchInClassPath(project, + "META-INF" + relativeLocation, JAR_DIRECTORY_RESOURCE_TYPE); //$NON-NL= S-1$ + } + + public static boolean isResourcesFolderExists(IProject project, + String nameSpaceURI) { + return findResourcesFolderContainerByNameSpace(project, nameSpaceURI) = =3D=3D null ? false + : true; + } + + public static IFolder createResourcesFolderByNameSpace(IProject project, + String nameSpaceURI) throws CoreException { + IFolder compositeCompResFolder =3D null; + String relativeLocation =3D nameSpaceURI.replaceFirst( + JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ + if (!project.exists()) { + return null; + } + if (!project.isAccessible()) { + try { + project.open(new NullProgressMonitor()); + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + return compositeCompResFolder; + } + } + IVirtualComponent component =3D ComponentCore.createComponent(project); + if (component !=3D null) { + IVirtualFolder webRootFolder =3D component.getRootFolder().getFolder( + new Path("/")); //$NON-NLS-1$ + IContainer folder =3D webRootFolder.getUnderlyingFolder(); + IFolder webFolder =3D ResourcesPlugin.getWorkspace().getRoot() + .getFolder(folder.getFullPath()); + IFolder resourcesFolder =3D webFolder.getFolder("resources"); //$NON-NL= S-1$ + NullProgressMonitor monitor =3D new NullProgressMonitor(); + if (!resourcesFolder.exists()) { + resourcesFolder.create(true, true, monitor); + } + String[] segments =3D new Path(relativeLocation).segments(); + compositeCompResFolder =3D resourcesFolder; + for (int i =3D 0; i < segments.length; i++) { + compositeCompResFolder =3D compositeCompResFolder + .getFolder(segments[i]); + if (!compositeCompResFolder.exists()) { + compositeCompResFolder.create(true, true, monitor); + } + } + + } + return compositeCompResFolder; + } + + public static IFile createCompositeComponentFile(IProject project, + IPath resourceRelativePath) throws CoreException { + IFile compositeCompResFile =3D null; + if (!project.exists()) { + return null; + } + if (!project.isAccessible()) { + try { + project.open(new NullProgressMonitor()); + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + return compositeCompResFile; + } + } + IVirtualComponent component =3D ComponentCore.createComponent(project); + if (component !=3D null) { + IVirtualFolder webRootFolder =3D component.getRootFolder().getFolder( + new Path("/")); //$NON-NLS-1$ + IContainer folder =3D webRootFolder.getUnderlyingFolder(); + IFolder webFolder =3D ResourcesPlugin.getWorkspace().getRoot() + .getFolder(folder.getFullPath()); + IFolder resourcesFolder =3D webFolder.getFolder("resources"); //$NON-NL= S-1$ + NullProgressMonitor monitor =3D new NullProgressMonitor(); + if (!resourcesFolder.exists()) { + resourcesFolder.create(true, true, monitor); + } + String[] segments =3D resourceRelativePath.segments(); + IFolder componentPathFolder =3D resourcesFolder; + for (int i =3D 0; i < segments.length - 1; i++) { + componentPathFolder =3D componentPathFolder + .getFolder(segments[i]); + if (!componentPathFolder.exists()) { + componentPathFolder.create(true, true, monitor); + } + } + compositeCompResFile =3D componentPathFolder + .getFile(segments[segments.length - 1]); + if (!compositeCompResFile.exists()) { + compositeCompResFile.create(JSF2TemplateManager.getManager() + .createStreamFromTemplate("composite.xhtml"), true, //$NON-NLS-1$ + monitor); + } else { + compositeCompResFile =3D JSF2ComponentModelManager.getManager() + .revalidateCompositeComponentFile(compositeCompResFile); + } + } + return compositeCompResFile; + } + + public static IFile createCompositeComponentFile(IProject project, + IPath resourceRelativePath, String[] attrNames) + throws CoreException { + IFile jsf2ResFile =3D createCompositeComponentFile(project, + resourceRelativePath); + if (jsf2ResFile =3D=3D null) { + return null; + } + if (attrNames =3D=3D null || attrNames.length =3D=3D 0) { + return jsf2ResFile; + } + return JSF2ComponentModelManager.getManager() + .updateJSF2CompositeComponentFile(jsf2ResFile, attrNames); + } + +} Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/mes= sages/JSFUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/= JSFUIMessages.java 2010-05-11 20:51:21 UTC (rev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/= JSFUIMessages.java 2010-05-12 08:53:34 UTC (rev 22030) @@ -128,6 +128,8 @@ public static String Create_JSF_2_Interface_Attr; public static String Missing_JSF_2_Resources_Folder; public static String Create_JSF_2_Resources_Folder; + public static String Rename_JSF_2_Composite_Components; + public static String Refactoring_JSF_2_resources; = static { // load message values from bundle file Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/mes= sages/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/= messages.properties 2010-05-11 20:51:21 UTC (rev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/= messages.properties 2010-05-12 08:53:34 UTC (rev 22030) @@ -104,4 +104,6 @@ Missing_JSF_2_Component_Attr=3DAttribute "{0}" is not defined for "{1}" co= mposite component Create_JSF_2_Interface_Attr=3DCreate attribute in an interface declaration= of a composite component Missing_JSF_2_Resources_Folder=3DResources folder "{0}" is missing in a pr= oject root directory -Create_JSF_2_Resources_Folder=3DCreate a folder container for JSF 2 resour= ces \ No newline at end of file +Create_JSF_2_Resources_Folder=3DCreate a folder container for JSF 2 resour= ces +Rename_JSF_2_Composite_Components=3DRename JSF 2 composite components +Refactoring_JSF_2_resources=3DRefactoring JSF 2 resources \ No newline at end of file Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/JSF2ComponentsValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2ComponentsValidator.java 2010-05-11 20:51:21 UTC (rev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2ComponentsValidator.java 2010-05-12 08:53:34 UTC (rev 22030) @@ -26,11 +26,11 @@ import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport; import org.eclipse.wst.xml.core.internal.validation.eclipse.Validator; import org.jboss.tools.jsf.JSFModelPlugin; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; import org.jboss.tools.jsf.web.validation.jsf2.components.JSF2AttrTempComp= onent; import org.jboss.tools.jsf.web.validation.jsf2.components.JSF2CompositeTem= pComponent; import org.jboss.tools.jsf.web.validation.jsf2.components.JSF2URITempCompo= nent; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jst.web.kb.IKbProject; import org.jboss.tools.jst.web.kb.KbProjectFactory; = Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/JSF2SourceValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2SourceValidator.java 2010-05-11 20:51:21 UTC (rev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2SourceValidator.java 2010-05-12 08:53:34 UTC (rev 22030) @@ -26,12 +26,12 @@ import org.eclipse.wst.validation.internal.provisional.core.IValidationCon= text; import org.eclipse.wst.validation.internal.provisional.core.IValidator; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.jboss.tools.jsf.jsf2.model.JSF2ComponentModelManager; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; import org.jboss.tools.jsf.web.validation.jsf2.components.JSF2AttrTempComp= onent; import org.jboss.tools.jsf.web.validation.jsf2.components.JSF2CompositeTem= pComponent; import org.jboss.tools.jsf.web.validation.jsf2.components.JSF2URITempCompo= nent; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentModelMana= ger; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; = /** * = Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/JSF2XMLValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2XMLValidator.java 2010-05-11 20:51:21 UTC (rev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/JSF2XMLValidator.java 2010-05-12 08:53:34 UTC (rev 22030) @@ -24,10 +24,10 @@ import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport; import org.jboss.tools.common.el.core.resolver.ELContext; import org.jboss.tools.jsf.JSFModelPlugin; +import org.jboss.tools.jsf.jsf2.model.JSF2ComponentModelManager; +import org.jboss.tools.jsf.jsf2.util.JSF2ComponentUtil; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentModelMana= ger; import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentRecognize= r; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentUtil; import org.jboss.tools.jst.web.kb.IPageContext; import org.jboss.tools.jst.web.kb.PageContextFactory; import org.jboss.tools.jst.web.kb.internal.XmlContextImpl; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/action/JSF2CompositeAttrsProposal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2CompositeAttrsProposal.java 2010-05-11 20:51:21 UTC (= rev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2CompositeAttrsProposal.java 2010-05-12 08:53:34 UTC (= rev 22030) @@ -19,10 +19,10 @@ import org.eclipse.core.runtime.Path; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; = /** * = Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/action/JSF2CompositeComponentProposal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2CompositeComponentProposal.java 2010-05-11 20:51:21 U= TC (rev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2CompositeComponentProposal.java 2010-05-12 08:53:34 U= TC (rev 22030) @@ -22,10 +22,10 @@ import org.eclipse.core.runtime.Path; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; = /** * = Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/action/JSF2QuickFixProcessor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2QuickFixProcessor.java 2010-05-11 20:51:21 UTC (rev 2= 2029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2QuickFixProcessor.java 2010-05-12 08:53:34 UTC (rev 2= 2030) @@ -21,8 +21,8 @@ import org.eclipse.jface.text.quickassist.IQuickAssistProcessor; import org.eclipse.jface.text.source.Annotation; import org.eclipse.wst.sse.ui.StructuredTextInvocationContext; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; = /** * = Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/action/JSF2ResourcesFolderProposal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2ResourcesFolderProposal.java 2010-05-11 20:51:21 UTC = (rev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/action/JSF2ResourcesFolderProposal.java 2010-05-12 08:53:34 UTC = (rev 22030) @@ -14,10 +14,10 @@ import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; = /** * = Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/components/JSF2AttrTempComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2AttrTempComponent.java 2010-05-11 20:51:21 UTC (r= ev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2AttrTempComponent.java 2010-05-12 08:53:34 UTC (r= ev 22030) @@ -14,8 +14,8 @@ import java.text.MessageFormat; import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; = /** * = Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/components/JSF2ComponentFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2ComponentFactory.java 2010-05-11 20:51:21 UTC (re= v 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2ComponentFactory.java 2010-05-12 08:53:34 UTC (re= v 22030) @@ -21,7 +21,7 @@ import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ComponentModelMana= ger; +import org.jboss.tools.jsf.jsf2.model.JSF2ComponentModelManager; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; = Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/components/JSF2CompositeTempComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2CompositeTempComponent.java 2010-05-11 20:51:21 U= TC (rev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2CompositeTempComponent.java 2010-05-12 08:53:34 U= TC (rev 22030) @@ -16,8 +16,8 @@ import java.util.List; import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; import org.w3c.dom.NamedNodeMap; = /** Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/components/JSF2URITempComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2URITempComponent.java 2010-05-11 20:51:21 UTC (re= v 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/components/JSF2URITempComponent.java 2010-05-12 08:53:34 UTC (re= v 22030) @@ -12,8 +12,9 @@ package org.jboss.tools.jsf.web.validation.jsf2.components; = import java.text.MessageFormat; + +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; -import org.jboss.tools.jsf.web.validation.jsf2.util.JSF2ResourceUtil; = /** * = Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/= validation/jsf2/util/JSF2ComponentModelManager.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ComponentModelManager.java 2010-05-11 20:51:21 UTC (rev= 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ComponentModelManager.java 2010-05-12 08:53:34 UTC (rev= 22030) @@ -1,293 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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.jsf.web.validation.jsf2.util; - -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashSet; -import java.util.Scanner; -import java.util.Set; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jdt.internal.core.JarEntryFile; -import org.eclipse.jface.text.IDocument; -import org.eclipse.wst.html.core.internal.encoding.HTMLModelLoader; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; -import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocum= ent; -import org.eclipse.wst.sse.core.internal.text.JobSafeStructuredDocument; -import org.eclipse.wst.xml.core.internal.document.ElementImpl; -import org.eclipse.wst.xml.core.internal.parser.XMLSourceParser; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel; -import org.eclipse.wst.xml.core.internal.provisional.format.DocumentNodeFo= rmatter; -import org.jboss.tools.jsf.JSFModelPlugin; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * = - * @author yzhishko - * = - */ - -(a)SuppressWarnings("restriction") -public class JSF2ComponentModelManager { - - private static JSF2ComponentModelManager instance =3D new JSF2ComponentMo= delManager(); - - private JSF2ComponentModelManager() { - - } - - public static JSF2ComponentModelManager getManager() { - return instance; - } - - public IFile updateJSF2CompositeComponentFile( - IFile componentFileContatiner, String[] attrNames) { - IDOMDocument document =3D null; - IModelManager manager =3D StructuredModelManager.getModelManager(); - if (manager =3D=3D null) { - return componentFileContatiner; - } - IStructuredModel model =3D null; - try { - model =3D manager.getModelForEdit(componentFileContatiner); - if (model instanceof IDOMModel) { - IDOMModel domModel =3D (IDOMModel) model; - model.reload(componentFileContatiner.getContents()); - document =3D domModel.getDocument(); - updateJSF2CompositeComponent(document, attrNames); - componentFileContatiner.setContents(new ByteArrayInputStream( - document.getStructuredDocument().getText().getBytes()), - true, false, new NullProgressMonitor()); - } - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - } catch (IOException e) { - JSFModelPlugin.getPluginLog().logError(e); - } finally { - if (model !=3D null) { - model.releaseFromEdit(); - } - } - return componentFileContatiner; - } - - public void updateJSF2CompositeComponent(IDOMDocument componentDoc, - String[] attrNames) { - IDOMElement[] interfaceElement =3D new IDOMElement[1]; - findInterfaceComponent(componentDoc, interfaceElement); - createCompositeCompInterface(interfaceElement[0], attrNames); - } - - private void findInterfaceComponent(Node node, - IDOMElement[] interfaceElement) { - if (node instanceof IDOMDocument) { - IDOMDocument document =3D (IDOMDocument) node; - findInterfaceComponent(document.getDocumentElement(), - interfaceElement); - } - if (node instanceof ElementImpl) { - ElementImpl impl =3D (ElementImpl) node; - String nameSpace =3D impl.getNamespaceURI(); - if (JSF2ResourceUtil.JSF2_URI_PREFIX.equals(nameSpace)) { - String nodeName =3D impl.getLocalName(); - if ("interface".equals(nodeName)) { //$NON-NLS-1$ - interfaceElement[0] =3D impl; - return; - } - } else { - NodeList nodeList =3D node.getChildNodes(); - if (nodeList !=3D null) { - for (int i =3D 0; i < nodeList.getLength(); i++) { - findInterfaceComponent(nodeList.item(i), - interfaceElement); - } - } - } - } - } - - private void createCompositeCompInterface(IDOMElement element, - String[] attrNames) { - Document document =3D (Document) element.getOwnerDocument(); - String prefix =3D element.getPrefix(); - Set existInerfaceAttrs =3D getInterfaceAttrs(element); - if (prefix !=3D null && !"".equals(prefix)) { //$NON-NLS-1$ - for (int i =3D 0; i < attrNames.length; i++) { - if (!existInerfaceAttrs.contains(attrNames[i])) { - Element attrEl =3D document.createElementNS( - JSF2ResourceUtil.JSF2_URI_PREFIX, prefix - + ":attribute"); //$NON-NLS-1$ - attrEl.setAttribute("name", attrNames[i]); //$NON-NLS-1$ - element.appendChild(attrEl); - } - } - } else { - for (int i =3D 0; i < attrNames.length; i++) { - if (!existInerfaceAttrs.contains(attrNames[i])) { - Element attrEl =3D document.createElementNS( - JSF2ResourceUtil.JSF2_URI_PREFIX, "attribute"); //$NON-NLS-1$ - attrEl.setAttribute("name", attrNames[i]); //$NON-NLS-1$ - element.appendChild(attrEl); - } - } - } - DocumentNodeFormatter formatter =3D new DocumentNodeFormatter(); - formatter.format(document); - } - - public IFile revalidateCompositeComponentFile(IFile file) { - IDOMDocument document =3D getReadableDOMDocument(file); - if (document =3D=3D null) { - return null; - } - IDOMElement interfaceElement =3D checkCompositeInterface(document); - if (interfaceElement =3D=3D null) { - return null; - } - return file; - } - - public IDOMElement checkCompositeInterface(IDOMDocument document) { - if (document =3D=3D null) { - return null; - } - Element element =3D document.getDocumentElement(); - if (element =3D=3D null) { - return null; - } - if (!"html".equals(element.getNodeName())) { //$NON-NLS-1$ - return null; - } - ElementImpl elementImpl =3D (ElementImpl) element; - if (!"http://www.w3.org/1999/xhtml".equals(elementImpl.getNamespaceURI()= )) { //$NON-NLS-1$ - return null; - } - IDOMElement[] interfaceElement =3D new IDOMElement[1]; - findInterfaceComponent(document, interfaceElement); - return interfaceElement[0]; - } - - public static IDOMDocument getReadableDOMDocument(IFile file) { - IDOMDocument document =3D null; - IModelManager manager =3D StructuredModelManager.getModelManager(); - if (manager =3D=3D null) { - return document; - } - IStructuredModel model =3D null; - try { - model =3D manager.getModelForRead(file); - if (model instanceof IDOMModel) { - IDOMModel domModel =3D (IDOMModel) model; - document =3D domModel.getDocument(); - } - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - } catch (IOException e) { - JSFModelPlugin.getPluginLog().logError(e); - } finally { - if (model !=3D null) { - model.releaseFromRead(); - } - } - return document; - } - - public static IDOMDocument getReadableDOMDocument(JarEntryFile file) { - IDOMDocument document =3D null; - IStructuredModel model =3D null; - InputStream inputStream; - try { - inputStream =3D file.getContents(); - if (inputStream !=3D null) { - StringBuffer buffer =3D new StringBuffer(""); //$NON-NLS-1$ - Scanner in =3D new Scanner(inputStream); - while (in.hasNextLine()) { - buffer.append(in.nextLine()); - } - model =3D new HTMLModelLoader().newModel(); - model.setStructuredDocument(new JobSafeStructuredDocument( - new XMLSourceParser())); - model.getStructuredDocument().set(buffer.toString()); - if (model instanceof IDOMModel) { - document =3D ((IDOMModel) model).getDocument(); - } - } - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - } finally { - model =3D null; - } - return document; - } - - public static IDOMDocument getReadableDOMDocument(IDocument textDocument)= { - IDOMDocument document =3D null; - if (!(textDocument instanceof IStructuredDocument)) { - return document; - } - IModelManager manager =3D StructuredModelManager.getModelManager(); - if (manager =3D=3D null) { - return document; - } - IStructuredModel model =3D null; - try { - model =3D manager.getModelForRead((IStructuredDocument) textDocument); - if (model instanceof IDOMModel) { - IDOMModel domModel =3D (IDOMModel) model; - document =3D domModel.getDocument(); - } - } finally { - if (model !=3D null) { - model.releaseFromRead(); - } - } - return document; - } - - public Set getInterfaceAttrs(IDOMElement interfaceElement) { - Set interfaceAttrs =3D new HashSet(0); - if (interfaceElement !=3D null) { - String prefix =3D interfaceElement.getPrefix(); - String nodeName =3D "attribute"; //$NON-NLS-1$ - if (prefix !=3D null && !"".equals(prefix)) { //$NON-NLS-1$ - nodeName =3D prefix + ":" + nodeName; //$NON-NLS-1$ - } - NodeList attrsElements =3D interfaceElement - .getElementsByTagName(nodeName); - if (attrsElements !=3D null) { - for (int i =3D 0; i < attrsElements.getLength(); i++) { - Node el =3D attrsElements.item(i); - if (el instanceof IDOMElement) { - IDOMElement element =3D (IDOMElement) el; - String attrvalue =3D element.getAttribute("name"); //$NON-NLS-1$ - if (attrvalue !=3D null && !"".equals(attrvalue)) { //$NON-NLS-1$ - interfaceAttrs.add(attrvalue); - } - } - } - } - } - return interfaceAttrs; - } - -} Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/jsf2/util/JSF2ComponentRecognizer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ComponentRecognizer.java 2010-05-11 20:51:21 UTC (rev 2= 2029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ComponentRecognizer.java 2010-05-12 08:53:34 UTC (rev 2= 2030) @@ -17,6 +17,7 @@ import org.eclipse.jdt.internal.core.JarEntryFile; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationC= omponent; import org.jboss.tools.jsf.web.validation.jsf2.components.JSF2ComponentFac= tory; = Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/= validation/jsf2/util/JSF2ComponentUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ComponentUtil.java 2010-05-11 20:51:21 UTC (rev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ComponentUtil.java 2010-05-12 08:53:34 UTC (rev 22030) @@ -1,129 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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.jsf.web.validation.jsf2.util; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.eclipse.wst.xml.core.internal.document.ElementImpl; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * = - * @author yzhishko - * = - */ - -(a)SuppressWarnings("restriction") -public class JSF2ComponentUtil { - - public static Map> findCompositeComponents(Node nod= e) { - Map> elementsMap =3D new HashMap>( - 0); - findChildCompositeComponents(node, elementsMap); - return elementsMap; - } - - private static void findChildCompositeComponents(Node node, - Map> elementsMap) { - if (node instanceof IDOMDocument) { - node =3D ((IDOMDocument) node).getDocumentElement(); - findChildCompositeComponents(node, elementsMap); - } else if (node instanceof ElementImpl) { - ElementImpl elementImpl =3D (ElementImpl) node; - String namespaceURI =3D elementImpl.getNamespaceURI(); - if (namespaceURI !=3D null - && namespaceURI - .startsWith(JSF2ResourceUtil.JSF2_URI_PREFIX) - && !namespaceURI.equals(JSF2ResourceUtil.JSF2_URI_PREFIX)) { - List elements =3D elementsMap.get(namespaceURI); - if (elements =3D=3D null) { - elements =3D new ArrayList(0); - } - elements.add(elementImpl); - elementsMap.put(namespaceURI, elements); - } - NodeList children =3D node.getChildNodes(); - if (children !=3D null) { - for (int i =3D 0; i < children.getLength(); i++) { - findChildCompositeComponents(children.item(i), elementsMap); - } - } - } - } - - public static IDOMAttr[] findURIContainers(Node scanNode) { - List attrs =3D new ArrayList(0); - findChildURIContainers(scanNode, attrs); - return attrs.toArray(new IDOMAttr[0]); - } - - private static void findChildURIContainers(Node node, - List attrsList) { - if (node instanceof IDOMDocument) { - node =3D ((IDOMDocument) node).getDocumentElement(); - findChildURIContainers(node, attrsList); - } else if (node instanceof ElementImpl) { - ElementImpl elementImpl =3D (ElementImpl) node; - NamedNodeMap attrsMap =3D elementImpl.getAttributes(); - if (attrsMap !=3D null && attrsMap.getLength() !=3D 0) { - for (int i =3D 0; i < attrsMap.getLength(); i++) { - IDOMAttr attr =3D (IDOMAttr) attrsMap.item(i); - String attrValue =3D attr.getValue(); - if (attrValue !=3D null - && attrValue - .indexOf(JSF2ResourceUtil.JSF2_URI_PREFIX) > -1) { - String compPath =3D attrValue.replaceFirst( - JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ - if (!"".equals(compPath.trim())) { //$NON-NLS-1$ - if (isCorrectCompositeShemaAttrName(attr.getName())) { - attrsList.add(attr); - } - } - } - } - } - NodeList children =3D node.getChildNodes(); - if (children !=3D null) { - for (int i =3D 0; i < children.getLength(); i++) { - findChildURIContainers((IDOMNode) children.item(i), - attrsList); - } - } - } - } - - private static boolean isCorrectCompositeShemaAttrName(String attrName) { - if (attrName =3D=3D null) { - return false; - } - if ("xmlns".equals(attrName.trim()) || "uri".equals(attrName.trim())) { = //$NON-NLS-1$ //$NON-NLS-2$ - return true; - } - if (attrName.indexOf(':') < 0) { - return false; - } - attrName =3D attrName.substring(0, attrName.indexOf(':')).trim(); - if ("xmlns".equals(attrName)) { //$NON-NLS-1$ - return true; - } - return false; - } - -} Deleted: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/= validation/jsf2/util/JSF2ResourceUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ResourceUtil.java 2010-05-11 20:51:21 UTC (rev 22029) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/jsf2/util/JSF2ResourceUtil.java 2010-05-12 08:53:34 UTC (rev 22030) @@ -1,251 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-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.jsf.web.validation.jsf2.util; - -import java.util.zip.ZipEntry; -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.IPackageFragmentRoot; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.internal.core.JarEntryDirectory; -import org.eclipse.jdt.internal.core.JarEntryFile; -import org.eclipse.jdt.internal.core.JarEntryResource; -import org.eclipse.jdt.internal.core.JarPackageFragmentRoot; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; -import org.eclipse.wst.xml.core.internal.document.ElementImpl; -import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement; -import org.jboss.tools.jsf.JSFModelPlugin; - -/** - * = - * @author yzhishko - * = - */ - -(a)SuppressWarnings("restriction") -public class JSF2ResourceUtil { - - public static final String JSF2_URI_PREFIX =3D "http://java.sun.com/jsf/c= omposite"; //$NON-NLS-1$ - - public static final String COMPONENT_RESOURCE_PATH_KEY =3D "component_res= ource_path_key"; //$NON-NLS-1$ - - public static final int JAR_FILE_RESOURCE_TYPE =3D 1; - - public static final int JAR_DIRECTORY_RESOURCE_TYPE =3D JAR_FILE_RESOURCE= _TYPE << 1; - - public static Object findCompositeComponentContainer(IProject project, - IDOMElement jsf2Element) { - ElementImpl elementImpl =3D (ElementImpl) jsf2Element; - String nameSpaceURI =3D elementImpl.getNamespaceURI(); - if (nameSpaceURI =3D=3D null || nameSpaceURI.indexOf(JSF2_URI_PREFIX) = =3D=3D -1) { - return null; - } - String nodeName =3D jsf2Element.getLocalName(); - String relativeLocation =3D "/resources" + nameSpaceURI.replaceFirst( //= $NON-NLS-1$ - JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ - IVirtualComponent component =3D ComponentCore.createComponent(project); - if (component !=3D null) { - IVirtualFolder webRootFolder =3D component.getRootFolder().getFolder( - new Path("/")); //$NON-NLS-1$ - IContainer folder =3D webRootFolder.getUnderlyingFolder(); - IPath path =3D folder.getFullPath().append(relativeLocation).append( - "/" + nodeName + ".xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ - IFile file =3D ResourcesPlugin.getWorkspace().getRoot().getFile(path); - if (file.isAccessible()) { - return file; - } - } - return searchInClassPath(project, "META-INF" + relativeLocation //$NON-N= LS-1$ - + "/" + nodeName + ".xhtml", JAR_FILE_RESOURCE_TYPE); //$NON-NLS-1$ //= $NON-NLS-2$ - } - - private static JarEntryResource searchInClassPath(IProject project, - String classPathResource, int jarResourceType) { - IJavaProject javaProject =3D JavaCore.create(project); - try { - for (IPackageFragmentRoot fragmentRoot : javaProject - .getAllPackageFragmentRoots()) { - if (fragmentRoot instanceof JarPackageFragmentRoot) { - JarPackageFragmentRoot jarPackageFragmentRoot =3D (JarPackageFragment= Root) fragmentRoot; - ZipEntry zipEntry =3D jarPackageFragmentRoot.getJar() - .getEntry(classPathResource); - if (zipEntry !=3D null) { - if (jarResourceType =3D=3D JAR_FILE_RESOURCE_TYPE) { - JarEntryFile fileInJar =3D new JarEntryFile( - classPathResource); - fileInJar.setParent(jarPackageFragmentRoot); - return fileInJar; - } - if (jarResourceType =3D=3D JAR_DIRECTORY_RESOURCE_TYPE) { - JarEntryDirectory directoryInJar =3D new JarEntryDirectory( - classPathResource); - directoryInJar.setParent(jarPackageFragmentRoot); - return directoryInJar; - } - } - } - } - } catch (JavaModelException e) { - JSFModelPlugin.getPluginLog().logError(e); - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - } - return null; - } - - public static Object findResourcesFolderContainerByNameSpace( - IProject project, String nameSpaceURI) { - if (nameSpaceURI =3D=3D null || nameSpaceURI.indexOf(JSF2_URI_PREFIX) = =3D=3D -1) { - return null; - } - String relativeLocation =3D "/resources" + nameSpaceURI.replaceFirst( //= $NON-NLS-1$ - JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ - IVirtualComponent component =3D ComponentCore.createComponent(project); - if (component !=3D null) { - IVirtualFolder webRootFolder =3D component.getRootFolder().getFolder( - new Path("/")); //$NON-NLS-1$ - IContainer folder =3D webRootFolder.getUnderlyingFolder(); - IPath path =3D folder.getFullPath().append(relativeLocation); - IFolder resFolder =3D ResourcesPlugin.getWorkspace().getRoot() - .getFolder(path); - if (resFolder.isAccessible()) { - return resFolder; - } - } - return searchInClassPath(project, - "META-INF" + relativeLocation, JAR_DIRECTORY_RESOURCE_TYPE); //$NON-NL= S-1$ - } - - public static boolean isResourcesFolderExists(IProject project, - String nameSpaceURI) { - return findResourcesFolderContainerByNameSpace(project, nameSpaceURI) = =3D=3D null ? false - : true; - } - - public static IFolder createResourcesFolderByNameSpace(IProject project, - String nameSpaceURI) throws CoreException { - IFolder compositeCompResFolder =3D null; - String relativeLocation =3D nameSpaceURI.replaceFirst( - JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ - if (!project.exists()) { - return null; - } - if (!project.isAccessible()) { - try { - project.open(new NullProgressMonitor()); - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - return compositeCompResFolder; - } - } - IVirtualComponent component =3D ComponentCore.createComponent(project); - if (component !=3D null) { - IVirtualFolder webRootFolder =3D component.getRootFolder().getFolder( - new Path("/")); //$NON-NLS-1$ - IContainer folder =3D webRootFolder.getUnderlyingFolder(); - IFolder webFolder =3D ResourcesPlugin.getWorkspace().getRoot() - .getFolder(folder.getFullPath()); - IFolder resourcesFolder =3D webFolder.getFolder("resources"); //$NON-NL= S-1$ - NullProgressMonitor monitor =3D new NullProgressMonitor(); - if (!resourcesFolder.exists()) { - resourcesFolder.create(true, true, monitor); - } - String[] segments =3D new Path(relativeLocation).segments(); - compositeCompResFolder =3D resourcesFolder; - for (int i =3D 0; i < segments.length; i++) { - compositeCompResFolder =3D compositeCompResFolder - .getFolder(segments[i]); - if (!compositeCompResFolder.exists()) { - compositeCompResFolder.create(true, true, monitor); - } - } - - } - return compositeCompResFolder; - } - - public static IFile createCompositeComponentFile(IProject project, - IPath resourceRelativePath) throws CoreException { - IFile compositeCompResFile =3D null; - if (!project.exists()) { - return null; - } - if (!project.isAccessible()) { - try { - project.open(new NullProgressMonitor()); - } catch (CoreException e) { - JSFModelPlugin.getPluginLog().logError(e); - return compositeCompResFile; - } - } - IVirtualComponent component =3D ComponentCore.createComponent(project); - if (component !=3D null) { - IVirtualFolder webRootFolder =3D component.getRootFolder().getFolder( - new Path("/")); //$NON-NLS-1$ - IContainer folder =3D webRootFolder.getUnderlyingFolder(); - IFolder webFolder =3D ResourcesPlugin.getWorkspace().getRoot() - .getFolder(folder.getFullPath()); - IFolder resourcesFolder =3D webFolder.getFolder("resources"); //$NON-NL= S-1$ - NullProgressMonitor monitor =3D new NullProgressMonitor(); - if (!resourcesFolder.exists()) { - resourcesFolder.create(true, true, monitor); - } - String[] segments =3D resourceRelativePath.segments(); - IFolder componentPathFolder =3D resourcesFolder; - for (int i =3D 0; i < segments.length - 1; i++) { - componentPathFolder =3D componentPathFolder - .getFolder(segments[i]); - if (!componentPathFolder.exists()) { - componentPathFolder.create(true, true, monitor); - } - } - compositeCompResFile =3D componentPathFolder - .getFile(segments[segments.length - 1]); - if (!compositeCompResFile.exists()) { - compositeCompResFile.create(JSF2TemplateManager.getManager() - .createStreamFromTemplate("composite.xhtml"), true, //$NON-NLS-1$ - monitor); - } else { - compositeCompResFile =3D JSF2ComponentModelManager.getManager() - .revalidateCompositeComponentFile(compositeCompResFile); - } - } - return compositeCompResFile; - } - - public static IFile createCompositeComponentFile(IProject project, - IPath resourceRelativePath, String[] attrNames) - throws CoreException { - IFile jsf2ResFile =3D createCompositeComponentFile(project, - resourceRelativePath); - if (jsf2ResFile =3D=3D null) { - return null; - } - if (attrNames =3D=3D null || attrNames.length =3D=3D 0) { - return jsf2ResFile; - } - return JSF2ComponentModelManager.getManager() - .updateJSF2CompositeComponentFile(jsf2ResFile, attrNames); - } - -} --===============7986363954367956989==-- From jbosstools-commits at lists.jboss.org Wed May 12 05:31:56 2010 Content-Type: multipart/mixed; boundary="===============7871973489420378234==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22031 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFacesTest/WebContent/pages/components. Date: Wed, 12 May 2010 05:31:55 -0400 Message-ID: <201005120931.o4C9VtA2027710@svn01.web.mwc.hst.phx2.redhat.com> --===============7871973489420378234== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2010-05-12 05:31:55 -0400 (Wed, 12 May 2010) New Revision: 22031 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFac= esTest/WebContent/pages/components/dataDefinitionList.xhtml.xml Log: https://jira.jboss.org/jira/browse/JBIDE-3373 , JUnits was updated. Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/= richFacesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFa= cesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml 2010-05-12= 08:53:34 UTC (rev 22030) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/resources/richFa= cesTest/WebContent/pages/components/dataDefinitionList.xhtml.xml 2010-05-12= 09:31:55 UTC (rev 22031) @@ -103,7 +103,7 @@
+ STYLE=3D"/background-image: url\(.*resources/common/background.gif\);/= "> Data Defenition list --===============7871973489420378234==-- From jbosstools-commits at lists.jboss.org Wed May 12 09:02:44 2010 Content-Type: multipart/mixed; boundary="===============5634484975484210526==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22032 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl. Date: Wed, 12 May 2010 09:02:44 -0400 Message-ID: <201005121302.o4CD2iaA006593@svn01.web.mwc.hst.phx2.redhat.com> --===============5634484975484210526== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-12 09:02:43 -0400 (Wed, 12 May 2010) New Revision: 22032 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/CDIProject.java Log: https://jira.jboss.org/jira/browse/JBIDE-6252 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/CDIProject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/CDIProject.java 2010-05-12 09:31:55 UTC (rev 22031) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/CDIProject.java 2010-05-12 13:02:43 UTC (rev 22032) @@ -41,6 +41,7 @@ import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IObserverMethod; import org.jboss.tools.cdi.core.IParametedType; +import org.jboss.tools.cdi.core.IParameter; import org.jboss.tools.cdi.core.IProducer; import org.jboss.tools.cdi.core.IProducerMethod; import org.jboss.tools.cdi.core.IQualifierDeclaration; @@ -561,8 +562,44 @@ } = public Set resolveDisposers(IProducerMethod producer) { - // TODO = - return new HashSet(); + Set result =3D new HashSet(); + IClassBean cb =3D producer.getClassBean(); + if(cb =3D=3D null) return result; + + Set types =3D producer.getLegalTypes(); + Set qs =3D producer.getQualifierDeclarations(true= ); + + Set ds =3D cb.getDisposers(); + for (IBeanMethod m: ds) { + List ps =3D m.getParameters(); + IParameter match =3D null; + for (IParameter p: ps) { + if(!p.isAnnotationPresent(CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME))= continue; + IParametedType type =3D p.getType(); + if(!containsType(types, type)) continue; + Set qts =3D new HashSet(); + Set ts =3D ((Parameter)p).getAnnotationTypes(); + for (String t: ts) { + QualifierElement q =3D getQualifier(t); + if(q !=3D null && q.getSourceType() !=3D null) { + qts.add(q.getSourceType()); + } + } + IType[] qtsa =3D qts.toArray(new IType[0]); + try { + if(areMatchingQualifiers(qs, qtsa)) { + match =3D p; + break; + } + } catch (CoreException e) { + CDICorePlugin.getDefault().logError(e); + } + } + if(match !=3D null) { + result.add(m); + } + } + return result; } = public CDIProject getCDIProject() { --===============5634484975484210526==-- From jbosstools-commits at lists.jboss.org Wed May 12 09:07:53 2010 Content-Type: multipart/mixed; boundary="===============1595981079374010508==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22033 - in workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces: src/org/jboss/tools/jsf/vpe/icefaces/utill and 2 other directories. Date: Wed, 12 May 2010 09:07:53 -0400 Message-ID: <201005121307.o4CD7rJn011405@svn01.web.mwc.hst.phx2.redhat.com> --===============1595981079374010508== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-12 09:07:52 -0400 (Wed, 12 May 2010) New Revision: 22033 Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/utill/VpeRendererUtil.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/template/mock/impl/VpeFacesContext.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templ= ates-icefaces.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4710 Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-12 13:0= 2:43 UTC (rev 22032) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-12 13:0= 7:52 UTC (rev 22033) @@ -14,6 +14,7 @@ = import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; @@ -36,6 +37,7 @@ public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { try { + VpeFacesContext.getInstance().setResponseWriter(null); Renderer render =3D new com.icesoft.faces.renderkit.dom_html_basic.Text= Renderer(); VpeUIComponent uiComponent =3D new VpeUIComponent( (Element) sourceNode); Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/t= ools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java = (rev 0) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010= -05-12 13:07:52 UTC (rev 22033) @@ -0,0 +1,60 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jsf.vpe.icefaces.template; + +import javax.faces.render.Renderer; + +import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; +import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.template.VpeTemplateManager; +import org.jboss.tools.vpe.editor.util.VisualDomUtil; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * @author mareshkau + * + */ +public class IceFacesSelectBooleanCheckboxTemplate extends VpeAbstractTemp= late { + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + try { + VpeFacesContext.getInstance().setResponseWriter(null); + Renderer render =3D new com.icesoft.faces.renderkit.dom_html_basic.Chec= kboxRenderer(); + VpeUIComponent uiComponent =3D new VpeUIComponent( + (Element) sourceNode); + Node result =3D VpeRendererUtil.processRenderer(render, uiComponent); + nsIDOMNode resultVisualNode =3D VpeRendererUtil.createVisualNode( + result, visualDocument); + if (resultVisualNode.getNodeType() =3D=3D Node.TEXT_NODE) { + nsIDOMElement domElement =3D VisualDomUtil + .createBorderlessContainer(visualDocument); + domElement.appendChild(resultVisualNode); + resultVisualNode =3D domElement; + } + return new VpeCreationData(resultVisualNode); + } catch (Throwable th) { + IceFacesActivator.getDefault().logError(th); + } + return VpeTemplateManager.getInstance().getDefTemplate().create( + pageContext, sourceNode, visualDocument); + } + +} Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-12 13:02:43 UTC (rev = 22032) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-12 13:07:52 UTC (rev = 22033) @@ -12,10 +12,8 @@ = import javax.faces.component.UIComponent; import javax.faces.render.Renderer; - - +import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; -import org.jboss.tools.vpe.VpePlugin; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -23,7 +21,6 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; - import com.icesoft.faces.context.DOMContext; = /** @@ -36,11 +33,13 @@ = = public static Node processRenderer(final Renderer render, final UICompone= nt uiComponent){ + = + = try { render.encodeBegin(VpeFacesContext.getInstance(), uiComponent); render.encodeEnd(VpeFacesContext.getInstance(), uiComponent); } catch (Throwable e) { - VpePlugin.getPluginLog().logError(e); + IceFacesActivator.getDefault().logError(e); } DOMContext domContext =3D DOMContext.getDOMContext(VpeFacesContext.getIn= stance(), uiComponent); return domContext.getRootNode(); Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/template/mock/impl/VpeFacesContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeFacesContext.java 2010-05-12 13:02:43 UTC (= rev 22032) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeFacesContext.java 2010-05-12 13:07:52 UTC (= rev 22033) @@ -15,56 +15,75 @@ import javax.faces.context.ExternalContext; import javax.faces.context.ResponseWriter; = +import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.template.mock.abstr.VpeAbstractFacesContext; = - /** - * Mock object for FacesContext. - * It's need for using real renders in vpe templates + * Mock object for FacesContext. It's need for using real renders in vpe + * templates * = * @author mareshkau - * + * = */ public class VpeFacesContext extends VpeAbstractFacesContext { = private static VpeFacesContext instance; - = - private static final VpeDOMResponseWriter vpeDOMResponseWriter =3D new Vp= eDOMResponseWriter(null, null, null, null, null, null); - = - private VpeFacesContext() throws Exception{ - //singleton - super(VpeRequest.getInstance(),null,null,null, VpeConfiguration.getInsta= nce(),null,null,null,null); + + private VpeDOMResponseWriter vpeDOMResponseWriter;// =3D new + // VpeDOMResponseWriter(null, + // null, null, null, + // null, null); + + private VpeFacesContext() throws Exception { + // singleton + super(VpeRequest.getInstance(), null, null, null, VpeConfiguration + .getInstance(), null, null, null, null); } - = - public static VpeFacesContext getInstance(){ - if(instance=3D=3Dnull) { + + public static VpeFacesContext getInstance() { + if (instance =3D=3D null) { try { - FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY, VpeApplica= tionFactory.class.getName()); + FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY, + VpeApplicationFactory.class.getName()); instance =3D new VpeFacesContext(); } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); + IceFacesActivator.getDefault().logError(e); } } return instance; } - = - /* (non-Javadoc) + + /* + * (non-Javadoc) + * = * @see javax.faces.context.FacesContext#getExternalContext() */ @Override public ExternalContext getExternalContext() { return VpeExternalContext.getInstance(); } - /* (non-Javadoc) + + /* + * (non-Javadoc) + * = * @see javax.faces.context.FacesContext#getResponseWriter() */ @Override - public ResponseWriter getResponseWriter() { = + public ResponseWriter getResponseWriter() { + if (this.vpeDOMResponseWriter =3D=3D null) { + this.vpeDOMResponseWriter =3D new VpeDOMResponseWriter(null, null, + null, null, null, null); + } return this.vpeDOMResponseWriter; } = - /* (non-Javadoc) + public void setResponseWriter(VpeDOMResponseWriter responseWriter) { + this.vpeDOMResponseWriter =3D responseWriter; + } + + /* + * (non-Javadoc) + * = * @see javax.faces.context.FacesContext#getViewRoot() */ @Override Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vp= e-templates-icefaces.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-temp= lates-icefaces.xml 2010-05-12 13:02:43 UTC (rev 22032) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-temp= lates-icefaces.xml 2010-05-12 13:07:52 UTC (rev 22033) @@ -24,4 +24,18 @@ = - \ No newline at end of file + + + + + + + + + + + + + = + --===============1595981079374010508==-- From jbosstools-commits at lists.jboss.org Wed May 12 09:36:39 2010 Content-Type: multipart/mixed; boundary="===============1578752004074872819==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22034 - in trunk/esb/tests/org.jboss.tools.esb.core.test: src/org/jboss/tools/esb/core/test and 1 other directory. Date: Wed, 12 May 2010 09:36:39 -0400 Message-ID: <201005121336.o4CDad6B015031@svn01.web.mwc.hst.phx2.redhat.com> --===============1578752004074872819== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-12 09:36:39 -0400 (Wed, 12 May 2010) New Revision: 22034 Added: trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jbos= s-esb-uninique.xml Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/co= re/test/ESBModelTest.java Log: https://jira.jboss.org/jira/browse/JBDS-1197 Added: trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/= jboss-esb-uninique.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jbo= ss-esb-uninique.xml (rev 0) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jbo= ss-esb-uninique.xml 2010-05-12 13:36:39 UTC (rev 22034) @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + Property changes on: trunk/esb/tests/org.jboss.tools.esb.core.test/projects= /Test/esb-1.2/jboss-esb-uninique.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools= /esb/core/test/ESBModelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/c= ore/test/ESBModelTest.java 2010-05-12 13:07:52 UTC (rev 22033) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/c= ore/test/ESBModelTest.java 2010-05-12 13:36:39 UTC (rev 22034) @@ -15,7 +15,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.jboss.tools.test.util.TestProjectProvider; +import org.jboss.tools.common.test.util.TestProjectProvider; = import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; @@ -303,6 +303,18 @@ assertTrue(errorList.toString(), errorList.length() =3D=3D 0); } = + public void testNonUniqueProviders() { + XModelObject object =3D getFileObject("esb-1.2", "jboss-esb-uninique.xml= ", ESBConstants.ENT_ESB_FILE_120); + XModelObject[] os =3D object.getChildByPath("Providers").getChildren(); + assertEquals(2, os.length); + = + for (int i =3D 0; i < os.length; i++) { + String name =3D os[i].getAttributeValue("name"); + assertEquals("http", name); + } + + } + XModelObject getFileObject(String parentPath, String xmlname) { return getFileObject(parentPath, xmlname, ESBConstants.ENT_ESB_FILE_101); } --===============1578752004074872819==-- From jbosstools-commits at lists.jboss.org Wed May 12 09:47:07 2010 Content-Type: multipart/mixed; boundary="===============2021613398670469922==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22035 - in trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common: model/engines/impl and 3 other directories. Date: Wed, 12 May 2010 09:47:07 -0400 Message-ID: <201005121347.o4CDl71w016156@svn01.web.mwc.hst.phx2.redhat.com> --===============2021613398670469922== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-12 09:47:06 -0400 (Wed, 12 May 2010) New Revision: 22035 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/meta/constraint/impl/XAttributeConstraintInt.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/engines/impl/EnginesLoader.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/impl/RegularObjectImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/impl/XModelObjectImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/markers/ConstraintChecker.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/markers/ResourceMarkers.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/util/XModelObjectLoaderUtil.java Log: https://jira.jboss.org/jira/browse/JBDS-1197 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/meta/constraint/impl/XAttributeConstraintInt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/meta/constraint/impl/XAttributeConstraintInt.java 2010-05-12 13:36:39= UTC (rev 22034) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/meta/constraint/impl/XAttributeConstraintInt.java 2010-05-12 13:47:06= UTC (rev 22035) @@ -14,7 +14,7 @@ import org.w3c.dom.*; = public class XAttributeConstraintInt extends XAttributeConstraintPropertie= s { - protected boolean mandatory =3D true; + protected boolean mandatory =3D false; protected int min =3D Integer.MIN_VALUE; protected int max =3D Integer.MAX_VALUE; public XAttributeConstraintInt() { @@ -23,7 +23,7 @@ = public void load(Element element) { super.load(element); - mandatory =3D getBoolean("mandatory", true); //$NON-NLS-1$ + mandatory =3D getBoolean("mandatory", false); //$NON-NLS-1$ min =3D getInt("minimum", Integer.MIN_VALUE); //$NON-NLS-1$ max =3D getInt("maximum", Integer.MAX_VALUE); //$NON-NLS-1$ } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/engines/impl/EnginesLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/engines/impl/EnginesLoader.java 2010-05-12 13:36:39 UTC (rev 22= 034) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/engines/impl/EnginesLoader.java 2010-05-12 13:47:06 UTC (rev 22= 035) @@ -86,11 +86,18 @@ c =3D cs[i].copy(); object.addChild(c); } else { - boolean has_id =3D c.getModelEntity().getAttribute(XModelObj= ectLoaderUtil.ATTR_ID_NAME) !=3D null; + boolean has_id =3D c.getModelEntity().getAttribute(XModelObj= ectLoaderUtil.ATTR_ID_NAME) !=3D null + || ((XModelObjectImpl)c).hasIdAttr(); if(has_id) { c.removeFromParent(); EnginesLoader.merge(c, cs[i], false); - object.addChild(c); + if(!object.addChild(c)) { + c.set(XModelObjectImpl.DUPLICATE, "1234"); + object.addChild(c); + } + if(c.get(XModelObjectImpl.DUPLICATE) !=3D null) { + c.set(XModelObjectImpl.DUPLICATE, ""); + } } else { EnginesLoader.merge(c, cs[i], fire); } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/impl/RegularObjectImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/impl/RegularObjectImpl.java 2010-05-12 13:36:39 UTC (rev 22034) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/impl/RegularObjectImpl.java 2010-05-12 13:47:06 UTC (rev 22035) @@ -117,6 +117,18 @@ k++; } return; + } else if(hasIdAttr()) { + int k =3D 1; + while(c !=3D null) { + super.set(XModelObjectImpl.DUPLICATE, "" + k); //$NON-NLS-1$ + npp =3D getPathPart(); + if(k =3D=3D 1 && npp.indexOf(XModelObjectImpl.DUPLICATE) < 0) { + elementExists(c, name, value); + return; + } + c =3D p.children.change(this, opp, npp); + k++; + } } else { if(ov =3D=3D null) properties.remove(name); else super.set(name,= ov); elementExists(c, name, value); Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/impl/XModelObjectImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/impl/XModelObjectImpl.java 2010-05-12 13:36:39 UTC (rev 22034) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/impl/XModelObjectImpl.java 2010-05-12 13:47:06 UTC (rev 22035) @@ -40,6 +40,7 @@ public class XModelObjectImpl implements XModelObject, Serializable, Clone= able { private static final long serialVersionUID =3D 3860648580262144825L; // protected static final String ENTITY =3D XModelConstants.XMODEL_ENTI= TY_ATTR; + public static final String DUPLICATE =3D "__duplicate"; private XModel model =3D null; private XModelEntity entity =3D null; private XModelObjectImpl parent =3D null; @@ -136,6 +137,21 @@ properties.put(name.intern(), value); } = + private Boolean hasIdAttr =3D null; + = + public boolean hasIdAttr() { + if(hasIdAttr !=3D null) return hasIdAttr.booleanValue(); + hasIdAttr =3D Boolean.FALSE; + for (int i =3D 0; i < getModelEntity().getAttributes().length; i++) { + if("true".equals(getModelEntity().getAttributes()[i].getProperty("id= "))) { + hasIdAttr =3D Boolean.TRUE; + break; + } + } + = + return hasIdAttr.booleanValue(); + } + protected String get_0(String name) { XAttribute a =3D getModelEntity().getAttribute(name); return (a =3D=3D null || a.getAdapter() =3D=3D null) ? null : a.ge= tAdapter().getProperty(this); @@ -300,8 +316,17 @@ = public String getPathPart() { String p =3D name(); - return (p =3D=3D null || p.indexOf('/') < 0) ? p : p.replace('/', = '#'); + p =3D ((p =3D=3D null || p.indexOf('/') < 0) ? p : p.replace('/', = '#')); + return applyDuplicate(p); } + = + protected final String applyDuplicate(String pathpart) { + String duplicate =3D get(DUPLICATE); + return (duplicate =3D=3D null || duplicate.length() =3D=3D 0) = + ? pathpart = + : pathpart + DUPLICATE + duplicate; + = + } = public XModelObject getChildByPath(String path) { int i =3D path.indexOf(XModelObjectConstants.SEPARATOR); @@ -360,6 +385,10 @@ String entity =3D (transform) ? getEntityForCopy() : getModelEntit= y().getName(); XModelObject c =3D getModel().createModelObject(entity, p); if(c !=3D null) c.setModified(true); + String d =3D get(DUPLICATE); + if(d !=3D null && d.length() > 0) { + c.set(DUPLICATE, d); + } return c; } = Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/markers/ConstraintChecker.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/markers/ConstraintChecker.java 2010-05-12 13:36:39 UTC (rev 220= 34) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/markers/ConstraintChecker.java 2010-05-12 13:47:06 UTC (rev 220= 35) @@ -39,12 +39,19 @@ = private void check(XModelObject o) { XAttribute[] as =3D o.getModelEntity().getAttributes(); + String idAttr =3D null; for (int i =3D 0; i < as.length; i++) { String error =3D as[i].getConstraint().getError(o.getAttributeValue(as[= i].getName())); if(error !=3D null) addProblem(o, as[i].getName(), "Value " + error); + if("true".equals(as[i].getProperty("id"))) idAttr =3D as[i].getName(); } XModelObject[] cs =3D ((XModelObjectImpl)o).getLoadedChildren(); for (int i =3D 0; i < cs.length; i++) check(cs[i]); + + String duplicate =3D o.get(XModelObjectImpl.DUPLICATE); + if(duplicate !=3D null && duplicate.length() > 0 && idAttr !=3D null) { + addProblem(o, idAttr, "Value " + o.getAttributeValue(idAttr) + " is not= unique."); + } } = protected void addProblem(XModelObject o, String attr, String msg) { Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/markers/ResourceMarkers.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/markers/ResourceMarkers.java 2010-05-12 13:36:39 UTC (rev 22034) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/markers/ResourceMarkers.java 2010-05-12 13:47:06 UTC (rev 22035) @@ -30,7 +30,7 @@ = public class ResourceMarkers { public static String TEXT_PROBLEM =3D "org.jboss.tools.common.model.textp= roblemmarker"; //$NON-NLS-1$ - public static String CONSTRAINT_PROBLEM =3D "org.jboss.tools.common.model= .web.ui.constraintsmarker"; //$NON-NLS-1$ + public static String CONSTRAINT_PROBLEM =3D "org.jboss.tools.jst.web.ui.c= onstraintsmarker"; //$NON-NLS-1$ public static String JST_WEB_PROBLEM =3D "org.jboss.tools.jst.web.ui.stru= tsmarker"; //$NON-NLS-1$ private XModelObject object; = Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/util/XModelObjectLoaderUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/util/XModelObjectLoaderUtil.java 2010-05-12 13:36:39 UTC (rev 2= 2034) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/util/XModelObjectLoaderUtil.java 2010-05-12 13:47:06 UTC (rev 2= 2035) @@ -223,9 +223,13 @@ XModelEntity entity =3D o.getModelEntity(); XAttribute[] as =3D entity.getAttributes(); for (int i =3D 0; i < as.length; i++) { + String n =3D as[i].getName(); + if("attributes".equals(n) && "true".equals(as[i].getProperty("= any"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + loadAnyAtributes(element, o); + continue; + } String xmlname =3D as[i].getXMLName(); if (xmlname =3D=3D null || xmlname.length() =3D=3D 0) continue; - String n =3D as[i].getName(); String value =3D getAttribute(element, xmlname, as[i]); if (value !=3D null) o.setAttributeValue(n, value); String commentName =3D getAttributeCommentName(xmlname); @@ -332,6 +336,17 @@ if(q !=3D null) EnginesLoader.merge(q, co, false); } catch (XModelException exc) { ModelPlugin.getPluginLog().logError("XModelObjectLoaderUtil:= loadChildren:" + exc.getMessage(), exc); //$NON-NLS-1$ + } else { + int k =3D 1; + String pp =3D co.getPathPart(); + while(o.getChildByPath(pp) !=3D null) { + co.set(XModelObjectImpl.DUPLICATE, "" + k); //$NON-NLS-1$ + String ppn =3D co.getPathPart(); + if(ppn.equals(pp)) break; + pp =3D ppn; + ++k; + } + o.addChild(co); } continue; } = @@ -443,9 +458,13 @@ } for (int i =3D 0; i < as.length; i++) { if (as[i].isFake()) continue; + String n =3D as[i].getName(); + if("attributes".equals(n) && "true".equals(as[i].getProperty("= any"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + saveAnyAtributes(element, o); + continue; + } String xmlname =3D as[i].getXMLName(); if (xmlname =3D=3D null || xmlname.length() =3D=3D 0) continue; - String n =3D as[i].getName(); String v =3D o.getAttributeValue(n); if (isSaveable(entity, n, v, as[i].getDefaultValue())) { saveAttribute(element, xmlname, v); @@ -843,24 +862,35 @@ = protected void loadAnyElement(Element element, XModelObject o) { o.setAttributeValue("tag", element.getTagName()); //$NON-NLS-1$ + loadAnyAtributes(element, o); + String text =3D getAttribute(element, "#text").trim(); //$NON-NLS-1$ + if(text.length() > 0) { + while(text.startsWith("\n") || text.startsWith("\r")) text =3D text.sub= string(1); //$NON-NLS-1$ //$NON-NLS-2$ + while(text.endsWith("\n") || text.endsWith("\r")) text =3D text.substri= ng(0, text.length() - 1); //$NON-NLS-1$ //$NON-NLS-2$ + o.setAttributeValue("text", text); //$NON-NLS-1$ + } + loadChildren(element, o); + } + + public static void loadAnyAtributes(Element element, XModelObject o) { + HashSet attrs =3D new HashSet(); + XAttribute[] oas =3D o.getModelEntity().getAttributes(); + for (XAttribute a: oas) { + String xml =3D a.getXMLName(); + if(xml !=3D null && xml.length() > 0) attrs.add(xml); + } StringBuffer sb =3D new StringBuffer(); NamedNodeMap as =3D element.getAttributes(); for (int i =3D 0; i < as.getLength(); i++) { Node n =3D as.item(i); String nm =3D n.getNodeName(); + if(attrs.contains(nm)) continue; String v =3D n.getNodeValue(); if(v =3D=3D null) continue; if(sb.length() > 0) sb.append(";"); //$NON-NLS-1$ sb.append(nm).append("=3D").append(v); //$NON-NLS-1$ } o.setAttributeValue("attributes", sb.toString()); //$NON-NLS-1$ - String text =3D getAttribute(element, "#text").trim(); //$NON-NLS-1$ - if(text.length() > 0) { - while(text.startsWith("\n") || text.startsWith("\r")) text =3D text.sub= string(1); //$NON-NLS-1$ //$NON-NLS-2$ - while(text.endsWith("\n") || text.endsWith("\r")) text =3D text.substri= ng(0, text.length() - 1); //$NON-NLS-1$ //$NON-NLS-2$ - o.setAttributeValue("text", text); //$NON-NLS-1$ - } - loadChildren(element, o); } = protected void saveAnyElement(Element parent, XModelObject o) { @@ -870,6 +900,18 @@ xmlname =3D namespace + ":" + xmlname; //$NON-NLS-1$ } Element element =3D XMLUtil.createElement(parent, xmlname); + saveAnyAtributes(element, o); + String text =3D o.getAttributeValue("text"); //$NON-NLS-1$ + if(text !=3D null && text.length() > 0) { + saveAttribute(element, "#text", text); //$NON-NLS-1$ + } + XModelObject[] cs =3D o.getChildren(); + for (int i =3D 0; i < cs.length; i++) { + saveAnyElement(element, cs[i]); + } + } + + public static void saveAnyAtributes(Element element, XModelObject o) { String attrs =3D o.getAttributeValue("attributes"); //$NON-NLS-1$ StringTokenizer st =3D new StringTokenizer(attrs, ";"); //$NON-NLS-1$ while(st.hasMoreTokens()) { @@ -880,14 +922,6 @@ String v =3D t.substring(i + 1); element.setAttribute(n, v); } - String text =3D o.getAttributeValue("text"); //$NON-NLS-1$ - if(text !=3D null && text.length() > 0) { - saveAttribute(element, "#text", text); //$NON-NLS-1$ - } - XModelObject[] cs =3D o.getChildren(); - for (int i =3D 0; i < cs.length; i++) { - saveAnyElement(element, cs[i]); - } } = protected void eitherOr(Element element, String attr1, String attr2) { @@ -941,6 +975,9 @@ } } mergeFinalComment(destination, source, fire); + = + String d =3D destination.get(XModelObjectImpl.DUPLICATE); + if(d !=3D null && d.length() > 0) destination.set(XModelObjectImpl.DUPLI= CATE, ""); } = public static void mergeAttributeComment(XModelObject destination, XModel= Object source, XAttribute attr, boolean fire) { --===============2021613398670469922==-- From jbosstools-commits at lists.jboss.org Wed May 12 10:25:18 2010 Content-Type: multipart/mixed; boundary="===============5504370615505375660==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22036 - in branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common: model/engines/impl and 3 other directories. Date: Wed, 12 May 2010 10:25:18 -0400 Message-ID: <201005121425.o4CEPIpC026651@svn01.web.mwc.hst.phx2.redhat.com> --===============5504370615505375660== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-12 10:25:17 -0400 (Wed, 12 May 2010) New Revision: 22036 Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/sr= c/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintInt.java branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/sr= c/org/jboss/tools/common/model/engines/impl/EnginesLoader.java branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/sr= c/org/jboss/tools/common/model/impl/RegularObjectImpl.java branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/sr= c/org/jboss/tools/common/model/impl/XModelObjectImpl.java branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/sr= c/org/jboss/tools/common/model/markers/ConstraintChecker.java branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/sr= c/org/jboss/tools/common/model/markers/ResourceMarkers.java branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/sr= c/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java Log: https://jira.jboss.org/jira/browse/JBDS-1197 Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.m= odel/src/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintIn= t.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintInt.java= 2010-05-12 13:47:06 UTC (rev 22035) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/meta/constraint/impl/XAttributeConstraintInt.java= 2010-05-12 14:25:17 UTC (rev 22036) @@ -14,7 +14,7 @@ import org.w3c.dom.*; = public class XAttributeConstraintInt extends XAttributeConstraintPropertie= s { - protected boolean mandatory =3D true; + protected boolean mandatory =3D false; protected int min =3D Integer.MIN_VALUE; protected int max =3D Integer.MAX_VALUE; public XAttributeConstraintInt() { @@ -23,7 +23,7 @@ = public void load(Element element) { super.load(element); - mandatory =3D getBoolean("mandatory", true); //$NON-NLS-1$ + mandatory =3D getBoolean("mandatory", false); //$NON-NLS-1$ min =3D getInt("minimum", Integer.MIN_VALUE); //$NON-NLS-1$ max =3D getInt("maximum", Integer.MAX_VALUE); //$NON-NLS-1$ } Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.m= odel/src/org/jboss/tools/common/model/engines/impl/EnginesLoader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/model/engines/impl/EnginesLoader.java 2010-05-12 = 13:47:06 UTC (rev 22035) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/model/engines/impl/EnginesLoader.java 2010-05-12 = 14:25:17 UTC (rev 22036) @@ -86,11 +86,18 @@ c =3D cs[i].copy(); object.addChild(c); } else { - boolean has_id =3D c.getModelEntity().getAttribute(XModelObj= ectLoaderUtil.ATTR_ID_NAME) !=3D null; + boolean has_id =3D c.getModelEntity().getAttribute(XModelObj= ectLoaderUtil.ATTR_ID_NAME) !=3D null + || ((XModelObjectImpl)c).hasIdAttr(); if(has_id) { c.removeFromParent(); EnginesLoader.merge(c, cs[i], false); - object.addChild(c); + if(!object.addChild(c)) { + c.set(XModelObjectImpl.DUPLICATE, "1234"); + object.addChild(c); + } + if(c.get(XModelObjectImpl.DUPLICATE) !=3D null) { + c.set(XModelObjectImpl.DUPLICATE, ""); + } } else { EnginesLoader.merge(c, cs[i], fire); } Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.m= odel/src/org/jboss/tools/common/model/impl/RegularObjectImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/model/impl/RegularObjectImpl.java 2010-05-12 13:4= 7:06 UTC (rev 22035) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/model/impl/RegularObjectImpl.java 2010-05-12 14:2= 5:17 UTC (rev 22036) @@ -117,6 +117,18 @@ k++; } return; + } else if(hasIdAttr()) { + int k =3D 1; + while(c !=3D null) { + super.set(XModelObjectImpl.DUPLICATE, "" + k); //$NON-NLS-1$ + npp =3D getPathPart(); + if(k =3D=3D 1 && npp.indexOf(XModelObjectImpl.DUPLICATE) < 0) { + elementExists(c, name, value); + return; + } + c =3D p.children.change(this, opp, npp); + k++; + } } else { if(ov =3D=3D null) properties.remove(name); else super.set(name,= ov); elementExists(c, name, value); Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.m= odel/src/org/jboss/tools/common/model/impl/XModelObjectImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2010-05-12 13:47= :06 UTC (rev 22035) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/model/impl/XModelObjectImpl.java 2010-05-12 14:25= :17 UTC (rev 22036) @@ -40,6 +40,7 @@ public class XModelObjectImpl implements XModelObject, Serializable, Clone= able { private static final long serialVersionUID =3D 3860648580262144825L; // protected static final String ENTITY =3D XModelConstants.XMODEL_ENTI= TY_ATTR; + public static final String DUPLICATE =3D "__duplicate"; private XModel model =3D null; private XModelEntity entity =3D null; private XModelObjectImpl parent =3D null; @@ -136,6 +137,21 @@ properties.put(name.intern(), value); } = + private Boolean hasIdAttr =3D null; + = + public boolean hasIdAttr() { + if(hasIdAttr !=3D null) return hasIdAttr.booleanValue(); + hasIdAttr =3D Boolean.FALSE; + for (int i =3D 0; i < getModelEntity().getAttributes().length; i++) { + if("true".equals(getModelEntity().getAttributes()[i].getProperty("id= "))) { + hasIdAttr =3D Boolean.TRUE; + break; + } + } + = + return hasIdAttr.booleanValue(); + } + protected String get_0(String name) { XAttribute a =3D getModelEntity().getAttribute(name); return (a =3D=3D null || a.getAdapter() =3D=3D null) ? null : a.ge= tAdapter().getProperty(this); @@ -300,8 +316,17 @@ = public String getPathPart() { String p =3D name(); - return (p =3D=3D null || p.indexOf('/') < 0) ? p : p.replace('/', = '#'); + p =3D ((p =3D=3D null || p.indexOf('/') < 0) ? p : p.replace('/', = '#')); + return applyDuplicate(p); } + = + protected final String applyDuplicate(String pathpart) { + String duplicate =3D get(DUPLICATE); + return (duplicate =3D=3D null || duplicate.length() =3D=3D 0) = + ? pathpart = + : pathpart + DUPLICATE + duplicate; + = + } = public XModelObject getChildByPath(String path) { int i =3D path.indexOf(XModelObjectConstants.SEPARATOR); @@ -360,6 +385,10 @@ String entity =3D (transform) ? getEntityForCopy() : getModelEntit= y().getName(); XModelObject c =3D getModel().createModelObject(entity, p); if(c !=3D null) c.setModified(true); + String d =3D get(DUPLICATE); + if(d !=3D null && d.length() > 0) { + c.set(DUPLICATE, d); + } return c; } = Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.m= odel/src/org/jboss/tools/common/model/markers/ConstraintChecker.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/model/markers/ConstraintChecker.java 2010-05-12 1= 3:47:06 UTC (rev 22035) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/model/markers/ConstraintChecker.java 2010-05-12 1= 4:25:17 UTC (rev 22036) @@ -39,12 +39,19 @@ = private void check(XModelObject o) { XAttribute[] as =3D o.getModelEntity().getAttributes(); + String idAttr =3D null; for (int i =3D 0; i < as.length; i++) { String error =3D as[i].getConstraint().getError(o.getAttributeValue(as[= i].getName())); if(error !=3D null) addProblem(o, as[i].getName(), "Value " + error); + if("true".equals(as[i].getProperty("id"))) idAttr =3D as[i].getName(); } XModelObject[] cs =3D ((XModelObjectImpl)o).getLoadedChildren(); for (int i =3D 0; i < cs.length; i++) check(cs[i]); + + String duplicate =3D o.get(XModelObjectImpl.DUPLICATE); + if(duplicate !=3D null && duplicate.length() > 0 && idAttr !=3D null) { + addProblem(o, idAttr, "Value " + o.getAttributeValue(idAttr) + " is not= unique."); + } } = protected void addProblem(XModelObject o, String attr, String msg) { Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.m= odel/src/org/jboss/tools/common/model/markers/ResourceMarkers.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/model/markers/ResourceMarkers.java 2010-05-12 13:= 47:06 UTC (rev 22035) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/model/markers/ResourceMarkers.java 2010-05-12 14:= 25:17 UTC (rev 22036) @@ -30,7 +30,7 @@ = public class ResourceMarkers { public static String TEXT_PROBLEM =3D "org.jboss.tools.common.model.textp= roblemmarker"; //$NON-NLS-1$ - public static String CONSTRAINT_PROBLEM =3D "org.jboss.tools.common.model= .web.ui.constraintsmarker"; //$NON-NLS-1$ + public static String CONSTRAINT_PROBLEM =3D "org.jboss.tools.jst.web.ui.c= onstraintsmarker"; //$NON-NLS-1$ public static String JST_WEB_PROBLEM =3D "org.jboss.tools.jst.web.ui.stru= tsmarker"; //$NON-NLS-1$ private XModelObject object; = Modified: branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.m= odel/src/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2010-05-12= 13:47:06 UTC (rev 22035) +++ branches/jbosstools-3.1.x/common/plugins/org.jboss.tools.common.model/s= rc/org/jboss/tools/common/model/util/XModelObjectLoaderUtil.java 2010-05-12= 14:25:17 UTC (rev 22036) @@ -223,9 +223,13 @@ XModelEntity entity =3D o.getModelEntity(); XAttribute[] as =3D entity.getAttributes(); for (int i =3D 0; i < as.length; i++) { + String n =3D as[i].getName(); + if("attributes".equals(n) && "true".equals(as[i].getProperty("= any"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + loadAnyAtributes(element, o); + continue; + } String xmlname =3D as[i].getXMLName(); if (xmlname =3D=3D null || xmlname.length() =3D=3D 0) continue; - String n =3D as[i].getName(); String value =3D getAttribute(element, xmlname, as[i]); if (value !=3D null) o.setAttributeValue(n, value); String commentName =3D getAttributeCommentName(xmlname); @@ -332,6 +336,17 @@ if(q !=3D null) EnginesLoader.merge(q, co, false); } catch (XModelException exc) { ModelPlugin.getPluginLog().logError("XModelObjectLoaderUtil:= loadChildren:" + exc.getMessage(), exc); //$NON-NLS-1$ + } else { + int k =3D 1; + String pp =3D co.getPathPart(); + while(o.getChildByPath(pp) !=3D null) { + co.set(XModelObjectImpl.DUPLICATE, "" + k); //$NON-NLS-1$ + String ppn =3D co.getPathPart(); + if(ppn.equals(pp)) break; + pp =3D ppn; + ++k; + } + o.addChild(co); } continue; } = @@ -443,9 +458,13 @@ } for (int i =3D 0; i < as.length; i++) { if (as[i].isFake()) continue; + String n =3D as[i].getName(); + if("attributes".equals(n) && "true".equals(as[i].getProperty("= any"))) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + saveAnyAtributes(element, o); + continue; + } String xmlname =3D as[i].getXMLName(); if (xmlname =3D=3D null || xmlname.length() =3D=3D 0) continue; - String n =3D as[i].getName(); String v =3D o.getAttributeValue(n); if (isSaveable(entity, n, v, as[i].getDefaultValue())) { saveAttribute(element, xmlname, v); @@ -843,24 +862,35 @@ = protected void loadAnyElement(Element element, XModelObject o) { o.setAttributeValue("tag", element.getTagName()); //$NON-NLS-1$ + loadAnyAtributes(element, o); + String text =3D getAttribute(element, "#text").trim(); //$NON-NLS-1$ + if(text.length() > 0) { + while(text.startsWith("\n") || text.startsWith("\r")) text =3D text.sub= string(1); //$NON-NLS-1$ //$NON-NLS-2$ + while(text.endsWith("\n") || text.endsWith("\r")) text =3D text.substri= ng(0, text.length() - 1); //$NON-NLS-1$ //$NON-NLS-2$ + o.setAttributeValue("text", text); //$NON-NLS-1$ + } + loadChildren(element, o); + } + + public static void loadAnyAtributes(Element element, XModelObject o) { + HashSet attrs =3D new HashSet(); + XAttribute[] oas =3D o.getModelEntity().getAttributes(); + for (XAttribute a: oas) { + String xml =3D a.getXMLName(); + if(xml !=3D null && xml.length() > 0) attrs.add(xml); + } StringBuffer sb =3D new StringBuffer(); NamedNodeMap as =3D element.getAttributes(); for (int i =3D 0; i < as.getLength(); i++) { Node n =3D as.item(i); String nm =3D n.getNodeName(); + if(attrs.contains(nm)) continue; String v =3D n.getNodeValue(); if(v =3D=3D null) continue; if(sb.length() > 0) sb.append(";"); //$NON-NLS-1$ sb.append(nm).append("=3D").append(v); //$NON-NLS-1$ } o.setAttributeValue("attributes", sb.toString()); //$NON-NLS-1$ - String text =3D getAttribute(element, "#text").trim(); //$NON-NLS-1$ - if(text.length() > 0) { - while(text.startsWith("\n") || text.startsWith("\r")) text =3D text.sub= string(1); //$NON-NLS-1$ //$NON-NLS-2$ - while(text.endsWith("\n") || text.endsWith("\r")) text =3D text.substri= ng(0, text.length() - 1); //$NON-NLS-1$ //$NON-NLS-2$ - o.setAttributeValue("text", text); //$NON-NLS-1$ - } - loadChildren(element, o); } = protected void saveAnyElement(Element parent, XModelObject o) { @@ -870,6 +900,18 @@ xmlname =3D namespace + ":" + xmlname; //$NON-NLS-1$ } Element element =3D XMLUtil.createElement(parent, xmlname); + saveAnyAtributes(element, o); + String text =3D o.getAttributeValue("text"); //$NON-NLS-1$ + if(text !=3D null && text.length() > 0) { + saveAttribute(element, "#text", text); //$NON-NLS-1$ + } + XModelObject[] cs =3D o.getChildren(); + for (int i =3D 0; i < cs.length; i++) { + saveAnyElement(element, cs[i]); + } + } + + public static void saveAnyAtributes(Element element, XModelObject o) { String attrs =3D o.getAttributeValue("attributes"); //$NON-NLS-1$ StringTokenizer st =3D new StringTokenizer(attrs, ";"); //$NON-NLS-1$ while(st.hasMoreTokens()) { @@ -880,14 +922,6 @@ String v =3D t.substring(i + 1); element.setAttribute(n, v); } - String text =3D o.getAttributeValue("text"); //$NON-NLS-1$ - if(text !=3D null && text.length() > 0) { - saveAttribute(element, "#text", text); //$NON-NLS-1$ - } - XModelObject[] cs =3D o.getChildren(); - for (int i =3D 0; i < cs.length; i++) { - saveAnyElement(element, cs[i]); - } } = protected void eitherOr(Element element, String attr1, String attr2) { @@ -941,6 +975,9 @@ } } mergeFinalComment(destination, source, fire); + = + String d =3D destination.get(XModelObjectImpl.DUPLICATE); + if(d !=3D null && d.length() > 0) destination.set(XModelObjectImpl.DUPLI= CATE, ""); } = public static void mergeAttributeComment(XModelObject destination, XModel= Object source, XAttribute attr, boolean fire) { --===============5504370615505375660==-- From jbosstools-commits at lists.jboss.org Wed May 12 10:31:36 2010 Content-Type: multipart/mixed; boundary="===============1902057987470303344==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22037 - trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test. Date: Wed, 12 May 2010 10:31:35 -0400 Message-ID: <201005121431.o4CEVZn1027344@svn01.web.mwc.hst.phx2.redhat.com> --===============1902057987470303344== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-12 10:31:35 -0400 (Wed, 12 May 2010) New Revision: 22037 Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/co= re/test/ESBModelTest.java Log: https://jira.jboss.org/jira/browse/JBDS-1197 Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools= /esb/core/test/ESBModelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/c= ore/test/ESBModelTest.java 2010-05-12 14:25:17 UTC (rev 22036) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/c= ore/test/ESBModelTest.java 2010-05-12 14:31:35 UTC (rev 22037) @@ -15,7 +15,7 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.TestProjectProvider; = import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; --===============1902057987470303344==-- From jbosstools-commits at lists.jboss.org Wed May 12 10:34:10 2010 Content-Type: multipart/mixed; boundary="===============0431338442034868182==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22038 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 3 other directories. Date: Wed, 12 May 2010 10:34:09 -0400 Message-ID: <201005121434.o4CEY9wR027399@svn01.web.mwc.hst.phx2.redhat.com> --===============0431338442034868182== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-12 10:34:08 -0400 (Wed, 12 May 2010) New Revision: 22038 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/interceptors/AlternativeStereotype.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDIValidationMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/interceptors/AlternativeInterceptorBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : The bean class of a managed bean is annotated with both the @Interceptor = and @Decorator stereotypes; Managed bean with a public field declares any s= cope other than @Dependent; Managed bean with a parameterized bean class de= clares any scope other than @Dependent Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDIUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-12 14:31:35 UTC (rev 22037) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-12 14:34:08 UTC (rev 22038) @@ -23,6 +23,7 @@ import org.eclipse.wst.validation.internal.plugin.ValidationPlugin; import org.jboss.tools.common.EclipseUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.jst.web.kb.IKbProject; = /** @@ -39,8 +40,7 @@ try { EclipseUtil.addNatureToProject(project, CDICoreNature.NATURE_ID); if (!project.hasNature(IKbProject.NATURE_ID)) { - EclipseResourceUtil.addNatureToProject(project, - IKbProject.NATURE_ID); + EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID); } EclipseResourceUtil.addBuilderToProject(project, ValidationPlugin.VALID= ATION_BUILDER_ID); } catch (CoreException e) { @@ -55,62 +55,190 @@ */ public static void disableCDI(IProject project) { try { - EclipseUtil.removeNatureFromProject(project, - CDICoreNature.NATURE_ID); + EclipseUtil.removeNatureFromProject(project, CDICoreNature.NATURE_ID); } catch (CoreException e) { CDICorePlugin.getDefault().logError(e); } } - = + /** * Finds CDI injected point in beans for particular java element. * = * @param beans * @param element */ - public static IInjectionPoint findInjectionPoint(Set beans, IJavaE= lement element){ - if(!(element instanceof IField) && (element instanceof IMethod) ) + public static IInjectionPoint findInjectionPoint(Set beans, IJavaE= lement element) { + if (!(element instanceof IField) && (element instanceof IMethod)) { return null; - = - for(IBean bean : beans){ + } + + for (IBean bean : beans) { Set injectionPoints =3D bean.getInjectionPoints(); - for(IInjectionPoint iPoint : injectionPoints){ - if(element instanceof IField && iPoint instanceof IInjectionPointField= ){ - if(((IInjectionPointField)iPoint).getField() !=3D null && ((IInjectio= nPointField)iPoint).getField().equals(element)) + for (IInjectionPoint iPoint : injectionPoints) { + if (element instanceof IField && iPoint instanceof IInjectionPointFiel= d) { + if (((IInjectionPointField) iPoint).getField() !=3D null && ((IInject= ionPointField) iPoint).getField().equals(element)) { return iPoint; - }else if(element instanceof IMethod && iPoint instanceof IInjectionPoi= ntMethod){ - if(((IInjectionPointMethod)iPoint).getMethod() !=3D null && ((IInject= ionPointMethod)iPoint).getMethod().equals(element)) + } + } else if (element instanceof IMethod && iPoint instanceof IInjectionP= ointMethod) { + if (((IInjectionPointMethod) iPoint).getMethod() !=3D null && ((IInje= ctionPointMethod) iPoint).getMethod().equals(element)) { return iPoint; - = + } } } } - return null; + return null; } = /** - * Sorts CDI beans which may be injected. Sets for alternative beans high= er position and for nonalternative beans lower position. + * Sorts CDI beans which may be injected. Sets for alternative beans high= er + * position and for nonalternative beans lower position. * = * @param beans * @param element */ - public static List sortBeans(Set beans){ + public static List sortBeans(Set beans) { Set alternativeBeans =3D new HashSet(); Set nonAlternativeBeans =3D new HashSet(); - = - for(IBean bean : beans){ - if(bean =3D=3D null || bean instanceof IDecorator || bean instanceof II= nterceptor) + + for (IBean bean : beans) { + if (bean =3D=3D null || bean instanceof IDecorator || bean instanceof I= Interceptor) { continue; - = - if(bean.isAlternative()) + } + if (bean.isAlternative()) { alternativeBeans.add(bean); - else + } else { nonAlternativeBeans.add(bean); + } } - = + ArrayList sortedBeans =3D new ArrayList(); sortedBeans.addAll(alternativeBeans); sortedBeans.addAll(nonAlternativeBeans); return sortedBeans; } + + /** + * Checks if the bean has @Depended scope. If it has different scope then= @Depended + * then returns this scope declaration or a stereotype which declares the + * scope. Otherwise returns null. + * = + * @param bean + * @param scopeTypeName + * @return + */ + public static IAnnotationDeclaration getDifferentScopeDeclarationThanDepe= ntend(IScoped scoped) { + return getAnotherScopeDeclaration(scoped, CDIConstants.DEPENDENT_ANNOTAT= ION_TYPE_NAME); + } + + /** + * Checks if the bean has given scope. If it has different scope then giv= en + * then returns this scope declaration or a stereotype which declares the + * scope. Otherwise returns null. + * = + * @param bean + * @param scopeTypeName + * @return + */ + public static IAnnotationDeclaration getAnotherScopeDeclaration(IScoped s= coped, String scopeTypeName) { + IScope scope =3D scoped.getScope(); + if (!scopeTypeName.equals(scope.getSourceType().getFullyQualifiedName())= ) { + Set scopeDeclarations =3D scoped.getScopeDeclaration= s(); + if (!scopeDeclarations.isEmpty()) { + return scopeDeclarations.iterator().next(); + } + if (scoped instanceof IStereotyped) { + Set stereoTypeDeclarations =3D ((IStereotyped)= scoped).getStereotypeDeclarations(); + for (IStereotypeDeclaration stereotypeDeclaration : stereoTypeDeclarat= ions) { + IStereotype stereotype =3D stereotypeDeclaration.getStereotype(); + IScope stereotypeScope =3D stereotype.getScope(); + if (stereotypeScope !=3D null && !scopeTypeName.equals(stereotypeScop= e.getSourceType().getFullyQualifiedName())) { + return stereotypeDeclaration; + } + } + } + } + return null; + } + + /** + * Returns the scope annotation declaration if it exists in the bean. If = the + * scope declared in a stereotype then returns this stereotype declaratio= n. + * Returns null if there is not this scope declaration neither correspond= ing + * stereotype declaration. + * = + * @param bean + * @param scopeTypeName + * @return + */ + public static IAnnotationDeclaration getScopeDeclaration(IBean bean, Stri= ng scopeTypeName) { + IScope scope =3D bean.getScope(); + if (scopeTypeName.equals(scope.getSourceType().getFullyQualifiedName()))= { + Set scopeDeclarations =3D bean.getScopeDeclarations(= ); + for (IScopeDeclaration scopeDeclaration : scopeDeclarations) { + if (scopeTypeName.equals(scopeDeclaration.getScope().getSourceType().g= etFullyQualifiedName())) { + return scopeDeclaration; + } + } + Set stereoTypeDeclarations =3D bean.getStereoty= peDeclarations(); + for (IStereotypeDeclaration stereotypeDeclaration : stereoTypeDeclarati= ons) { + IScope stereotypeScope =3D stereotypeDeclaration.getStereotype().getSc= ope(); + if (stereotypeScope !=3D null && scopeTypeName.equals(stereotypeScope.= getSourceType().getFullyQualifiedName())) { + return stereotypeDeclaration; + } + } + } + return null; + } + + /** + * Return @Named declaration or the stereotype declaration if it declares + * = + * @Named. + * = + * @param stereotyped + * @return + */ + public static IAnnotationDeclaration getNamedDeclaration(IBean bean) { + IAnnotationDeclaration declaration =3D bean.getAnnotation(CDIConstants.N= AMED_QUALIFIER_TYPE_NAME); + if (declaration =3D=3D null) { + return getNamedStereotypeDeclaration(bean); + } + return declaration; + } + + /** + * Return the stereotype declaration which declares @Named. + * = + * @param stereotyped + * @return + */ + public static IAnnotationDeclaration getNamedStereotypeDeclaration(IStere= otyped stereotyped) { + Set declarations =3D stereotyped.getStereotypeDe= clarations(); + for (IStereotypeDeclaration declaration : declarations) { + if (CDIConstants.NAMED_QUALIFIER_TYPE_NAME.equals(declaration.getType()= .getFullyQualifiedName()) + || getNamedStereotypeDeclaration(declaration.getStereotype()) !=3D nu= ll) { + return declaration; + } + } + return null; + } + + /** + * Returns all found annotations for parameters of the method. + * = + * @param method + * @param annotationTypeName + * @return + */ + public static Set getAnnotationPossitions(IBeanMeth= od method, String annotationTypeName) { + List params =3D method.getParameters(); + Set declarations =3D new HashSet(); + for (IParameter param : params) { + ITextSourceReference declaration =3D param.getAnnotationPosition(annota= tionTypeName); + if (declaration !=3D null) { + declarations.add(declaration); + } + } + return declarations; + } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-12 14:31:35 UTC (rev 220= 37) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-12 14:34:08 UTC (rev 220= 38) @@ -28,6 +28,7 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.Flags; import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IMemberValuePair; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; @@ -39,6 +40,7 @@ import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIUtil; import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IBeanMethod; @@ -59,7 +61,6 @@ import org.jboss.tools.cdi.core.ISessionBean; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; -import org.jboss.tools.cdi.core.IStereotyped; import org.jboss.tools.cdi.core.ITypeDeclaration; import org.jboss.tools.cdi.core.preferences.CDIPreferences; import org.jboss.tools.common.model.util.EclipseJavaUtil; @@ -311,6 +312,9 @@ = private void validateClassBean(IClassBean bean) { validateDisposers(bean); + if(!(bean instanceof ISessionBean)) { + validateManagedBean(bean); + } } = private void validateDisposers(IClassBean bean) { @@ -332,7 +336,7 @@ * - there are multiple disposer methods for a single producer method */ for (IBeanMethod disposerMethod : disposerMethods) { - Set disposerDeclarations =3D getAnnotationPoss= itions(disposerMethod, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); + Set disposerDeclarations =3D CDIUtil.getAnnota= tionPossitions(disposerMethod, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); for (ITextSourceReference declaration : disposerDeclarations) { addError(CDIValidationMessages.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDI= Preferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, declaration, bean.getResource(= )); } @@ -446,18 +450,6 @@ } } = - private Set getAnnotationPossitions(IBeanMethod met= hod, String annotationTypeName) { - List params =3D method.getParameters(); - Set declarations =3D new HashSet(); - for (IParameter param : params) { - ITextSourceReference declaration =3D param.getAnnotationPosition(annota= tionTypeName); - if(declaration!=3Dnull) { - declarations.add(declaration); - } - } - return declarations; - } - /** * If the method is not a static method and is not a business method of t= he session bean and is observer or disposer then mark it as incorrect. * = @@ -553,21 +545,13 @@ * - producer field with a parameterized type with a type variable de= clares any scope other than @Dependent */ if(paramTypes.length>0) { - IScope scope =3D producer.getScope(); - if(!CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME.equals(scope.getSourc= eType().getFullyQualifiedName())) { - ITextSourceReference declaration =3D typeDeclaration; - Set decls =3D producer.getScopeDeclarations(); - for (IScopeDeclaration decl : decls) { - if(decl.getParentMember().getResource().equals(producer.getResource= ())) { - declaration =3D decl; - break; - } - } + IAnnotationDeclaration scopeOrStereotypeDeclaration =3D CDIUtil.getDi= fferentScopeDeclarationThanDepentend(producer); + if(scopeOrStereotypeDeclaration!=3Dnull) { boolean field =3D producer instanceof IProducerField; addError( field?CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD:CDIVa= lidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, field?CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD:CDIPreferenc= es.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, - declaration, producer.getResource()); + scopeOrStereotypeDeclaration, producer.getResource()); } } } @@ -722,6 +706,47 @@ } } = + private void validateManagedBean(IClassBean bean) { + /* + * 3.1. Managed beans + * - the bean class of a managed bean is annotated with both the @Inter= ceptor and @Decorator stereotypes = + */ + IAnnotationDeclaration decorator =3D bean.getAnnotation(CDIConstants.DEC= ORATOR_STEREOTYPE_TYPE_NAME); + IAnnotationDeclaration interceptor =3D bean.getAnnotation(CDIConstants.I= NTERCEPTOR_ANNOTATION_TYPE_NAME); + if(decorator!=3Dnull && interceptor!=3Dnull) { + addError(CDIValidationMessages.BOTH_INTERCEPTOR_AND_DECORATOR, CDIPrefe= rences.BOTH_INTERCEPTOR_AND_DECORATOR, decorator, bean.getResource()); + addError(CDIValidationMessages.BOTH_INTERCEPTOR_AND_DECORATOR, CDIPrefe= rences.BOTH_INTERCEPTOR_AND_DECORATOR, interceptor, bean.getResource()); + } + + IAnnotationDeclaration declaration =3D CDIUtil.getDifferentScopeDeclarat= ionThanDepentend(bean); + if(declaration!=3Dnull) { + IType type =3D bean.getBeanClass(); + try { + /* + * 3.1. Managed beans + * - managed bean with a public field declares any scope other than @= Dependent = + */ + IField[] fields =3D type.getFields(); + for (IField field : fields) { + if(Flags.isPublic(field.getFlags())) { + addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_P= UBLIC_FIELD, CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, declaration, be= an.getResource()); + break; + } + } + /* + * 3.1. Managed beans + * - managed bean with a parameterized bean class declares any scope = other than @Dependent = + */ + String[] typeVariables =3D type.getTypeParameterSignatures(); + if(typeVariables.length>0) { + addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_GE= NERIC_TYPE, CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, declaration, bea= n.getResource()); + } + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + } + } + private void validateInterceptor(IInterceptor interceptor) { /* * 2.5.3. Beans with no EL name = @@ -733,7 +758,7 @@ declaration =3D interceptor.getAnnotation(CDIConstants.INTERCEPTOR_ANN= OTATION_TYPE_NAME); } if(declaration=3D=3Dnull) { - declaration =3D getNamedStereotypeDeclaration(interceptor); + declaration =3D CDIUtil.getNamedStereotypeDeclaration(interceptor); } addError(CDIValidationMessages.INTERCEPTOR_HAS_NAME, CDIPreferences.INT= ERCEPTOR_HAS_NAME, declaration, interceptor.getResource()); } @@ -742,8 +767,11 @@ * 2.6.1. Declaring an alternative * - interceptor is an alternative (Non-Portable behavior) */ - ITextSourceReference declaration =3D interceptor.getAlternativeDeclarati= on(); - if(declaration!=3Dnull) { + if(interceptor.isAlternative()) { + ITextSourceReference declaration =3D interceptor.getAlternativeDeclarat= ion(); + if(declaration=3D=3Dnull) { + declaration =3D interceptor.getInterceptorAnnotation(); + } addError(CDIValidationMessages.INTERCEPTOR_IS_ALTERNATIVE, CDIPreferenc= es.INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, declaration, interceptor.getRes= ource()); } } @@ -759,7 +787,7 @@ declaration =3D decorator.getAnnotation(CDIConstants.DECORATOR_STEREOT= YPE_TYPE_NAME); } if(declaration=3D=3Dnull) { - declaration =3D getNamedStereotypeDeclaration(decorator); + declaration =3D CDIUtil.getNamedStereotypeDeclaration(decorator); } addError(CDIValidationMessages.DECORATOR_HAS_NAME, CDIPreferences.DECOR= ATOR_HAS_NAME, declaration, decorator.getResource()); } @@ -768,23 +796,15 @@ * 2.6.1. Declaring an alternative * - decorator is an alternative (Non-Portable behavior) */ - ITextSourceReference declaration =3D decorator.getAlternativeDeclaration= (); - if(declaration!=3Dnull) { + if(decorator.isAlternative()) { + ITextSourceReference declaration =3D decorator.getAlternativeDeclaratio= n(); + if(declaration=3D=3Dnull) { + declaration =3D decorator.getDecoratorAnnotation(); + } addError(CDIValidationMessages.DECORATOR_IS_ALTERNATIVE, CDIPreferences= .INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, declaration, decorator.getResourc= e()); } } = - private IAnnotationDeclaration getNamedStereotypeDeclaration(IStereotyped= stereotyped) { - Set declarations =3D stereotyped.getStereotypeDe= clarations(); - for (IStereotypeDeclaration declaration : declarations) { - if(CDIConstants.NAMED_QUALIFIER_TYPE_NAME.equals(declaration.getType().= getFullyQualifiedName()) || - getNamedStereotypeDeclaration(declaration.getStereotype())!=3Dnull) { - return declaration; - } - } - return null; - } - /* * 2.2.2. Restricting the bean types of a bean * - bean class or producer method or field specifies a @Typed anno= tation, = @@ -853,28 +873,15 @@ boolean interceptor =3D bean instanceof IInterceptor; boolean decorator =3D bean instanceof IDecorator; if(interceptor || decorator) { - IScope scope =3D bean.getScope(); - if(!CDIConstants.DEPENDENT_ANNOTATION_TYPE_NAME.equals(scope.getSourceT= ype().getFullyQualifiedName())) { - String key; - String message; - ITextSourceReference declaration =3D null; - if(!scopes.isEmpty()) { - declaration =3D scopes.iterator().next(); - } + IAnnotationDeclaration scopeOrStereotypeDeclaration =3D CDIUtil.getDiff= erentScopeDeclarationThanDepentend(bean); + if(scopeOrStereotypeDeclaration!=3Dnull) { + String key =3D CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR; + String message =3D CDIValidationMessages.ILLEGAL_SCOPE_FOR_DECORATOR; if(interceptor) { key =3D CDIPreferences.ILLEGAL_SCOPE_FOR_INTERCEPTOR; message =3D CDIValidationMessages.ILLEGAL_SCOPE_FOR_INTERCEPTOR; - if(declaration=3D=3Dnull) { - declaration =3D ((IInterceptor)bean).getInterceptorAnnotation(); - } - } else { - key =3D CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR; - message =3D CDIValidationMessages.ILLEGAL_SCOPE_FOR_DECORATOR; - if(declaration=3D=3Dnull) { - declaration =3D ((IDecorator)bean).getDecoratorAnnotation(); - } } - addError(message, key, declaration, bean.getResource()); + addError(message, key, scopeOrStereotypeDeclaration, bean.getResource(= )); } } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDIValidationMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-12 14:31:35 UTC (re= v 22037) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-12 14:34:08 UTC (re= v 22038) @@ -41,7 +41,8 @@ public static String MULTIPLE_SCOPE_TYPE_ANNOTATIONS; public static String MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE; public static String STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE; - public static String ILLEGAL_SCOPE_FOR_MANAGED_BEAN; + public static String ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD; + public static String ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_GENERIC_TYPE; public static String ILLEGAL_SCOPE_FOR_SESSION_BEAN; public static String ILLEGAL_SCOPE_FOR_PRODUCER_METHOD; public static String ILLEGAL_SCOPE_FOR_PRODUCER_FIELD; @@ -68,6 +69,7 @@ public static String ILLEGAL_CONDITIONAL_OBSERVER; = public static String BOTH_INTERCEPTOR_AND_DECORATOR; + public static String SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR; public static String PRODUCER_IN_INTERCEPTOR; public static String PRODUCER_IN_DECORATOR; public static String DISPOSER_IN_INTERCEPTOR; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-12 14:31:35 UTC (rev 22037) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-12 14:34:08 UTC (rev 22038) @@ -29,16 +29,17 @@ - stereotype declares any other qualifier annotation - stereotype is annotated @Typed = - - - - 3.1. Managed beans - the bean class of a managed bean is annotated with both = the @Interceptor and @Decorator stereotypes - managed bean with a public field declares any scope other than @Dependent - managed bean with a parameterized bean class declares any scope other th= an @Dependent = + + + + + 3.1.4. Specializing a managed bean - managed bean class annotated @Specializes does not directly extend = the bean class of another managed bean Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-12 14:31:35 UTC (rev 22037) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-12 14:34:08 UTC (rev 22038) @@ -20,7 +20,8 @@ MULTIPLE_SCOPE_TYPE_ANNOTATIONS=3DBean class or producer method or field s= pecifies multiple scope type annotations MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE=3DBean does not explicitly de= clare a scope when there is no default scope STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE=3DStereotype declares more than on= e scope -ILLEGAL_SCOPE_FOR_MANAGED_BEAN=3DManaged bean with a public field or a par= ameterized bean class declares any scope other than @Dependent +ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD=3DManaged bean with a pub= lic field declares any scope other than @Dependent +ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_GENERIC_TYPE=3DManaged bean with a par= ameterized bean class declares any scope other than @Dependent ILLEGAL_SCOPE_FOR_SESSION_BEAN=3DSession bean specifies an illegal scope (= a stateless session bean must belong to the @Dependent pseudo-scope; a sing= leton bean must belong to either the @ApplicationScoped scope or to the @De= pendent pseudo-scope, a stateful session bean may have any scope) ILLEGAL_SCOPE_FOR_PRODUCER_METHOD=3DProducer method with a parameterized r= eturn type with a type variable declares any scope other than @Dependent ILLEGAL_SCOPE_FOR_PRODUCER_FIELD=3DProducer field with a parameterized typ= e with a type variable declares any scope other than @Dependent @@ -46,7 +47,7 @@ ILLEGAL_OBSERVER_IN_SESSION_BEAN=3DNon-static method of a session bean cla= ss has a parameter annotated @Observes, and the method is not a business me= thod of the EJB ILLEGAL_CONDITIONAL_OBSERVER=3DBean with scope @Dependent has an observer = method declared receive=3DIF_EXISTS = -BOTH_INTERCEPTOR_AND_DECORATOR=3Dthe bean class of a managed bean is annot= ated with both the @Interceptor and @Decorator stereotypes +BOTH_INTERCEPTOR_AND_DECORATOR=3DThe bean class of a managed bean is annot= ated with both the @Interceptor and @Decorator stereotypes SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR=3DBean class of a session = bean is annotated @Interceptor or @Decorator PRODUCER_IN_INTERCEPTOR=3DInterceptor has a member annotated @Produces PRODUCER_IN_OR_DECORATOR=3DDecorator has a member annotated @Produces Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-12 14:31:35 UTC (rev 22037) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-12 14:34:08 UTC (rev 22038) @@ -62,7 +62,7 @@ {CDIPreferences.MULTIPLE_SCOPE_TYPE_ANNOTATIONS, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_multipleScopeTypeAnnotations_label}, {CDIPreferences.MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE, CDIPrefer= encesMessages.CDIValidatorConfigurationBlock_pb_missingScopeWhenThereIsNoDe= faultScope_label}, {CDIPreferences.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE, CDIPreferences= Messages.CDIValidatorConfigurationBlock_pb_stereotypeDeclaresMoreThanOneSco= pe_label}, -// {CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalScopeForManagedBean_label}, + {CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, CDIPreferencesMessages.= CDIValidatorConfigurationBlock_pb_illegalScopeForManagedBean_label}, // {CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalScopeForSessionBean_label}, {CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerMethod_label}, {CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerField_label}, @@ -100,7 +100,7 @@ private static SectionDescription SECTION_INTERCEPTOR =3D new SectionDesc= ription( CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_intercepto= r_and_decorator, new String[][]{ -// {CDIPreferences.BOTH_INTERCEPTOR_AND_DECORATOR, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_bothInterceptorAndDecorator_label}, + {CDIPreferences.BOTH_INTERCEPTOR_AND_DECORATOR, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_bothInterceptorAndDecorator_label}, // {CDIPreferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, CDI= PreferencesMessages.CDIValidatorConfigurationBlock_pb_sessionBeanAnnotatedI= nterceptorOrDecorator_label}, // {CDIPreferences.PRODUCER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferences= Messages.CDIValidatorConfigurationBlock_pb_producerInInterceptorOrDecorator= _label}, {CDIPreferences.DISPOSER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferencesMe= ssages.CDIValidatorConfigurationBlock_pb_disposerInInterceptorOrDecorator_l= abel}, Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests= /jbt/validation/interceptors/AlternativeInterceptorBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/AlternativeInterceptorBroken.java 2010-05-12 14:31:3= 5 UTC (rev 22037) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/AlternativeInterceptorBroken.java 2010-05-12 14:34:0= 8 UTC (rev 22038) @@ -1,12 +1,11 @@ package org.jboss.jsr299.tck.tests.jbt.validation.interceptors; = -import javax.enterprise.inject.Alternative; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; import javax.interceptor.InvocationContext; = @Interceptor -(a)Alternative +(a)AlternativeStereotype public class AlternativeInterceptorBroken { = @AroundInvoke Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/interceptors/AlternativeStereotype.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/AlternativeStereotype.java (= rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/interceptors/AlternativeStereotype.java 2010-05-12 14:34:08 UTC (= rev 22038) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.interceptors; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.enterprise.inject.Alternative; +import javax.enterprise.inject.Stereotype; + +(a)Stereotype +(a)Target( { TYPE, METHOD, FIELD }) +(a)Retention(RUNTIME) +(a)Inherited +(a)Alternative +(a)interface AlternativeStereotype { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/interceptors/AlternativeStereotype.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-12 14:31:35 UTC (rev 22037) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-12 14:34:08 UTC (rev 22038) @@ -43,7 +43,7 @@ */ public void testInterceptorWithWrongScope() throws Exception { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/interceptors/InterceptorWithWrongScopeBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_INTERCEPTOR,= 7); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_INTERCEPTOR,= 8); } = /** @@ -118,7 +118,7 @@ */ public void testAlternativeInterceptor() throws Exception { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/interceptors/AlternativeInterceptorBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.INTERCEPTOR_IS_ALTERNATIVE, 9); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.INTERCEPTOR_IS_ALTERNATIVE, 7); } = /** @@ -185,6 +185,39 @@ } = /** + * 3.1. Managed beans + * - the bean class of a managed bean is annotated with both the @Interc= eptor and @Decorator stereotypes = + * = + * @throws Exception + */ + public void testInterceptorCanNotAlsoBeDecorator() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /interceptors/definition/broken/interceptorCanNotBeDecorator/InterceptingDe= corator.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.BOTH_INTERCEPTOR_AND_DECORATOR= , 24, 25); + } + + /** + * 3.1. Managed beans + * - managed bean with a public field declares any scope other than @Dep= endent = + * = + * @throws Exception + */ + public void testNonDependentScopedBeanCanNotHavePublicField() throws Exce= ption { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/simple/definition/dependentWithPublicField/Leopard_Broken.j= ava"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_MANAGED_BEAN= _WITH_PUBLIC_FIELD, 21); + } + + /** + * 3.1. Managed beans + * - managed bean with a parameterized bean class declares any scope oth= er than @Dependent = + * = + * @throws Exception + */ + public void testNonDependentGenericManagedBeanNotOk() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /definition/bean/genericbroken/FooBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_MANAGED_BEAN= _WITH_GENERIC_TYPE, 21); + } + + /** * 3.5.1. Declaring a resource * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) * = @@ -368,10 +401,10 @@ */ public void testParameterizedReturnTypeWithWrongScope() throws Exception { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/ParameterizedTypeWithWrongScope_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_MET= HOD, 25, 41); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_MET= HOD, 25, 39); AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 21); AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 35); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 32); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 31); } = /** @@ -382,7 +415,7 @@ */ public void testParameterizedTypeWithWrongScope() throws Exception { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/ParameterizedTypeWithWrongScope_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_FIE= LD, 11, 19); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_FIE= LD, 11, 18); AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= FIELD, 9); AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= FIELD, 14); AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= FIELD, 16); --===============0431338442034868182==-- From jbosstools-commits at lists.jboss.org Wed May 12 10:35:34 2010 Content-Type: multipart/mixed; boundary="===============5093706869571750820==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22039 - in branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test: src/org/jboss/tools/esb/core/test and 1 other directory. Date: Wed, 12 May 2010 10:35:33 -0400 Message-ID: <201005121435.o4CEZXD3027830@svn01.web.mwc.hst.phx2.redhat.com> --===============5093706869571750820== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-12 10:35:33 -0400 (Wed, 12 May 2010) New Revision: 22039 Added: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/projec= ts/Test/esb-1.2/jboss-esb-uninique.xml Modified: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/or= g/jboss/tools/esb/core/test/ESBModelTest.java Log: https://jira.jboss.org/jira/browse/JBDS-1197 Added: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/pr= ojects/Test/esb-1.2/jboss-esb-uninique.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/proje= cts/Test/esb-1.2/jboss-esb-uninique.xml (rev 0) +++ branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/proje= cts/Test/esb-1.2/jboss-esb-uninique.xml 2010-05-12 14:35:33 UTC (rev 22039) @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + Property changes on: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.es= b.core.test/projects/Test/esb-1.2/jboss-esb-uninique.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test= /src/org/jboss/tools/esb/core/test/ESBModelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/o= rg/jboss/tools/esb/core/test/ESBModelTest.java 2010-05-12 14:34:08 UTC (rev= 22038) +++ branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/o= rg/jboss/tools/esb/core/test/ESBModelTest.java 2010-05-12 14:35:33 UTC (rev= 22039) @@ -303,6 +303,18 @@ assertTrue(errorList.toString(), errorList.length() =3D=3D 0); } = + public void testNonUniqueProviders() { + XModelObject object =3D getFileObject("esb-1.2", "jboss-esb-uninique.xml= ", ESBConstants.ENT_ESB_FILE_120); + XModelObject[] os =3D object.getChildByPath("Providers").getChildren(); + assertEquals(2, os.length); + = + for (int i =3D 0; i < os.length; i++) { + String name =3D os[i].getAttributeValue("name"); + assertEquals("http", name); + } + + } + XModelObject getFileObject(String parentPath, String xmlname) { return getFileObject(parentPath, xmlname, ESBConstants.ENT_ESB_FILE_101); } --===============5093706869571750820==-- From jbosstools-commits at lists.jboss.org Wed May 12 11:34:43 2010 Content-Type: multipart/mixed; boundary="===============4991611482960809102==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22040 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views. Date: Wed, 12 May 2010 11:34:42 -0400 Message-ID: <201005121534.o4CFYgvI008343@svn01.web.mwc.hst.phx2.redhat.com> --===============4991611482960809102== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-12 11:34:42 -0400 (Wed, 12 May 2010) New Revision: 22040 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/J= AXRSWSTestView.java Log: Fix for [JBIDE-6275] [tester] REST POST/PUT requests are not sending SOAP b= ody Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/JAXRSWSTestView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-12 14:35:33 UTC (rev 22039) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-12 15:34:42 UTC (rev 22040) @@ -613,7 +613,7 @@ */ private IStatus handleRSTest(final IProgressMonitor monitor, String addre= ss, String method, String body, String parms, String headersStr) { = - if (!method.equalsIgnoreCase(GET)) + if (method.equalsIgnoreCase(GET)) body =3D EMPTY_STRING; = // if no actual text in the request body, set to null --===============4991611482960809102==-- From jbosstools-commits at lists.jboss.org Wed May 12 12:34:04 2010 Content-Type: multipart/mixed; boundary="===============1903697816960958377==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22041 - in branches/hibernatetools-multiversion/hibernatetools/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl and 21 other directories. Date: Wed, 12 May 2010 12:34:04 -0400 Message-ID: <201005121634.o4CGY4eD020957@svn01.web.mwc.hst.phx2.redhat.com> --===============1903697816960958377== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-12 12:34:01 -0400 (Wed, 12 May 2010) New Revision: 22041 Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/x/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/x/Attribute.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/x/Document.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/x/Element.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/x/Node.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/x/Visitor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/x/io/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/x/io/DOMWriter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/x/io/SAXReader.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/stubs/util/ConfigHelper.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/stubs/util/DTDEntityResolver.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/hql/antlr/HqlBaseLexer.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/tool/hbm2x/ExporterFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/util/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/util/XMLHelper.java Removed: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/stubs/util/HqlBaseLexerStub.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/stubs/util/XMLHelper.java Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterDefi= nition.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.= java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/views/properties/Entity= PropertySource.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/views/properties/Hibern= atePropertySourceProvider.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseS= chema.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseS= chemaWorkbenchAdapter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLLexerRule.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDele= gate.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineerin= gEditor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse/src/org/hibernate/console/ConsoleConfiguration.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/.classpath branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/META-INF/MANIFEST.MF branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/stubs/util/StringHelper.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/Query.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/cfg/ConfigurationFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/cfg/reveng/ReverseEngineeringSettin= gs.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/metadata/ClassMetadata.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - fix bugs, fix with Hibernat= e 3.5 Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-05-12 1= 5:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-05-12 1= 6:34:01 UTC (rev 22041) @@ -47,7 +47,11 @@ import org.hibernate.mediator.x.Session; import org.hibernate.mediator.x.cfg.Configuration; import org.hibernate.mediator.x.cfg.ConfigurationFactory; +import org.hibernate.mediator.x.cfg.JDBCMetaDataConfiguration; import org.hibernate.mediator.x.cfg.Settings; +import org.hibernate.mediator.x.cfg.reveng.DefaultDatabaseCollector; +import org.hibernate.mediator.x.cfg.reveng.DefaultReverseEngineeringStrate= gy; +import org.hibernate.mediator.x.cfg.reveng.ReverseEngineeringStrategy; import org.hibernate.mediator.x.tool.ide.completion.HQLCodeAssist; import org.xml.sax.EntityResolver; = @@ -479,6 +483,32 @@ } } ); } + = + public ReverseEngineeringStrategy createDefReverseEngineeringStrategy() { + return (ReverseEngineeringStrategy)execute(new ExecutionContext.Command(= ) { + public Object execute() { + return DefaultReverseEngineeringStrategy.newInstance(); + } + } ); + } + = + public DefaultDatabaseCollector createDefaultDatabaseCollector() { + return (DefaultDatabaseCollector)execute(new ExecutionContext.Command() { + public Object execute() { + return DefaultDatabaseCollector.newInstance(); + } + } ); + } + = + public JDBCMetaDataConfiguration createJDBCMetaDataConfiguration() { + return (JDBCMetaDataConfiguration)execute(new ExecutionContext.Command()= { + public Object execute() { + ConfigurationFactory configStubFactory =3D new ConfigurationFactory(nu= ll); + final JDBCMetaDataConfiguration cfg =3D configStubFactory.createConfig= urationJDBCMetaData(); + return cfg; + } + } ); + } = @SuppressWarnings("unchecked") public Iterator doSchemaExport() { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/model/impl/Expor= terDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterDef= inition.java 2010-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/model/impl/ExporterDef= inition.java 2010-05-12 16:34:01 UTC (rev 22041) @@ -120,7 +120,8 @@ Exporter exporter =3D null; = try { - exporter =3D (Exporter) ReflectHelper.classForName( classname ).newIn= stance(); + Object obj =3D ReflectHelper.classForName( classname ).newInstance(); + exporter =3D org.hibernate.mediator.x.tool.hbm2x.ExporterFactory.crea= teExporterStub(obj); = } catch (InstantiationException e) { throw new HibernateConsoleRuntimeException(HibernateConsoleMessages.E= xporterDefinition_problem_creating_exporter_class + classname); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappin= gUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils= .java 2010-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils= .java 2010-05-12 16:34:01 UTC (rev 22041) @@ -18,12 +18,11 @@ import java.util.Iterator; import java.util.List; = -import org.dom4j.Attribute; -import org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.Element; -import org.dom4j.VisitorSupport; -import org.dom4j.io.SAXReader; +import org.dom4j.mediator.x.Attribute; +import org.dom4j.mediator.x.Document; +import org.dom4j.mediator.x.Element; +import org.dom4j.mediator.x.Visitor; +import org.dom4j.mediator.x.io.SAXReader; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Assert; @@ -51,7 +50,6 @@ import org.hibernate.mediator.execution.ExecutionContext; import org.hibernate.mediator.stubs.util.OpenMappingUtilsEjb3; import org.hibernate.mediator.stubs.util.StringHelper; -import org.hibernate.mediator.stubs.util.XMLHelper; import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.Component; @@ -67,6 +65,7 @@ import org.hibernate.mediator.x.mapping.ToOne; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.tool.hbm2x.Cfg2HbmTool; +import org.hibernate.mediator.x.util.XMLHelper; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; = @@ -328,7 +327,7 @@ return visitor.iterator(); } = - private static class LVS extends VisitorSupport { + private static class LVS extends Visitor { private String nodeName; private String attrName; private String attrValue; @@ -395,15 +394,19 @@ } try { List errors =3D new ArrayList(); - XMLHelper helper =3D new XMLHelper(); + XMLHelper helper =3D XMLHelper.newInstance(); SAXReader saxReader =3D helper.createSAXReader(configXMLFile.getPath(),= errors, entityResolver); doc =3D saxReader.read(new InputSource( stream)); if (errors.size() !=3D 0) { HibernateConsolePlugin.getDefault().logErrorMessage("invalid config= uration", (Throwable)null); //$NON-NLS-1$ } } - catch (DocumentException e) { - HibernateConsolePlugin.getDefault().logErrorMessage("Could not parse co= nfiguration", e); //$NON-NLS-1$ + catch (Exception e) { + if (e.getClass().getName().contains("DocumentException")) { //$NON-NLS-= 1$ + HibernateConsolePlugin.getDefault().logErrorMessage("Could not parse c= onfiguration", e); //$NON-NLS-1$ + } else { + HibernateConsolePlugin.getDefault().logErrorMessage("Could not parse c= onfiguration", e); //$NON-NLS-1$ + } } finally { try { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUti= ls.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.jav= a 2010-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/utils/ProjectUtils.jav= a 2010-05-12 16:34:01 UTC (rev 22041) @@ -28,9 +28,8 @@ import java.util.Iterator; import java.util.List; = -import org.dom4j.DocumentException; -import org.dom4j.Element; -import org.dom4j.io.SAXReader; +import org.dom4j.mediator.x.Element; +import org.dom4j.mediator.x.io.SAXReader; import org.eclipse.core.internal.resources.File; import org.eclipse.core.internal.resources.ICoreConstants; import org.eclipse.core.internal.resources.ResourceInfo; @@ -401,15 +400,19 @@ return new String[0]; } InputStream is =3D null; - org.dom4j.Document doc =3D null; + org.dom4j.mediator.x.Document doc =3D null; try { is =3D file.getContents(); - SAXReader saxReader =3D new SAXReader(); + SAXReader saxReader =3D SAXReader.newInstance(); doc =3D saxReader.read(new InputSource(is)); } catch (CoreException e) { HibernateConsolePlugin.getDefault().logErrorMessage("CoreException: ", = e); //$NON-NLS-1$ - } catch (DocumentException e) { - HibernateConsolePlugin.getDefault().logErrorMessage("DocumentException:= ", e); //$NON-NLS-1$ + } catch (Exception e) { + if (e.getClass().getName().contains("DocumentException")) { //$NON-NLS-= 1$ + HibernateConsolePlugin.getDefault().logErrorMessage("DocumentException= : ", e); //$NON-NLS-1$ + } else { + HibernateConsolePlugin.getDefault().logErrorMessage("Exception: ", e);= //$NON-NLS-1$ + } } finally { try { if (is !=3D null) is.close(); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties= /EntityPropertySource.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/views/properties/Entit= yPropertySource.java 2010-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/views/properties/Entit= yPropertySource.java 2010-05-12 16:34:01 UTC (rev 22041) @@ -23,6 +23,9 @@ = import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource2; +import org.hibernate.console.ConsoleConfiguration; +import org.hibernate.console.KnownConfigurations; +import org.hibernate.mediator.execution.ExecutionContext; import org.hibernate.mediator.x.Session; = public class EntityPropertySource implements IPropertySource2 @@ -30,25 +33,45 @@ private Object reflectedObj; private IPropertyDescriptor[] propertyDescriptors; private final Session sessionStub; + private String consoleConfigName; = - public EntityPropertySource(final Object obj, final Session sessionStub) { + public EntityPropertySource(final Object obj, final Session sessionStub, = String consoleConfigName) { this.sessionStub =3D sessionStub; - reflectedObj =3D obj; + this.reflectedObj =3D obj; + this.consoleConfigName =3D consoleConfigName; } = public Object getEditableValue() { return ""; //$NON-NLS-1$ } = + public ConsoleConfiguration getConsoleConfig() { + final KnownConfigurations knownConfigurations =3D KnownConfigurations.ge= tInstance(); + ConsoleConfiguration consoleConfig =3D knownConfigurations.find(consoleC= onfigName); + return consoleConfig; + } + public IPropertyDescriptor[] getPropertyDescriptors() { - if (propertyDescriptors =3D=3D null) { - propertyDescriptors =3D sessionStub.getPropertyDescriptors(reflectedObj= ); + if (propertyDescriptors =3D=3D null && getConsoleConfig() !=3D null) { + propertyDescriptors =3D (IPropertyDescriptor[])getConsoleConfig().execu= te(new ExecutionContext.Command() { + public Object execute() { + return sessionStub.getPropertyDescriptors(reflectedObj); + } + }); } return propertyDescriptors; } = - public Object getPropertyValue(Object id) { - return sessionStub.getPropertyValue(reflectedObj, id); + public Object getPropertyValue(final Object id) { + Object val =3D null; + if (getConsoleConfig() !=3D null) { + val =3D getConsoleConfig().execute(new ExecutionContext.Command() { + public Object execute() { + return sessionStub.getPropertyValue(reflectedObj, id); + } + }); + } + return val; } = public boolean isPropertySet(Object id) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/views/properties= /HibernatePropertySourceProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/views/properties/Hiber= natePropertySourceProvider.java 2010-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/views/properties/Hiber= natePropertySourceProvider.java 2010-05-12 16:34:01 UTC (rev 22041) @@ -50,7 +50,7 @@ String consoleConfigName =3D qp.getConsoleConfigName(); if ((sessionStub.isOpen() && sessionStub.contains(obj)) || = (obj !=3D null && sessionStub.hasMetaData(obj))) { - res =3D new EntityPropertySource(obj, sessionStub); = + res =3D new EntityPropertySource(obj, sessionStub, consoleConfigName)= ; = } } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDa= tabaseSchema.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabase= Schema.java 2010-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabase= Schema.java 2010-05-12 16:34:01 UTC (rev 22041) @@ -22,7 +22,6 @@ package org.hibernate.eclipse.console.workbench; = import org.hibernate.console.ConsoleConfiguration; -import org.hibernate.mediator.x.cfg.reveng.DefaultReverseEngineeringStrate= gy; import org.hibernate.mediator.x.cfg.reveng.ReverseEngineeringStrategy; = public class LazyDatabaseSchema { @@ -31,7 +30,7 @@ private final ReverseEngineeringStrategy res; = public LazyDatabaseSchema(ConsoleConfiguration ccfg) { - this(ccfg, DefaultReverseEngineeringStrategy.newInstance()); + this(ccfg, ccfg.createDefReverseEngineeringStrategy()); } = public LazyDatabaseSchema(ConsoleConfiguration ccfg, ReverseEngineeringSt= rategy res) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDa= tabaseSchemaWorkbenchAdapter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabase= SchemaWorkbenchAdapter.java 2010-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabase= SchemaWorkbenchAdapter.java 2010-05-12 16:34:01 UTC (rev 22041) @@ -53,9 +53,9 @@ = public synchronized Object[] getChildren(Object o, final IProgressMonitor= monitor) { LazyDatabaseSchema dbs =3D getLazyDatabaseSchema( o ); - final DefaultDatabaseCollector db =3D DefaultDatabaseCollector.newInstan= ce(); = ConsoleConfiguration consoleConfiguration =3D dbs.getConsoleConfiguratio= n(); + final DefaultDatabaseCollector db =3D consoleConfiguration.createDefault= DatabaseCollector(); try{ readDatabaseSchema(monitor, db, consoleConfiguration, dbs.getReverseEng= ineeringStrategy()); = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLLexerRule.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLLexerRule.java 20= 10-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/hqleditor/HQLLexerRule.java 20= 10-05-12 16:34:01 UTC (rev 22041) @@ -27,7 +27,7 @@ import org.eclipse.jface.text.rules.ICharacterScanner; import org.eclipse.jface.text.rules.IRule; import org.eclipse.jface.text.rules.IToken; -import org.hibernate.mediator.stubs.util.HqlBaseLexerStub; +import org.hibernate.mediator.x.hql.antlr.HqlBaseLexer; = public class HQLLexerRule implements IRule { = @@ -38,7 +38,7 @@ } = public IToken evaluate(final ICharacterScanner scanner) { - HqlBaseLexerStub lexer =3D HqlBaseLexerStub.newInstance(new Reader() { + HqlBaseLexer lexer =3D HqlBaseLexer.newInstance(new Reader() { = public void close() throws IOException { // noop = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLau= nchDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDel= egate.java 2010-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDel= egate.java 2010-05-12 16:34:01 UTC (rev 22041) @@ -271,9 +271,7 @@ configuration =3D cc.buildWith( null, false ); } = - // vitali: TODO: use execution context - ConfigurationFactory configStubFactory =3D new ConfigurationFactory(nul= l); - final JDBCMetaDataConfiguration cfg =3D configStubFactory.createConfigu= rationJDBCMetaData(); + final JDBCMetaDataConfiguration cfg =3D cc.createJDBCMetaDataConfigurat= ion(); Properties properties =3D configuration.getProperties(); cfg.setProperties( properties ); cc.buildWith(cfg,false); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEng= ineeringEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeri= ngEditor.java 2010-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/ReverseEngineeri= ngEditor.java 2010-05-12 16:34:01 UTC (rev 22041) @@ -231,7 +231,7 @@ //} //} = - LazyDatabaseSchema lazyDatabaseSchema =3D new LazyDatabaseSchema(config= uration, repository.getReverseEngineeringStrategy(DefaultReverseEngineering= Strategy.newInstance())); + LazyDatabaseSchema lazyDatabaseSchema =3D new LazyDatabaseSchema(config= uration, repository.getReverseEngineeringStrategy(configuration.createDefRe= verseEngineeringStrategy())); = return lazyDatabaseSchema; } catch(RuntimeException he) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/.classpath 2010-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/.classpath 2010-05-12 16:34:01 UTC (rev 22041) @@ -3,42 +3,42 @@ + + + + + + + + + + + + + + + - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + - - Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/META-INF/MANIFEST.MF 2010-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/META-INF/MANIFEST.MF 2010-05-12 16:34:01 UTC (rev 22041) @@ -72,8 +72,9 @@ org.hibernate.mediator.x.tool.hbm2x.pojo, org.hibernate.mediator.x.tool.ide.completion, org.hibernate.mediator.x.type, - org.dom4j, - org.dom4j.io, + org.hibernate.mediator.x.util, + org.dom4j.mediator.x, + org.dom4j.mediator.x.io, net.sf.cglib.core, net.sf.cglib.proxy, net.sf.cglib.reflect Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/dom4j/mediator/x/Attribute.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Attribute.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Attribute.java 2010-05-12 16:34:01 UTC= (rev 22041) @@ -0,0 +1,25 @@ +package org.dom4j.mediator.x; + +import org.hibernate.mediator.base.HObject; + +public class Attribute extends Node { + + public static final String CL =3D "org.dom4j.Attribute"; //$NON-NLS-1$ + + protected Attribute(Object attribute) { + super(attribute, CL); + } + + public static Attribute newInstance() { + return new Attribute(HObject.newInstance(CL)); + } + + public String getValue() { + return (String)invoke(mn()); + } + + @Override + public void accept(Visitor visitor) { + visitor.visit(this); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/dom4j/mediator/x/Document.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Document.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Document.java 2010-05-12 16:34:01 UTC = (rev 22041) @@ -0,0 +1,28 @@ +package org.dom4j.mediator.x; + +import org.hibernate.mediator.base.HObject; + +public class Document extends Node { + public static final String CL =3D "org.dom4j.Document"; //$NON-NLS-1$ + + protected Document(Object document) { + super(document, CL); + } + + public static Document newInstance() { + return new Document(HObject.newInstance(CL)); + } + + public static Document create(Object obj) { + return new Document(obj); + } + = + public Element getRootElement() { + return new Element(invoke(mn())); + } + + @Override + public void accept(Visitor visitor) { + visitor.visit(this); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/dom4j/mediator/x/Element.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Element.java (= rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Element.java 2010-05-12 16:34:01 UTC (= rev 22041) @@ -0,0 +1,73 @@ +package org.dom4j.mediator.x; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.hibernate.mediator.base.HObject; + +public class Element extends Node { + + public static final String CL =3D "org.dom4j.Element"; //$NON-NLS-1$ + + protected Element(Object element) { + super(element, CL); + } + + public static Element newInstance() { + return new Element(HObject.newInstance(CL)); + } + = + public Element element(String name) { + return new Element(invoke(mn(), name)); + } + + @SuppressWarnings("unchecked") + public List elements() { + List list =3D (List)invoke(mn()); + Iterator it =3D list.iterator(); + ArrayList al =3D new ArrayList(); + while (it.hasNext()) { + Object obj =3D it.next(); + if (obj !=3D null) { + al.add(new Element(obj)); + } + } + return al; + } + + @SuppressWarnings("unchecked") + public List elements(String name) { + List list =3D (List)invoke(mn(), name); + Iterator it =3D list.iterator(); + ArrayList al =3D new ArrayList(); + while (it.hasNext()) { + Object obj =3D it.next(); + if (obj !=3D null) { + al.add(new Element(obj)); + } + } + return al; + } + = + public boolean remove(Node node) { + return (Boolean)invoke(mn(), node); + } + + public String attributeValue(String name) { + return (String)invoke(mn(), name); + } + = + public Attribute attribute(String name) { + return new Attribute(invoke(mn(), name)); + } + + public String getName() { + return (String)invoke(mn()); + } + + @Override + public void accept(Visitor visitor) { + visitor.visit(this); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/dom4j/mediator/x/Node.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Node.java (rev= 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Node.java 2010-05-12 16:34:01 UTC (rev= 22041) @@ -0,0 +1,27 @@ +package org.dom4j.mediator.x; + +import org.hibernate.mediator.base.HObject; + +public class Node extends HObject { + + public static final String CL =3D "org.dom4j.Node"; //$NON-NLS-1$ + + protected Node(Object node) { + super(node, CL); + } + + protected Node(Object node, String cn) { + super(node, cn); + } + + public static Node newInstance() { + return new Node(HObject.newInstance(CL)); + } + + public Element getParent() { + return new Element(invoke(mn())); + } + + public void accept(Visitor visitor) { + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/dom4j/mediator/x/Visitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Visitor.java (= rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Visitor.java 2010-05-12 16:34:01 UTC (= rev 22041) @@ -0,0 +1,13 @@ +package org.dom4j.mediator.x; + +public abstract class Visitor { + + public void visit(Document document) { + } + + public void visit(Element node) { + } + + public void visit(Attribute node) { + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/dom4j/mediator/x/io/DOMWriter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/io/DOMWriter.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/io/DOMWriter.java 2010-05-12 16:34:01 = UTC (rev 22041) @@ -0,0 +1,20 @@ +package org.dom4j.mediator.x.io; + +import org.dom4j.mediator.x.Document; +import org.hibernate.mediator.base.HObject; + +public class DOMWriter extends HObject { + public static final String CL =3D "org.dom4j.io.DOMWriter"; //$NON-NLS-1$ + + protected DOMWriter(Object saxReader) { + super(saxReader, CL); + } + + public static DOMWriter newInstance() { + return new DOMWriter(HObject.newInstance(CL)); + } + + public org.w3c.dom.Document write(Document document) { + return (org.w3c.dom.Document)invoke(mn(), document); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/dom4j/mediator/x/io/SAXReader.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/io/SAXReader.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/io/SAXReader.java 2010-05-12 16:34:01 = UTC (rev 22041) @@ -0,0 +1,26 @@ +package org.dom4j.mediator.x.io; + +import org.dom4j.mediator.x.Document; +import org.hibernate.mediator.base.HObject; +import org.xml.sax.InputSource; + +public class SAXReader extends HObject { + public static final String CL =3D "org.dom4j.io.SAXReader"; //$NON-NLS-1$ + + protected SAXReader(Object saxReader) { + super(saxReader, CL); + } + + public static SAXReader newInstance() { + return new SAXReader(HObject.newInstance(CL)); + } + + public static SAXReader create(Object obj) { + return new SAXReader(obj); + } + + public Document read(InputSource in) { + Object obj =3D invoke(mn(), in); + return Document.create(obj); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/stubs/util/ConfigHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/ConfigHelper.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/ConfigHelper.java 2010-05= -12 16:34:01 UTC (rev 22041) @@ -0,0 +1,23 @@ +package org.hibernate.mediator.stubs.util; + +import java.io.InputStream; + +import org.hibernate.mediator.base.HObject; + +public class ConfigHelper extends HObject { + + public static final String CL =3D "org.hibernate.util.ConfigHelper"; //$N= ON-NLS-1$ + = + protected ConfigHelper(Object configHelper) { + super(configHelper, CL); + } + + public static InputStream getResourceAsStream(String resource) { + return (InputStream)invokeStaticMethod(CL, "getResourceAsStream", resour= ce); //$NON-NLS-1$ + } + = + public static InputStream getUserResourceAsStream(String resource) { + return (InputStream)invokeStaticMethod(CL, "getUserResourceAsStream", re= source); //$NON-NLS-1$ + } + +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/stubs/util/DTDEntityResolver.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/DTDEntityResolver.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/DTDEntityResolver.java 20= 10-05-12 16:34:01 UTC (rev 22041) @@ -0,0 +1,115 @@ +package org.hibernate.mediator.stubs.util; +/* + * Hibernate, Relational Persistence for Idiomatic Java + * + * Copyright (c) 2008, Red Hat Middleware LLC or third-party contributors = as + * indicated by the @author tags or express copyright attribution + * statements applied by the authors. All third-party contributions are + * distributed under license by Red Hat Middleware LLC. + * + * This copyrighted material is made available to anyone wishing to use, m= odify, + * copy, or redistribute it subject to the terms and conditions of the GNU + * Lesser General Public License, as published by the Free Software Founda= tion. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANT= ABILITY + * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public= License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this distribution; if not, write to: + * Free Software Foundation, Inc. + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301 USA + * + */ + +import java.io.InputStream; +import java.io.Serializable; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; + +/** + * An {@link EntityResolver} implementation which attempts to resolve + * various systemId URLs to local classpath lookups
    + *
  1. Any systemId URL beginning with http://hibernate.sourceforge.ne= t/ is + * searched for as a classpath resource in the classloader which loaded the + * Hibernate classes.
    2. + *
  2. Any systemId URL using classpath as the scheme (i.e. start= ing + * with classpath:// is searched for as a classpath resource usin= g first + * the current thread context classloader and then the classloader which l= oaded + * the Hibernate classes. + *
+ *

+ * Any entity references which cannot be resolved in relation to the above + * rules result in returning null, which should force the SAX reader to + * handle the entity reference in its default manner. + * + * @author Markus Meissner + * @author Gavin King + * @author Steve Ebersole + */ +public class DTDEntityResolver implements EntityResolver, Serializable { + + private static final Logger log =3D LoggerFactory.getLogger( DTDEntityRes= olver.class ); + + private static final String HIBERNATE_NAMESPACE =3D "http://hibernate.sou= rceforge.net/"; + private static final String USER_NAMESPACE =3D "classpath://"; + + public InputSource resolveEntity(String publicId, String systemId) { + if ( systemId !=3D null ) { + log.debug( "trying to resolve system-id [" + systemId + "]" ); + if ( systemId.startsWith( HIBERNATE_NAMESPACE ) ) { + log.debug( "recognized hibernate namespace; attempting to resolve on c= lasspath under org/hibernate/" ); + String path =3D "org/hibernate/" + systemId.substring( HIBERNATE_NAMES= PACE.length() ); + InputStream dtdStream =3D resolveInHibernateNamespace( path ); + if ( dtdStream =3D=3D null ) { + log.debug( "unable to locate [" + systemId + "] on classpath" ); + if ( systemId.substring( HIBERNATE_NAMESPACE.length() ).indexOf( "2.0= " ) > -1 ) { + log.error( "Don't use old DTDs, read the Hibernate 3.x Migration Gui= de!" ); + } + } + else { + log.debug( "located [" + systemId + "] in classpath" ); + InputSource source =3D new InputSource( dtdStream ); + source.setPublicId( publicId ); + source.setSystemId( systemId ); + return source; + } + } + else if ( systemId.startsWith( USER_NAMESPACE ) ) { + log.debug( "recognized local namespace; attempting to resolve on class= path" ); + String path =3D systemId.substring( USER_NAMESPACE.length() ); + InputStream stream =3D resolveInLocalNamespace( path ); + if ( stream =3D=3D null ) { + log.debug( "unable to locate [" + systemId + "] on classpath" ); + } + else { + log.debug( "located [" + systemId + "] in classpath" ); + InputSource source =3D new InputSource( stream ); + source.setPublicId( publicId ); + source.setSystemId( systemId ); + return source; + } + } + } + // use default behavior + return null; + } + + protected InputStream resolveInHibernateNamespace(String path) { + return this.getClass().getClassLoader().getResourceAsStream( path ); + } + + protected InputStream resolveInLocalNamespace(String path) { + try { + return ConfigHelper.getUserResourceAsStream( path ); + } + catch( Throwable t ) { + return null; + } + } +} Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hi= bernate.mediator/src/org/hibernate/mediator/stubs/util/HqlBaseLexerStub.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/HqlBaseLexerStub.java 201= 0-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/HqlBaseLexerStub.java 201= 0-05-12 16:34:01 UTC (rev 22041) @@ -1,44 +0,0 @@ -package org.hibernate.mediator.stubs.util; - -import java.io.Reader; - -import org.hibernate.hql.antlr.HqlBaseLexer; -import org.hibernate.mediator.HibernateConsoleRuntimeException; -import org.hibernate.mediator.Messages; -import org.hibernate.mediator.x.hql.antlr.HqlSqlTokenTypes; - -import antlr.Token; -import antlr.TokenStreamException; - -public class HqlBaseLexerStub { - = - protected HqlBaseLexer hqlBaseLexer; - = - protected HqlBaseLexerStub(HqlBaseLexer hqlBaseLexer) { - if (hqlBaseLexer =3D=3D null) { - throw new HibernateConsoleRuntimeException(Messages.Stub_create_null_st= ub_prohibit); - } - this.hqlBaseLexer =3D hqlBaseLexer; - } - = - public static HqlBaseLexerStub newInstance(Reader in) { - return new HqlBaseLexerStub(new HqlBaseLexer(in)); - } - - private Token nextToken() { - try { - return hqlBaseLexer.nextToken(); - } catch (TokenStreamException e) { - return null; - } - } - = - public boolean isNextTokenIdent() { - Token token =3D nextToken(); - if (token !=3D null && token.getType() =3D=3D HqlSqlTokenTypes.IDENT) { - return true; - } = - return false; - } - -} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/stubs/util/StringHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/StringHelper.java 2010-05= -12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/StringHelper.java 2010-05= -12 16:34:01 UTC (rev 22041) @@ -1,9 +1,9 @@ package org.hibernate.mediator.stubs.util; = import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; = -import org.hibernate.util.ArrayHelper; - // org.hibernate.util.StringHelper public final class StringHelper { public static final String WHITESPACE =3D " \n\r\f\t"; //$NON-NLS-1$ @@ -74,6 +74,17 @@ locations.add( new Integer( indx ) ); } } - return ArrayHelper.toIntArray( locations ); + return toIntArray(locations); } + + @SuppressWarnings("unchecked") + public static int[] toIntArray(Collection coll) { + Iterator iter =3D coll.iterator(); + int[] arr =3D new int[ coll.size() ]; + int i=3D0; + while (iter.hasNext()) { + arr[i++] =3D ((Integer)iter.next()).intValue(); + } + return arr; + } } Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hi= bernate.mediator/src/org/hibernate/mediator/stubs/util/XMLHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/XMLHelper.java 2010-05-12= 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/XMLHelper.java 2010-05-12= 16:34:01 UTC (rev 22041) @@ -1,45 +0,0 @@ -package org.hibernate.mediator.stubs.util; - -import java.util.List; - -import org.dom4j.io.SAXReader; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.xml.sax.EntityResolver; -import org.xml.sax.ErrorHandler; -import org.xml.sax.SAXParseException; - -(a)SuppressWarnings("unchecked") -public class XMLHelper { - - private static final Logger log =3D LoggerFactory.getLogger(XMLHelper.cla= ss); - private SAXReader saxReader; - - public SAXReader createSAXReader(String file, List errorsList, EntityReso= lver entityResolver) { - if (saxReader=3D=3Dnull) saxReader =3D new SAXReader(); - saxReader.setEntityResolver(entityResolver); - saxReader.setErrorHandler(new ErrorLogger(file, errorsList)); - saxReader.setMergeAdjacentText(true); - saxReader.setValidation(true); - return saxReader; - } - - public static class ErrorLogger implements ErrorHandler { - private String file; - private List errors; - ErrorLogger(String file, List errors) { - this.file=3Dfile; - this.errors =3D errors; - } - public void error(SAXParseException error) { - log.error( "Error parsing XML: " + file + '(' + error.getLineNumber() += ") " + error.getMessage() ); //$NON-NLS-1$ //$NON-NLS-2$ - errors.add(error); - } - public void fatalError(SAXParseException error) { - error(error); - } - public void warning(SAXParseException warn) { - log.warn( "Warning parsing XML: " + file + '(' + warn.getLineNumber() += ") " + warn.getMessage() ); //$NON-NLS-1$ //$NON-NLS-2$ - } - } -} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/Query.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/Query.java 2010-05-12 15:34:42 UTC= (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/Query.java 2010-05-12 16:34:01 UTC= (rev 22041) @@ -23,7 +23,7 @@ for (int i =3D 0; i < returnTypes.length; i++) { res[i] =3D TypeFactory.createTypeStub(returnTypes[i]); } - return null; + return res; } = public void setMaxResults(int intValue) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/cfg/ConfigurationFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/ConfigurationFactory.java 2010= -05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/ConfigurationFactory.java 2010= -05-12 16:34:01 UTC (rev 22041) @@ -15,9 +15,8 @@ import java.util.Map; import java.util.Properties; = -import org.dom4j.DocumentException; -import org.dom4j.Node; -import org.dom4j.io.DOMWriter; +import org.dom4j.mediator.x.Element; +import org.dom4j.mediator.x.io.DOMWriter; import org.eclipse.datatools.connectivity.IConnectionProfile; import org.eclipse.datatools.connectivity.ProfileManager; import org.eclipse.osgi.util.NLS; @@ -25,11 +24,11 @@ import org.hibernate.mediator.Messages; import org.hibernate.mediator.preferences.ConsoleConfigurationPreferences; import org.hibernate.mediator.preferences.ConsoleConfigurationPreferences.= ConfigurationMode; +import org.hibernate.mediator.stubs.util.ConfigHelper; import org.hibernate.mediator.stubs.util.ReflectHelper; import org.hibernate.mediator.stubs.util.StringHelper; import org.hibernate.mediator.x.dialect.Dialect; -import org.hibernate.util.ConfigHelper; -import org.hibernate.util.XMLHelper; +import org.hibernate.mediator.x.util.XMLHelper; import org.w3c.dom.Document; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; @@ -234,13 +233,12 @@ return localCfg; } = - @SuppressWarnings("unchecked") private Configuration loadConfigurationXML(Configuration localCfg, boolea= n includeMappings, EntityResolver entityResolver) { File configXMLFile =3D prefs.getConfigXMLFile(); if (!includeMappings) { - org.dom4j.Document doc; - XMLHelper xmlHelper =3D new XMLHelper(); + org.dom4j.mediator.x.Document doc; + XMLHelper xmlHelper =3D XMLHelper.newInstance(); InputStream stream =3D null; String resourceName =3D ""; //$NON-NLS-1$ if (configXMLFile !=3D null) { @@ -273,20 +271,26 @@ .get(0)); } = - List list =3D doc.getRootElement() + List list =3D doc.getRootElement() .element("session-factory").elements("mapping"); //$NON-NLS-1$ //$NO= N-NLS-2$ - for (Node element : list) { + for (Element element : list) { element.getParent().remove(element); } = - DOMWriter dw =3D new DOMWriter(); + DOMWriter dw =3D DOMWriter.newInstance(); Document document =3D dw.write(doc); return localCfg.configure(document); = - } catch (DocumentException e) { - throw new HibernateConsoleRuntimeException( - Messages.ConsoleConfiguration_could_not_parse_configuration - + resourceName, e); + } catch (Exception e) { + if (e.getClass().getName().contains("DocumentException")) { //$NON-NLS= -1$ + throw new HibernateConsoleRuntimeException( + Messages.ConsoleConfiguration_could_not_parse_configuration + + resourceName, e); + } else { + throw new HibernateConsoleRuntimeException( + Messages.ConsoleConfiguration_could_not_parse_configuration + + resourceName, e); + } } finally { try { if (stream !=3D null) @@ -312,6 +316,8 @@ InputStream is =3D null; try { is =3D ConfigHelper.getResourceAsStream(resource); + } catch (HibernateConsoleRuntimeException hcre) { + // just ignore } catch (RuntimeException he) { // TODO: RuntimeException ? - find correct solution if (he.getClass().getName().contains("HibernateException")) { //$NON-NL= S-1$ Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/cfg/reveng/ReverseEngineerin= gSettings.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/reveng/ReverseEngineeringSetti= ngs.java 2010-05-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/reveng/ReverseEngineeringSetti= ngs.java 2010-05-12 16:34:01 UTC (rev 22041) @@ -1,5 +1,6 @@ package org.hibernate.mediator.x.cfg.reveng; = +import org.hibernate.mediator.HibernateConsoleRuntimeException; import org.hibernate.mediator.base.HObject; = public class ReverseEngineeringSettings extends HObject { @@ -10,7 +11,24 @@ } = public static ReverseEngineeringSettings newInstance(ReverseEngineeringSt= rategy reverseEngineeringStrategy) { - return new ReverseEngineeringSettings(newInstance(CL, reverseEngineering= Strategy)); + ReverseEngineeringSettings resNewInstance =3D null; + HibernateConsoleRuntimeException hcre =3D null; + try { + resNewInstance =3D new ReverseEngineeringSettings(newInstance(CL, rever= seEngineeringStrategy)); + } catch (HibernateConsoleRuntimeException hcre1) { + hcre =3D hcre1; + } + if (resNewInstance =3D=3D null) { // hibernate 3.5 & new hibernate-tools + try { + resNewInstance =3D new ReverseEngineeringSettings(newInstance(CL)); + } catch (HibernateConsoleRuntimeException hcre2) { + //hcre =3D hcre2; + } + } + if (resNewInstance =3D=3D null) { + throw hcre; + } + return resNewInstance; } = public ReverseEngineeringSettings setDefaultPackageName(String defaultPac= kageName) { @@ -24,7 +42,11 @@ } = public ReverseEngineeringSettings setDetectOneToOne(boolean b) { - invoke(mn(), b); + try { + invoke(mn(), b); + } catch (HibernateConsoleRuntimeException hcre1) { + // hibernate 3.5 & new hibernate-tools + } return this; } = Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/hql/antlr/HqlBaseLexer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/hql/antlr/HqlBaseLexer.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/hql/antlr/HqlBaseLexer.java 2010-0= 5-12 16:34:01 UTC (rev 22041) @@ -0,0 +1,40 @@ +package org.hibernate.mediator.x.hql.antlr; + +import java.io.Reader; + +import org.hibernate.mediator.base.HObject; +import org.hibernate.mediator.x.hql.antlr.HqlSqlTokenTypes; + +import antlr.Token; + +public class HqlBaseLexer extends HObject { + + public static final String CL =3D "org.hibernate.hql.antlr.HqlBaseLexer";= //$NON-NLS-1$ + = + public HqlBaseLexer(Object hqlBaseLexer) { + super(hqlBaseLexer, CL); + } + + public static HqlBaseLexer newInstance(Reader in) { + return new HqlBaseLexer(HObject.newInstance(CL, in)); + } + + private Token nextToken() { + try { + return (Token)invoke(mn()); + } catch (Exception e) { + //if (e.getClass().getName().contains("TokenStreamException")) { //$NON= -NLS-1$ + //} + } + return null; + } + = + public boolean isNextTokenIdent() { + Token token =3D nextToken(); + if (token !=3D null && token.getType() =3D=3D HqlSqlTokenTypes.IDENT) { + return true; + } = + return false; + } + +} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/metadata/ClassMetadata.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/metadata/ClassMetadata.java 2010-0= 5-12 15:34:42 UTC (rev 22040) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/metadata/ClassMetadata.java 2010-0= 5-12 16:34:01 UTC (rev 22041) @@ -54,5 +54,4 @@ public Serializable getIdentifier(Object entity, EntityMode pojo) { return (Serializable)invoke(mn(), entity, pojo); } - } Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/ExporterFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/tool/hbm2x/ExporterFactory.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/tool/hbm2x/ExporterFactory.java 20= 10-05-12 16:34:01 UTC (rev 22041) @@ -0,0 +1,17 @@ +package org.hibernate.mediator.x.tool.hbm2x; + +public class ExporterFactory { + @SuppressWarnings("unchecked") + public static Exporter createExporterStub(Object exporter) { + if (exporter =3D=3D null) { + return null; + } + final Class cl =3D exporter.getClass(); + if (0 =3D=3D HibernateConfigurationExporter.CL.compareTo(cl.getName())) { + return new HibernateConfigurationExporter(exporter); + } else if (0 =3D=3D GenericExporter.CL.compareTo(cl.getName())) { + return new GenericExporter(exporter); + } + return new GenericExporter(exporter); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/util/XMLHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/util/XMLHelper.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/util/XMLHelper.java 2010-05-12 16:= 34:01 UTC (rev 22041) @@ -0,0 +1,28 @@ +package org.hibernate.mediator.x.util; + +import java.util.List; + +import org.dom4j.mediator.x.io.SAXReader; +import org.hibernate.mediator.base.HObject; +import org.xml.sax.EntityResolver; + +public class XMLHelper extends HObject { + = + public static final String CL =3D "org.hibernate.util.XMLHelper"; //$NON-= NLS-1$ + + public static final EntityResolver DEFAULT_DTD_RESOLVER =3D (EntityResolv= er)HObject.readStaticFieldValue(CL, "DEFAULT_DTD_RESOLVER"); //$NON-NLS-1$ + + protected XMLHelper(Object xmlHelper) { + super(xmlHelper, CL); + } + + public static XMLHelper newInstance() { + return new XMLHelper(HObject.newInstance(CL)); + } + + @SuppressWarnings("unchecked") + public SAXReader createSAXReader(String file, List errorsList, EntityReso= lver entityResolver) { + Object obj =3D invoke(mn(), file, errorsList, entityResolver); + return SAXReader.create(obj); + } +} --===============1903697816960958377==-- From jbosstools-commits at lists.jboss.org Wed May 12 12:38:13 2010 Content-Type: multipart/mixed; boundary="===============3354923596937734917==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22042 - branches/modular_build. Date: Wed, 12 May 2010 12:38:13 -0400 Message-ID: <201005121638.o4CGcDlF021430@svn01.web.mwc.hst.phx2.redhat.com> --===============3354923596937734917== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-12 12:38:12 -0400 (Wed, 12 May 2010) New Revision: 22042 Added: branches/modular_build/pom-all-components.xml Log: new all-in-one pom.xml for use with Hudson Added: branches/modular_build/pom-all-components.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/pom-all-components.xml (= rev 0) +++ branches/modular_build/pom-all-components.xml 2010-05-12 16:38:12 UTC (= rev 22042) @@ -0,0 +1,47 @@ + + 4.0.0 + + parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + trunk + 0.0.1-SNAPSHOT + pom + + + tests + common + flow + jbpm + jmx + archives + as + drools + bpel + smooks + freemarker + profiler + portlet + modeshape + xulrunner + jst + vpe + jsf + esb + tptp + ws + cdi + struts + hibernatetools + seam + examples + birt + maven + site + + + = --===============3354923596937734917==-- From jbosstools-commits at lists.jboss.org Wed May 12 13:02:41 2010 Content-Type: multipart/mixed; boundary="===============1912583412635071920==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22043 - in trunk/cdi: plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 1 other directories. Date: Wed, 12 May 2010 13:02:41 -0400 Message-ID: <201005121702.o4CH2fJT025491@svn01.web.mwc.hst.phx2.redhat.com> --===============1912583412635071920== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-12 13:02:40 -0400 (Wed, 12 May 2010) New Revision: 22043 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : Managed bean class annotated @Specializes does not directly extend the be= an class of another managed bean Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-12 16:38:12 UTC (rev 220= 42) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-12 17:02:40 UTC (rev 220= 43) @@ -745,6 +745,43 @@ CDICorePlugin.getDefault().logError(e); } } + /* + * 3.1.4. Specializing a managed bean + * - managed bean class annotated @Specializes does not directly extend= the bean class of another managed bean + */ + IAnnotationDeclaration specializesDeclaration =3D bean.getSpecializesAnn= otationDeclaration(); + if(specializesDeclaration!=3Dnull) { + try { + IBean sBean =3D bean.getSpecializedBean(); + if(sBean!=3Dnull) { + if(sBean instanceof ISessionBean || sBean.getAnnotation(CDIConstants.= STATELESS_ANNOTATION_TYPE_NAME)!=3Dnull) { + // The specializing bean directly extends an enterprise bean class + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CD= IPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, specializesDeclaration, bea= n.getResource()); + } else { + // Validate the specializing bean extends a non simple bean + boolean hasDefaultConstructor =3D true; + IMethod[] methods =3D sBean.getBeanClass().getMethods(); + for (IMethod method : methods) { + if(method.isConstructor()) { + if(Flags.isPublic(method.getFlags()) && method.getParameterNames()= .length=3D=3D0) { + hasDefaultConstructor =3D true; + break; + } + hasDefaultConstructor =3D false; + } + } + if(!hasDefaultConstructor) { + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, C= DIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, specializesDeclaration, be= an.getResource()); + } + } + } else { + // The specializing bean extends nothing + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDI= Preferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, specializesDeclaration, bean= .getResource()); + } + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + } } = private void validateInterceptor(IInterceptor interceptor) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-12 16:38:12 UTC (rev 22042) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-12 17:02:40 UTC (rev 22043) @@ -35,14 +35,14 @@ - managed bean with a public field declares any scope other than @Dependent - managed bean with a parameterized bean class declares any scope other th= an @Dependent = +3.1.4. Specializing a managed bean +- managed bean class annotated @Specializes does not directly extend = + the bean class of another managed bean = = = = = -3.1.4. Specializing a managed bean -- managed bean class annotated @Specializes does not directly extend = - the bean class of another managed bean = 3.2. Session beans - session bean specifies an illegal scope (a stateless session bean must b= elong = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-12 16:38:12 UTC (rev 22042) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-12 17:02:40 UTC (rev 22043) @@ -119,20 +119,20 @@ CDICorePlugin.PLUGIN_ID ); = -// private static SectionDescription SECTION_SPECIALIZATION =3D new Sectio= nDescription( -// CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_special= izing, -// new String[][]{ -// {CDIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDIPreferencesMes= sages.CDIValidatorConfigurationBlock_pb_illegalSpecializingManagedBean_labe= l}, + private static SectionDescription SECTION_SPECIALIZATION =3D new SectionD= escription( + CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_specializ= ing, + new String[][]{ + {CDIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_illegalSpecializingManagedBean_label}, // {CDIPreferences.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIPreferencesMes= sages.CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_labe= l}, // {CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label}, // {CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferencesMes= sages.CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label= }, // {CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreference= sMessages.CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBe= an_label}, // {CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferencesMes= sages.CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_lab= el}, // {CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label}, -// }, -// CDICorePlugin.PLUGIN_ID -// ); -// + }, + CDICorePlugin.PLUGIN_ID + ); + private static SectionDescription SECTION_MISCELLANEOUS =3D new SectionDe= scription( CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_miscellane= ous, new String[][]{ @@ -149,7 +149,7 @@ SECTION_SCOPE, SECTION_MEMBER, SECTION_INTERCEPTOR, -// SECTION_SPECIALIZATION, + SECTION_SPECIALIZATION, SECTION_MISCELLANEOUS }; = Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-12 16:38:12 UTC (rev 22042) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-12 17:02:40 UTC (rev 22043) @@ -218,6 +218,54 @@ } = /** + * 3.1.4. Specializing a managed bean + * - managed bean class annotated @Specializes does not directly extend = the bean class of another managed bean + * (Test a specializing bean extending a non simple bean) = + * = + * @throws Exception + */ + public void testSpecializingClassExtendsNonSimpleBean() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /inheritance/specialization/simple/broken/noextend3/Cow_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_B= EAN, 21); + } + + /** + * 3.1.4. Specializing a managed bean + * - managed bean class annotated @Specializes does not directly extend = the bean class of another managed bean + * (Test a specializing bean extending nothing) = + * = + * @throws Exception + */ + public void testSpecializingClassDirectlyExtendsNothing() throws Exceptio= n { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /inheritance/specialization/simple/broken/noextend2/Cow_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_B= EAN, 21); + } + + /** + * 3.1.4. Specializing a managed bean + * - managed bean class annotated @Specializes does not directly extend = the bean class of another managed bean + * (Test a specializing bean directly extending an enterprise bean cla= ss) = + * = + * @throws Exception + */ + public void testSpecializingClassDirectlyExtendsEnterpriseBean() throws E= xception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /inheritance/specialization/simple/broken/extendejb/Tractor_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_B= EAN, 21); + } + + /** + * 3.1.4. Specializing a managed bean + * - managed bean class annotated @Specializes does not directly extend = the bean class of another managed bean + * (Test a specializing bean implementing an interface and extending n= othing) = + * = + * @throws Exception + */ + public void testSpecializingClassImplementsInterfaceAndExtendsNothing() t= hrows Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /inheritance/specialization/simple/broken/noextend1/Donkey_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_B= EAN, 21); + } + + /** * 3.5.1. Declaring a resource * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) * = --===============1912583412635071920==-- From jbosstools-commits at lists.jboss.org Wed May 12 18:53:22 2010 Content-Type: multipart/mixed; boundary="===============6862813826563618309==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22044 - in branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui: internal/libprov and 1 other directory. Date: Wed, 12 May 2010 18:53:22 -0400 Message-ID: <201005122253.o4CMrMDG005270@svn01.web.mwc.hst.phx2.redhat.com> --===============6862813826563618309== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-12 18:53:22 -0400 (Wed, 12 May 2010) New Revision: 22044 Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src= /org/jboss/tools/portlet/ui/PortletUIActivator.java branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src= /org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProvide= rInstallPanel.java Log: https://jira.jboss.org/jira/browse/JBIDE-6223 EPP 5.0 as Portlet Target Run= time Provider Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .ui/src/org/jboss/tools/portlet/ui/PortletUIActivator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/sr= c/org/jboss/tools/portlet/ui/PortletUIActivator.java 2010-05-12 17:02:40 UT= C (rev 22043) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/sr= c/org/jboss/tools/portlet/ui/PortletUIActivator.java 2010-05-12 22:53:22 UT= C (rev 22044) @@ -18,6 +18,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualFile; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.server.core.IRuntime; @@ -115,23 +116,7 @@ IProject project =3D ProjectUtilities.getProject(projectName); try { IFacetedProject facetedProject =3D ProjectFacetsManager.create(project= ); - if (facetedProject !=3D null) { - org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRunti= me =3D facetedProject.getPrimaryRuntime(); - if (facetRuntime =3D=3D null) { - return null; - } - IRuntime runtime =3D PortletCoreActivator.getRuntime(facetRuntime); - if (runtime =3D=3D null) { - return null; - } - IJBossServerRuntime jbossRuntime =3D (IJBossServerRuntime)runtime.loa= dAdapter(IJBossServerRuntime.class, new NullProgressMonitor()); - if (jbossRuntime =3D=3D null) { - return null; - } - IPath jbossLocation =3D runtime.getLocation(); - IPath configPath =3D jbossLocation.append(IJBossServerConstants.SERVE= R).append(jbossRuntime.getJBossConfiguration()); - return configPath; - } + return getJBossConfigPath(facetedProject); } catch (CoreException e) { PortletUIActivator.log(e); } @@ -139,6 +124,27 @@ return null; } = + public static IPath getJBossConfigPath(IFacetedProjectBase facetedProject= ) { + if (facetedProject !=3D null) { + org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime= =3D facetedProject.getPrimaryRuntime(); + if (facetRuntime =3D=3D null) { + return null; + } + IRuntime runtime =3D PortletCoreActivator.getRuntime(facetRuntime); + if (runtime =3D=3D null) { + return null; + } + IJBossServerRuntime jbossRuntime =3D (IJBossServerRuntime)runtime.loadA= dapter(IJBossServerRuntime.class, new NullProgressMonitor()); + if (jbossRuntime =3D=3D null) { + return null; + } + IPath jbossLocation =3D runtime.getLocation(); + IPath configPath =3D jbossLocation.append(IJBossServerConstants.SERVER)= .append(jbossRuntime.getJBossConfiguration()); + return configPath; + } + return null; + } + = public static boolean isJBossPortalRuntime(IDataModel model) { IPath configPath =3D getJBossConfigPath(model); if (configPath =3D=3D null) { Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntime= ProviderInstallPanel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/sr= c/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProvid= erInstallPanel.java 2010-05-12 17:02:40 UTC (rev 22043) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/sr= c/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProvid= erInstallPanel.java 2010-05-12 22:53:22 UTC (rev 22044) @@ -1,8 +1,10 @@ package org.jboss.tools.portlet.ui.internal.libprov; = +import java.io.File; import java.util.ArrayList; import java.util.List; = +import org.eclipse.core.runtime.IPath; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -16,6 +18,7 @@ import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Text; +import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase; import org.jboss.tools.portlet.core.IPortletConstants; import org.jboss.tools.portlet.core.libprov.JSFPortletbridgeRuntimeLibrary= ProviderInstallOperationConfig; import org.jboss.tools.portlet.ui.Messages; @@ -68,6 +71,22 @@ } config.setPortletbridgeHome(portletbridgeRuntime); } + if (portletbridgeRuntime =3D=3D null || portletbridgeRuntime.length() = =3D=3D 0 ) { + IFacetedProjectBase facetedProject =3D config.getFacetedProject(); + IPath configPath =3D PortletUIActivator.getJBossConfigPath(facetedProje= ct); + if (configPath !=3D null) { + IPath portalPath =3D configPath.append(IPortletConstants.SERVER_DEFAUL= T_DEPLOY_GATEIN); + File portalFile =3D portalPath.toFile(); + if (portalFile !=3D null && portalFile.exists()) { + IPath eppHome =3D configPath.removeLastSegments(3); + IPath pbPath =3D eppHome.append("portletbridge"); //$NON-NLS-1$ + File pbFile =3D pbPath.toFile(); + if (pbFile !=3D null && pbFile.exists()) { + portletbridgeRuntime =3D pbFile.getAbsolutePath(); + } + } + } + } folderText.setText(portletbridgeRuntime); = Button folderButton =3D new Button(portletBridgeGroup, SWT.PUSH); --===============6862813826563618309==-- From jbosstools-commits at lists.jboss.org Wed May 12 19:01:18 2010 Content-Type: multipart/mixed; boundary="===============4649568112980077096==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22045 - in trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui: internal/libprov and 1 other directory. Date: Wed, 12 May 2010 19:01:18 -0400 Message-ID: <201005122301.o4CN1Ii0006910@svn01.web.mwc.hst.phx2.redhat.com> --===============4649568112980077096== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-12 19:01:17 -0400 (Wed, 12 May 2010) New Revision: 22045 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/por= tlet/ui/PortletUIActivator.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/por= tlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java Log: https://jira.jboss.org/jira/browse/JBIDE-6223 EPP 5.0 as Portlet Target Run= time Provider Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/to= ols/portlet/ui/PortletUIActivator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/po= rtlet/ui/PortletUIActivator.java 2010-05-12 22:53:22 UTC (rev 22044) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/po= rtlet/ui/PortletUIActivator.java 2010-05-12 23:01:17 UTC (rev 22045) @@ -18,6 +18,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualFile; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.server.core.IRuntime; @@ -115,23 +116,7 @@ IProject project =3D ProjectUtilities.getProject(projectName); try { IFacetedProject facetedProject =3D ProjectFacetsManager.create(project= ); - if (facetedProject !=3D null) { - org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRunti= me =3D facetedProject.getPrimaryRuntime(); - if (facetRuntime =3D=3D null) { - return null; - } - IRuntime runtime =3D PortletCoreActivator.getRuntime(facetRuntime); - if (runtime =3D=3D null) { - return null; - } - IJBossServerRuntime jbossRuntime =3D (IJBossServerRuntime)runtime.loa= dAdapter(IJBossServerRuntime.class, new NullProgressMonitor()); - if (jbossRuntime =3D=3D null) { - return null; - } - IPath jbossLocation =3D runtime.getLocation(); - IPath configPath =3D jbossLocation.append(IJBossServerConstants.SERVE= R).append(jbossRuntime.getJBossConfiguration()); - return configPath; - } + return getJBossConfigPath(facetedProject); } catch (CoreException e) { PortletUIActivator.log(e); } @@ -139,6 +124,27 @@ return null; } = + public static IPath getJBossConfigPath(IFacetedProjectBase facetedProject= ) { + if (facetedProject !=3D null) { + org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime= =3D facetedProject.getPrimaryRuntime(); + if (facetRuntime =3D=3D null) { + return null; + } + IRuntime runtime =3D PortletCoreActivator.getRuntime(facetRuntime); + if (runtime =3D=3D null) { + return null; + } + IJBossServerRuntime jbossRuntime =3D (IJBossServerRuntime)runtime.loadA= dapter(IJBossServerRuntime.class, new NullProgressMonitor()); + if (jbossRuntime =3D=3D null) { + return null; + } + IPath jbossLocation =3D runtime.getLocation(); + IPath configPath =3D jbossLocation.append(IJBossServerConstants.SERVER)= .append(jbossRuntime.getJBossConfiguration()); + return configPath; + } + return null; + } + = public static boolean isJBossPortalRuntime(IDataModel model) { IPath configPath =3D getJBossConfigPath(model); if (configPath =3D=3D null) { Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/to= ols/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/po= rtlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java = 2010-05-12 22:53:22 UTC (rev 22044) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/po= rtlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java = 2010-05-12 23:01:17 UTC (rev 22045) @@ -1,8 +1,10 @@ package org.jboss.tools.portlet.ui.internal.libprov; = +import java.io.File; import java.util.ArrayList; import java.util.List; = +import org.eclipse.core.runtime.IPath; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.swt.SWT; import org.eclipse.swt.events.ModifyEvent; @@ -16,6 +18,7 @@ import org.eclipse.swt.widgets.DirectoryDialog; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Text; +import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase; import org.jboss.tools.portlet.core.IPortletConstants; import org.jboss.tools.portlet.core.libprov.JSFPortletbridgeRuntimeLibrary= ProviderInstallOperationConfig; import org.jboss.tools.portlet.ui.Messages; @@ -68,6 +71,22 @@ } config.setPortletbridgeHome(portletbridgeRuntime); } + if (portletbridgeRuntime =3D=3D null || portletbridgeRuntime.length() = =3D=3D 0 ) { + IFacetedProjectBase facetedProject =3D config.getFacetedProject(); + IPath configPath =3D PortletUIActivator.getJBossConfigPath(facetedProje= ct); + if (configPath !=3D null) { + IPath portalPath =3D configPath.append(IPortletConstants.SERVER_DEFAUL= T_DEPLOY_GATEIN); + File portalFile =3D portalPath.toFile(); + if (portalFile !=3D null && portalFile.exists()) { + IPath eppHome =3D configPath.removeLastSegments(3); + IPath pbPath =3D eppHome.append("portletbridge"); //$NON-NLS-1$ + File pbFile =3D pbPath.toFile(); + if (pbFile !=3D null && pbFile.exists()) { + portletbridgeRuntime =3D pbFile.getAbsolutePath(); + } + } + } + } folderText.setText(portletbridgeRuntime); = Button folderButton =3D new Button(portletBridgeGroup, SWT.PUSH); --===============4649568112980077096==-- From jbosstools-commits at lists.jboss.org Thu May 13 00:51:23 2010 Content-Type: multipart/mixed; boundary="===============8812694988415601847==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22046 - branches/modular_build/drools. Date: Thu, 13 May 2010 00:51:23 -0400 Message-ID: <201005130451.o4D4pN9Z019927@svn01.web.mwc.hst.phx2.redhat.com> --===============8812694988415601847== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-13 00:51:23 -0400 (Thu, 13 May 2010) New Revision: 22046 Modified: branches/modular_build/drools/build.xml Log: fix defn of COMMON_TOOLS dir Modified: branches/modular_build/drools/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/build.xml 2010-05-12 23:01:17 UTC (rev 22= 045) +++ branches/modular_build/drools/build.xml 2010-05-13 04:51:23 UTC (rev 22= 046) @@ -15,6 +15,15 @@ WORKINGDIR =3D ${WORKINGDIR} = + + + + + + + + COMMON_TOOLS =3D ${COMMON_TOOLS} + @@ -37,10 +46,13 @@ = - + " + /> = --===============8812694988415601847==-- From jbosstools-commits at lists.jboss.org Thu May 13 00:57:47 2010 Content-Type: multipart/mixed; boundary="===============3673580393227791179==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22047 - branches/modular_build/drools. Date: Thu, 13 May 2010 00:57:47 -0400 Message-ID: <201005130457.o4D4vlRo020416@svn01.web.mwc.hst.phx2.redhat.com> --===============3673580393227791179== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-13 00:57:47 -0400 (Thu, 13 May 2010) New Revision: 22047 Modified: branches/modular_build/drools/build.xml Log: remove trailing slash Modified: branches/modular_build/drools/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/build.xml 2010-05-13 04:51:23 UTC (rev 22= 046) +++ branches/modular_build/drools/build.xml 2010-05-13 04:57:47 UTC (rev 22= 047) @@ -5,7 +5,7 @@ = - + --===============3673580393227791179==-- From jbosstools-commits at lists.jboss.org Thu May 13 00:58:42 2010 Content-Type: multipart/mixed; boundary="===============3160304903819840218==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22048 - branches/modular_build/build. Date: Thu, 13 May 2010 00:58:42 -0400 Message-ID: <201005130458.o4D4wgwq020436@svn01.web.mwc.hst.phx2.redhat.com> --===============3160304903819840218== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-13 00:58:42 -0400 (Thu, 13 May 2010) New Revision: 22048 Modified: branches/modular_build/build/build.xml Log: hide debug comment Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-13 04:57:47 UTC (rev 220= 47) +++ branches/modular_build/build/build.xml 2010-05-13 04:58:42 UTC (rev 220= 48) @@ -1195,7 +1195,7 @@ = - ${WORKINGDIR}/${COMPONENT}/features + ${WORKINGDIR}/${COMPONENT}/features --===============3160304903819840218==-- From jbosstools-commits at lists.jboss.org Thu May 13 02:52:51 2010 Content-Type: multipart/mixed; boundary="===============3713471871026652140==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22049 - in branches/jbosstools-3.1.x/hibernatetools: tests/org.jboss.tools.hibernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test and 1 other directory. Date: Thu, 13 May 2010 02:52:51 -0400 Message-ID: <201005130652.o4D6qpk9014036@svn01.web.mwc.hst.phx2.redhat.com> --===============3713471871026652140== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgeraskov Date: 2010-05-13 02:52:51 -0400 (Thu, 13 May 2010) New Revision: 22049 Modified: branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hiberna= te.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hiberna= te.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java branches/jbosstools-3.1.x/hibernatetools/tests/org.jboss.tools.hibernate= .ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test/OrmDia= gramTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6186 Modified: branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.= hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibern= ate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java 20= 10-05-13 04:58:42 UTC (rev 22048) +++ branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibern= ate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java 20= 10-05-13 06:52:51 UTC (rev 22049) @@ -153,7 +153,8 @@ = @Override public String getKey() { - return Utils.getName(getOrmElement()); + //fix for https://jira.jboss.org/jira/browse/JBIDE-6186 + return Utils.getName(getOrmElement()).replaceAll("\\$", ".."); //$NON-NL= S-1$ //$NON-NLS-2$ } = public void setFocus() { Modified: branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.= hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibern= ate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java 20= 10-05-13 04:58:42 UTC (rev 22048) +++ branches/jbosstools-3.1.x/hibernatetools/plugins/org.jboss.tools.hibern= ate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java 20= 10-05-13 06:52:51 UTC (rev 22049) @@ -57,7 +57,7 @@ res =3D getTableName((Table)obj); } else if (obj instanceof Property) { Property property =3D (Property)obj; - res =3D property.getPersistentClass().getEntityName() + "." + property.= getName(); //$NON-NLS-1$ + res =3D getName(property.getPersistentClass()) + "." + property.getName= (); //$NON-NLS-1$ } else if (obj instanceof SimpleValue) { SimpleValue sv =3D (SimpleValue)obj; res =3D getTableName(sv.getTable()) + "." + sv.getForeignKeyName(); //$= NON-NLS-1$ Modified: branches/jbosstools-3.1.x/hibernatetools/tests/org.jboss.tools.hi= bernate.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test= /OrmDiagramTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/hibernatetools/tests/org.jboss.tools.hibernat= e.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test/OrmDi= agramTest.java 2010-05-13 04:58:42 UTC (rev 22048) +++ branches/jbosstools-3.1.x/hibernatetools/tests/org.jboss.tools.hibernat= e.ui.test/src/org/jboss/tools/hibernate/ui/diagram/editors/model/test/OrmDi= agramTest.java 2010-05-13 06:52:51 UTC (rev 22049) @@ -47,20 +47,21 @@ rts.add(ioe); final List emptyList =3D new ArrayList(); final Iterator emptyListIterator =3D emptyList.iterator(); - + //see https://jira.jboss.org/jira/browse/JBIDE-6186 + final String innerIntricateName =3D "myInner$Id"; context.checking(new Expectations() { { oneOf(ioe).getEntityName(); - will(returnValue("testEntityName")); //$NON-NLS-1$ + will(returnValue(innerIntricateName)); = allowing(consoleConfig).getConfiguration(); will(returnValue(config)); = oneOf(ioe).getEntityName(); - will(returnValue("")); //$NON-NLS-1$ + will(returnValue(innerIntricateName)); = oneOf(ioe).getEntityName(); - will(returnValue("")); //$NON-NLS-1$ + will(returnValue(innerIntricateName)); = oneOf(ioe).getIdentifierProperty(); will(returnValue(null)); @@ -93,7 +94,7 @@ will(returnValue("CCName")); //$NON-NLS-1$ = allowing(ioe).getEntityName(); - will(returnValue("")); //$NON-NLS-1$ + will(returnValue(innerIntricateName)); } }); final OrmDiagram ormDiagram =3D new OrmDiagram("", rts) { //$NON-NLS-1$ @@ -101,7 +102,7 @@ return consoleConfig; } }; - ormDiagram.saveInFile(); + ormDiagram.saveInXmlFile(); // test is the folder created File folder =3D new File(ormDiagram.getStoreFolderPath().toOSString()); assertTrue(folder.exists() && folder.isDirectory()); --===============3713471871026652140==-- From jbosstools-commits at lists.jboss.org Thu May 13 04:30:55 2010 Content-Type: multipart/mixed; boundary="===============8380605881879006872==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22050 - in trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces: META-INF and 2 other directories. Date: Thu, 13 May 2010 04:30:55 -0400 Message-ID: <201005130830.o4D8Utic005660@svn01.web.mwc.hst.phx2.redhat.com> --===============8380605881879006872== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2010-05-13 04:30:54 -0400 (Thu, 13 May 2010) New Revision: 22050 Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/lib/ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/lib/jhighlight-1.0.j= ar Removed: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/lib/jhighlight-1.0.j= ar Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/.classpath trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.MF trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/build.properties trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/= jsf/vpe/richfaces/template/RichFacesInsertTemplate.java Log: https://jira.jboss.org/jira/browse/JBIDE-6217 , reverting some changes from= https://jira.jboss.org/jira/browse/JBIDE-1636 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/.classpath 2010-05-= 13 06:52:51 UTC (rev 22049) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/.classpath 2010-05-= 13 08:30:54 UTC (rev 22050) @@ -1,7 +1,8 @@ - - - - - - - + + + + + + + + Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANI= FEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.M= F 2010-05-13 06:52:51 UTC (rev 22049) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/META-INF/MANIFEST.M= F 2010-05-13 08:30:54 UTC (rev 22050) @@ -18,7 +18,8 @@ org.jboss.tools.vpe.xulrunner Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 -Bundle-ClassPath: . +Bundle-ClassPath: lib/jhighlight-1.0.jar, + . Export-Package: org.jboss.tools.jsf.vpe.richfaces, org.jboss.tools.jsf.vpe.richfaces.template.util Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/build.propert= ies =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/build.properties 20= 10-05-13 06:52:51 UTC (rev 22049) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/build.properties 20= 10-05-13 08:30:54 UTC (rev 22050) @@ -5,6 +5,7 @@ resources/,\ templates/,\ plugin.xml,\ + lib/jhighlight-1.0.jar,\ plugin.properties,\ about.html src.includes =3D src/,\ Copied: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/lib (from rev 2= 1511, trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/lib) Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/lib/jhighlight= -1.0.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Copied: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/lib/jhighlight-= 1.0.jar (from rev 21511, trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richface= s/lib/jhighlight-1.0.jar) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss= /tools/jsf/vpe/richfaces/template/RichFacesInsertTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools= /jsf/vpe/richfaces/template/RichFacesInsertTemplate.java 2010-05-13 06:52:5= 1 UTC (rev 22049) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools= /jsf/vpe/richfaces/template/RichFacesInsertTemplate.java 2010-05-13 08:30:5= 4 UTC (rev 22050) @@ -40,6 +40,9 @@ import org.w3c.dom.Text; import org.xml.sax.SAXException; = +import com.uwyn.jhighlight.renderer.Renderer; +import com.uwyn.jhighlight.renderer.XhtmlRendererFactory; + /** * = * @author ezheleznyakov(a)exadel.com @@ -138,16 +141,26 @@ } } = - if (highlightValue =3D=3D null) { + if ((highlightValue =3D=3D null) || (!searchInSupportedTypes(highlightVal= ue))){ // finalStr =3D finalStr.replace('\n', ' '); nsIDOMText text =3D visualDocument.createTextNode(finalStr); div.appendChild(text); return vpeCreationData; } = - div.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, ERROR_MESSAGE_STYLE); - nsIDOMText text =3D visualDocument.createTextNode(HIGHLIGHT_ERROR_MESSAGE= ); - div.appendChild(text); + Renderer renderer =3D XhtmlRendererFactory.getRenderer(highlightValue); + String transformStr =3D null; + try { + transformStr =3D renderer.highlight("", finalStr, UTF8, false); //$NO= N-NLS-1$ + transformStr =3D convertString(transformStr, highlightValue); + Node node =3D parseTransformString(transformStr); + buildVisualNode(node, div); + } catch (IOException e1) { + div.setAttribute(HtmlComponentUtil.HTML_STYLE_ATTR, ERROR_MESSAGE_STYLE); + nsIDOMText text =3D visualDocument.createTextNode(HIGHLIGHT_ERROR_MES= SAGE); + div.appendChild(text); + return vpeCreationData; + } return vpeCreationData; } = @@ -228,6 +241,30 @@ = /** * = + * @param highlightValue + * value of highlight attribute + * @return true of highlight value correct + */ + + private boolean searchInSupportedTypes(String highlightValue) { + + if (highlightValue =3D=3D null) + return true; + + if (highlightValue.trim().equals(EMPTY_STRING)) + return false; + + Set set =3D XhtmlRendererFactory.getSupportedTypes(); + + for (Object object : set) + if (highlightValue.equalsIgnoreCase((String) object)) + return true; + + return false; + } + + /** + * = * @param node * @param el * @return --===============8380605881879006872==-- From jbosstools-commits at lists.jboss.org Thu May 13 06:33:49 2010 Content-Type: multipart/mixed; boundary="===============7595707442626702380==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22051 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory. Date: Thu, 13 May 2010 06:33:49 -0400 Message-ID: <201005131033.o4DAXnJJ031645@svn01.web.mwc.hst.phx2.redhat.com> --===============7595707442626702380== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-13 06:33:49 -0400 (Thu, 13 May 2010) New Revision: 22051 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/Parameter.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/ParameterDefinition.java Log: https://jira.jboss.org/jira/browse/JBIDE-6252 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/Parameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/Parameter.java 2010-05-13 08:30:54 UTC (rev 22050) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/Parameter.java 2010-05-13 10:33:49 UTC (rev 22051) @@ -72,4 +72,8 @@ return definition.getAnnotationPosition(annotationTypeName); } = + public Set getAnnotationTypes() { + return definition.getAnnotationTypes(); + } + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/ParameterDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/ParameterDefinition.java 2010-05-13 08:30:54 UTC = (rev 22050) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/ParameterDefinition.java 2010-05-13 10:33:49 UTC = (rev 22051) @@ -3,6 +3,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; = import org.jboss.tools.cdi.core.IAnnotated; import org.jboss.tools.cdi.core.IAnnotationDeclaration; @@ -50,6 +51,10 @@ return annotationsByTypeName.get(annotationTypeName); } = + public Set getAnnotationTypes() { + return annotationsByTypeName.keySet(); + } + public void setPosition(ITextSourceReference position) { this.position =3D position; } --===============7595707442626702380==-- From jbosstools-commits at lists.jboss.org Thu May 13 06:36:48 2010 Content-Type: multipart/mixed; boundary="===============2741479909274548068==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22052 - in trunk: jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/5042 and 5 other directories. Date: Thu, 13 May 2010 06:36:47 -0400 Message-ID: <201005131036.o4DAalQo032387@svn01.web.mwc.hst.phx2.redhat.com> --===============2741479909274548068== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2010-05-13 06:36:47 -0400 (Thu, 13 May 2010) New Revision: 22052 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/5042/ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/5042/JBIDE-5042.html trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf= /vpe/jsf/test/jbide/DnD_JBIDE5042Test.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/lib/ Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf= /vpe/jsf/test/JsfAllTests.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD= .java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/.classpath trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties Log: https://jira.jboss.org/jira/browse/JBIDE-6261 , https://jira.jboss.org/jira/browse/JBIDE-5042 : Create tests for DnD in VPE. Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/5042/JBIDE-5042.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/5042/JBIDE-5042.html (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/5042/JBIDE-5042.html 2010-05-13 10:36:47 UTC (rev 22052) @@ -0,0 +1,33 @@ + + + + +Insert title here + + + + + + + + + + + + + +
dddddd
dddddd
dddddd
dddddd
dddddd
dddddd
dddddd
dddddd
dddddd
dddddd
Dropable
dddddd
+ + \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/to= ols/jsf/vpe/jsf/test/JsfAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/JsfAllTests.java 2010-05-13 10:33:49 UTC (rev 22051) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/JsfAllTests.java 2010-05-13 10:36:47 UTC (rev 22052) @@ -15,6 +15,7 @@ = import org.jboss.tools.jsf.vpe.jsf.test.jbide.ChangeMessageBundleTest_JBID= E5818; import org.jboss.tools.jsf.vpe.jsf.test.jbide.ContextMenuDoubleInsertionTe= st_JBIDE3888; +import org.jboss.tools.jsf.vpe.jsf.test.jbide.DnD_JBIDE5042Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.EditFontFamilyTest_JBIDE5872; import org.jboss.tools.jsf.vpe.jsf.test.jbide.ExceptionInVPEComments_JBIDE= 5143; import org.jboss.tools.jsf.vpe.jsf.test.jbide.FacetProcessingTest; @@ -124,6 +125,7 @@ = TestSuite suite =3D new TestSuite("Tests for Vpe Jsf components"); //$NO= N-NLS-1$ // $JUnit-BEGIN$ + suite.addTestSuite(DnD_JBIDE5042Test.class); suite.addTestSuite(UnclosedELExpressionTest.class); suite.addTestSuite(TestContextPathResolution.class); suite.addTestSuite(JBIDE5920Test.class); Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools= /jsf/vpe/jsf/test/jbide/DnD_JBIDE5042Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/DnD_JBIDE5042Test.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/js= f/vpe/jsf/test/jbide/DnD_JBIDE5042Test.java 2010-05-13 10:36:47 UTC (rev 22= 052) @@ -0,0 +1,198 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ +package org.jboss.tools.jsf.vpe.jsf.test.jbide; + +import java.io.IOException; +import java.lang.reflect.Field; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.swt.graphics.Point; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion; +import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; +import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.dnd.VpeDnD; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.editor.VpeEditorPart; +import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; +import org.jboss.tools.vpe.editor.mozilla.MozillaEventAdapter; +import org.jboss.tools.vpe.ui.test.TestUtil; +import org.jboss.tools.vpe.ui.test.VpeTest; +import org.jmock.Expectations; +import org.jmock.Mockery; +import org.jmock.api.Invocation; +import org.jmock.lib.action.CustomAction; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMEventTarget; +import org.mozilla.interfaces.nsIDOMMouseEvent; +import org.mozilla.interfaces.nsIDOMNSUIEvent; +import org.mozilla.interfaces.nsIDOMNode; +import org.mozilla.interfaces.nsIDragService; +import org.mozilla.interfaces.nsIDragSession; +import org.mozilla.interfaces.nsIScriptableRegion; +import org.mozilla.interfaces.nsISupportsArray; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * Tests Drag&Drop functionality of the VPE. + * = + * @see JIRA Issue JBIDE-5042 ( https://jira.jboss.org/jira/browse/JBIDE-5= 042 ): + * "Enhance DnD support in VPE" + * = + * @author yradtsevich + */ +public class DnD_JBIDE5042Test extends VpeTest { + private static final String DROP_CONTAINER_ID =3D "cell_01"; + private static final String DRAG_ICON_ID =3D "dragIcon"; + private static final String DRAGGABLE_ID =3D "draggable"; //$NON-NLS-1$ + private static final String TEST_PAGE_NAME =3D "JBIDE/5042/JBIDE-5042.htm= l"; //$NON-NLS-1$ + private static final Point DRAG_POINT =3D new Point(0, 0); + /**Cells in the table are 100x100px. Thus this point means 'top of the se= cond cell'*/ + private static final Point DROP_POINT =3D new Point(150, 10); + private Mockery context =3D new Mockery(); + + public DnD_JBIDE5042Test(String name) { + super(name); + } + = + /** + * Try to open two pages in VPE and refresh them n times. + */ + public void testDnDWithMocks() throws Throwable { + setException(null); + + JSPMultiPageEditor editor =3D openPageInVpe(TEST_PAGE_NAME); + final MozillaEditor visualEditor =3D ((VpeEditorPart) editor.getVisualEd= itor()) + .getVisualEditor(); + VpeController controller =3D TestUtil.getVpeController(editor); + TestUtil.waitForJobs(); + = + final nsIDragService dragService =3D mock(nsIDragService.class); + final nsIDragSession dragSession =3D mock(nsIDragSession.class); + checking(new Expectations() {{ + allowing(dragService).getCurrentSession(); will(returnValue(dragSession= )); + allowing(dragSession).getSourceDocument(); will(returnValue(visualEdito= r.getDomDocument())); + allowing(dragSession).setCanDrop(with(any(Boolean.TYPE))); + }}); + replaceDragService(controller.getVpeDnD(), dragService); + + Element draggable =3D findSourceElementById(controller, DRAGGABLE_ID); + setSelectedNode(controller, draggable); + TestUtil.waitForJobs(); + + final nsIDOMElement dragIcon =3D controller.getXulRunnerEditor() + .getDOMDocument().getElementById(DRAG_ICON_ID); + + final nsIDOMMouseEvent mouseDownEvent =3D createMockMouseEvent( + DRAG_POINT, "mousedown", dragIcon, "mouseDown"); + final nsIDOMMouseEvent dragOverMouseEvent =3D createMockMouseEvent( + DROP_POINT, "dragover", null, "dragover"); + final nsIDOMMouseEvent dragDropMouseEvent =3D createMockMouseEvent( + DROP_POINT, "dragdrop", null, "dragdrop"); + + final MozillaEventAdapter eventListener =3D visualEditor.getMozillaEvent= Adapter(); + checking(new Expectations() {{ + allowing(dragService).invokeDragSession( + with(any(nsIDOMNode.class)), with(any(nsISupportsArray.class)), + with(any(nsIScriptableRegion.class)), with(any(Long.TYPE))); + will(new CustomAction("invokeDragSession") { + public Object invoke(Invocation invocation) throws Throwable { + eventListener.handleEvent(dragOverMouseEvent); + TestUtil.waitForJobs(); + eventListener.handleEvent(dragDropMouseEvent); + TestUtil.waitForJobs(); + return null; + } + }); + }}); + = + eventListener.handleEvent(mouseDownEvent); + TestUtil.waitForJobs(); + = + draggable =3D findSourceElementById(controller, DRAGGABLE_ID); + assertEquals(DROP_CONTAINER_ID, ((Element)draggable.getParentNode()).get= Attribute("id")); + + if (getException() !=3D null) { + throw getException(); + } + } + + private nsIDOMMouseEvent createMockMouseEvent(final Point mousePos, + final String type, final nsIDOMElement targetElement, String name) { + final nsIDOMMouseEvent mouseEvent =3D mock(nsIDOMMouseEvent.class, name = + "_nsIDOMMouseEvent"); + final nsIDOMEventTarget mouseEventTarget =3D mock(nsIDOMEventTarget.clas= s, name + "_nsIDOMEventTarget"); + final nsIDOMNSUIEvent mouseNsUIEvent =3D mock(nsIDOMNSUIEvent.class, nam= e + "_nsIDOMNSUIEvent"); + = + checking(new Expectations() {{ + allowing(mouseEvent).getType(); will(returnValue(type)); + allowing(mouseEvent).getButton(); will(returnValue(VpeController.LEFT_B= UTTON)); + allowing(mouseEvent).getTarget(); will(returnValue(mouseEventTarget)); + allowing(mouseEvent).queryInterface(nsIDOMMouseEvent.NS_IDOMMOUSEEVENT_= IID); will(returnValue(mouseEvent)); + allowing(mouseEventTarget).queryInterface(nsIDOMElement.NS_IDOMELEMENT_= IID); will(returnValue(targetElement)); + allowing(mouseEvent).queryInterface(nsIDOMNSUIEvent.NS_IDOMNSUIEVENT_II= D); will(returnValue(mouseNsUIEvent)); + allowing(mouseEvent).getClientX(); will(returnValue(mousePos.x)); + allowing(mouseEvent).getClientY(); will(returnValue(mousePos.y)); + allowing(mouseNsUIEvent).getPageX(); will(returnValue(mousePos.x)); + allowing(mouseNsUIEvent).getPageY(); will(returnValue(mousePos.y)); + allowing(mouseEvent).stopPropagation(); + allowing(mouseEvent).preventDefault(); + }}); + + return mouseEvent; + } + + private void replaceDragService(VpeDnD vpeDnD, nsIDragService dragService= ) throws Throwable { + Field dragServiceField =3D vpeDnD.getClass().getDeclaredField("dragServi= ce"); + dragServiceField.setAccessible(true); + dragServiceField.set(vpeDnD, dragService); + } + + private JSPMultiPageEditor openPageInVpe(final String pageName) throws Co= reException, + PartInitException, IOException { + IFile elementPageFile =3D (IFile) TestUtil.getComponentPath( + pageName, JsfAllTests.IMPORT_PROJECT_NAME); + IEditorInput input =3D new FileEditorInput(elementPageFile); + + JSPMultiPageEditor editor =3D (JSPMultiPageEditor) PlatformUI.getWorkben= ch() + .getActiveWorkbenchWindow().getActivePage().openEditor(input, + EDITOR_ID, true); + + return editor; + } + = + private void setSelectedNode(VpeController controller, Node node) { + IndexedRegion sourceNodeBounds =3D ((IndexedRegion)node); + = + controller.getPageContext().getSourceBuilder().getStructuredTextViewer() + .setSelectedRange(sourceNodeBounds.getStartOffset(), + sourceNodeBounds.getEndOffset() - sourceNodeBounds.getStartOffset()); + } + + /** @see org.jmock.Mockery#mock(java.lang.Class, java.lang.String) */ + public T mock(Class typeToMock, String name) { + return context.mock(typeToMock, name); + } + + /** @see org.jmock.Mockery#mock(java.lang.Class) */ + public T mock(Class typeToMock) { + return context.mock(typeToMock); + } + + /** @see org.jmock.Mockery#checking(Expectations) */ + public void checking(Expectations expectations) { + context.checking(expectations); + } +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd= /VpeDnD.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDn= D.java 2010-05-13 10:33:49 UTC (rev 22051) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDn= D.java 2010-05-13 10:36:47 UTC (rev 22052) @@ -238,8 +238,7 @@ } = private void highlightDropTargets(DropResolver dropResolver, nsIDOMMouseE= vent event) { - nsIDOMDocument document =3D vpeController.getVisualBuilder() - .getOriginalTargetNode(event).getOwnerDocument(); + nsIDOMDocument document =3D vpeController.getXulRunnerEditor().getDOMDoc= ument(); = Point clientCoords =3D getClientCoords(event); = Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/.classpath 2010-05-13 10:33= :49 UTC (rev 22051) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/.classpath 2010-05-13 10:36= :47 UTC (rev 22052) @@ -1,7 +1,10 @@ - - - - - - - + + + + + + + + + + Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-0= 5-13 10:33:49 UTC (rev 22051) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-0= 5-13 10:36:47 UTC (rev 22052) @@ -24,10 +24,18 @@ org.jboss.tools.tests;bundle-version=3D"2.0.0";visibility:=3Dreexport, org.jboss.tools.common.resref.core;bundle-version=3D"1.0.0" Bundle-ActivationPolicy: lazy -Bundle-ClassPath: vpe-ui-test.jar -Export-Package: org.jboss.tools.vpe.ui.test, +Bundle-ClassPath: vpe-ui-test.jar, + lib/jmock-2.5.1/jmock-2.5.1.jar, + lib/jmock-2.5.1/hamcrest-core-1.1.jar, + lib/jmock-2.5.1/hamcrest-library-1.1.jar +Export-Package: org.hamcrest, + org.jboss.tools.vpe.ui.test, org.jboss.tools.vpe.ui.test.dialog, - org.jboss.tools.vpe.ui.test.preferences + org.jboss.tools.vpe.ui.test.preferences, + org.jmock, + org.jmock.api, + org.jmock.internal, + org.jmock.lib.action Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties 2010-05-13= 10:33:49 UTC (rev 22051) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties 2010-05-13= 10:36:47 UTC (rev 22052) @@ -3,5 +3,6 @@ plugin.xml,\ plugin.properties,\ vpe-ui-test.jar,\ - resources/ + resources/,\ + lib/ source.vpe-ui-test.jar =3D src/ --===============2741479909274548068==-- From jbosstools-commits at lists.jboss.org Thu May 13 06:42:15 2010 Content-Type: multipart/mixed; boundary="===============7667359223575484378==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22053 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.test/lib: jmock-2.5.1 and 1 other directory. Date: Thu, 13 May 2010 06:42:14 -0400 Message-ID: <201005131042.o4DAgEkM000782@svn01.web.mwc.hst.phx2.redhat.com> --===============7667359223575484378== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2010-05-13 06:42:14 -0400 (Thu, 13 May 2010) New Revision: 22053 Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/lib/jmock-2.5.1/ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/lib/jmock-2.5.1/hamcrest-cor= e-1.1.jar trunk/vpe/tests/org.jboss.tools.vpe.ui.test/lib/jmock-2.5.1/hamcrest-lib= rary-1.1.jar trunk/vpe/tests/org.jboss.tools.vpe.ui.test/lib/jmock-2.5.1/jmock-2.5.1.= jar Log: https://jira.jboss.org/jira/browse/JBIDE-6261 , https://jira.jboss.org/jira/browse/JBIDE-5042 : Create tests for DnD in VPE. Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/lib/jmock-2.5.1/hamcrest= -core-1.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/lib/jmock-= 2.5.1/hamcrest-core-1.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/lib/jmock-2.5.1/hamcrest= -library-1.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/lib/jmock-= 2.5.1/hamcrest-library-1.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/lib/jmock-2.5.1/jmock-2.= 5.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/lib/jmock-= 2.5.1/jmock-2.5.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============7667359223575484378==-- From jbosstools-commits at lists.jboss.org Thu May 13 07:27:23 2010 Content-Type: multipart/mixed; boundary="===============2591104688744434719==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22054 - in trunk: esb/plugins/org.jboss.tools.esb.project.core and 2 other directories. Date: Thu, 13 May 2010 07:27:23 -0400 Message-ID: <201005131127.o4DBRNx6011439@svn01.web.mwc.hst.phx2.redhat.com> --===============2591104688744434719== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-13 07:27:22 -0400 (Thu, 13 May 2010) New Revision: 22054 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb= /project/ui/wizards/ESBProjectWizard.java trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb= /project/ui/wizards/pages/ESBProjectFirstPage.java Log: JBIDE-6056 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-05-13 10= :42:14 UTC (rev 22053) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-05-13 11= :27:22 UTC (rev 22054) @@ -769,7 +769,7 @@ id=3D"org.jboss.ide.eclipse.as.runtime.component" version=3D"6.0"/> - + Modified: trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2010-05-1= 3 10:42:14 UTC (rev 22053) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/plugin.xml 2010-05-1= 3 11:27:22 UTC (rev 22054) @@ -151,7 +151,7 @@ + version=3D"4.2,5.0,5.1,6.0"> Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/to= ols/esb/project/ui/wizards/ESBProjectWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/es= b/project/ui/wizards/ESBProjectWizard.java 2010-05-13 10:42:14 UTC (rev 220= 53) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/es= b/project/ui/wizards/ESBProjectWizard.java 2010-05-13 11:27:22 UTC (rev 220= 54) @@ -11,6 +11,7 @@ package org.jboss.tools.esb.project.ui.wizards; = import java.lang.reflect.InvocationTargetException; +import java.util.Set; = import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -31,7 +32,11 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; +import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCop= y; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEve= nt; +import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectLis= tener; import org.eclipse.wst.common.project.facet.core.runtime.IRuntime; import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWiz= ard; @@ -48,6 +53,13 @@ = public ESBProjectWizard() { super(); + Set current =3D getFacetedProjectWorkingCopy().get= ProjectFacets(); + getFacetedProjectWorkingCopy().addListener(new IFacetedProjectListener(){ + public void handleEvent(IFacetedProjectEvent event) { + System.out.println("runtime changed" + event.getWorkingCopy().getPrima= ryRuntime().getName()); + }}, IFacetedProjectEvent.Type.PRIMARY_RUNTIME_CHANGED); + IRuntime rt =3D getFacetedProjectWorkingCopy().getPrimaryRuntime(); + getFacetedProjectWorkingCopy().setProjectFacets(current); setWindowTitle(JBossESBUIMessages.ESBProjectWizard_Title); setDefaultPageImageDescriptor(ESBSharedImages.getImageDescriptor(ESBShar= edImages.WIZARD_NEW_PROJECT)); } @@ -64,6 +76,14 @@ return DataModelFactory.createDataModel(new JBossESBFacetProjectCreation= DataModelProvider()); } = + private IFacetedProjectWorkingCopy fpjwc; + = + @Override + public void setFacetedProjectWorkingCopy( final IFacetedProjectWorking= Copy fpjwc ) { + super.setFacetedProjectWorkingCopy(fpjwc); + this.fpjwc =3D fpjwc; + } + @Override protected IWizardPage createFirstPage() { return new ESBProjectFirstPage(model, "first.page"); //$NON-NLS-1$ Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/to= ols/esb/project/ui/wizards/pages/ESBProjectFirstPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/es= b/project/ui/wizards/pages/ESBProjectFirstPage.java 2010-05-13 10:42:14 UTC= (rev 22053) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/es= b/project/ui/wizards/pages/ESBProjectFirstPage.java 2010-05-13 11:27:22 UTC= (rev 22054) @@ -41,8 +41,12 @@ return ESBProjectConstant.ESB_PROJECT_FACET; } = - protected void createPresetPanel(Composite top) { - new Label(top, SWT.NONE); +// protected void createPresetPanel(Composite top) { +// new Label(top, SWT.NONE); +// } + protected void createPrimaryFacetComposite(Composite top) { + super.createPrimaryFacetComposite(top); + super.handlePrimaryFacetVersionSelectedEvent(); } = @Override --===============2591104688744434719==-- From jbosstools-commits at lists.jboss.org Thu May 13 08:32:35 2010 Content-Type: multipart/mixed; boundary="===============6708425770215640676==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22055 - in branches/jbosstools-3.1.x: esb/plugins/org.jboss.tools.esb.project.core and 2 other directories. Date: Thu, 13 May 2010 08:32:35 -0400 Message-ID: <201005131232.o4DCWZu1024551@svn01.web.mwc.hst.phx2.redhat.com> --===============6708425770215640676== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-13 08:32:34 -0400 (Thu, 13 May 2010) New Revision: 22055 Modified: branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/plugi= n.xml branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/p= lugin.xml branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src= /org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/src= /org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java Log: JBIDE-6056 branch Modified: branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.cor= e/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/plug= in.xml 2010-05-13 11:27:22 UTC (rev 22054) +++ branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/plug= in.xml 2010-05-13 12:32:34 UTC (rev 22055) @@ -769,7 +769,7 @@ id=3D"org.jboss.ide.eclipse.as.runtime.component" version=3D"6.0"/> - + Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project= .core/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/= plugin.xml 2010-05-13 11:27:22 UTC (rev 22054) +++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.core/= plugin.xml 2010-05-13 12:32:34 UTC (rev 22055) @@ -151,7 +151,7 @@ + version=3D"4.2,5.0,5.1,6.0"> Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project= .ui/src/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/sr= c/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2010-05-13 1= 1:27:22 UTC (rev 22054) +++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/sr= c/org/jboss/tools/esb/project/ui/wizards/ESBProjectWizard.java 2010-05-13 1= 2:32:34 UTC (rev 22055) @@ -11,6 +11,7 @@ package org.jboss.tools.esb.project.ui.wizards; = import java.lang.reflect.InvocationTargetException; +import java.util.Set; = import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; @@ -31,7 +32,11 @@ import org.eclipse.wst.common.frameworks.datamodel.IDataModel; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; +import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCop= y; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; +import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEve= nt; +import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectLis= tener; import org.eclipse.wst.common.project.facet.core.runtime.IRuntime; import org.eclipse.wst.server.core.ServerCore; import org.eclipse.wst.web.ui.internal.wizards.NewProjectDataModelFacetWiz= ard; @@ -48,6 +53,13 @@ = public ESBProjectWizard() { super(); + Set current =3D getFacetedProjectWorkingCopy().get= ProjectFacets(); + getFacetedProjectWorkingCopy().addListener(new IFacetedProjectListener(){ + public void handleEvent(IFacetedProjectEvent event) { + System.out.println("runtime changed" + event.getWorkingCopy().getPrima= ryRuntime().getName()); + }}, IFacetedProjectEvent.Type.PRIMARY_RUNTIME_CHANGED); + IRuntime rt =3D getFacetedProjectWorkingCopy().getPrimaryRuntime(); + getFacetedProjectWorkingCopy().setProjectFacets(current); setWindowTitle(JBossESBUIMessages.ESBProjectWizard_Title); setDefaultPageImageDescriptor(ESBSharedImages.getImageDescriptor(ESBShar= edImages.WIZARD_NEW_PROJECT)); } @@ -64,6 +76,14 @@ return DataModelFactory.createDataModel(new JBossESBFacetProjectCreation= DataModelProvider()); } = + private IFacetedProjectWorkingCopy fpjwc; + = + @Override + public void setFacetedProjectWorkingCopy( final IFacetedProjectWorking= Copy fpjwc ) { + super.setFacetedProjectWorkingCopy(fpjwc); + this.fpjwc =3D fpjwc; + } + @Override protected IWizardPage createFirstPage() { return new ESBProjectFirstPage(model, "first.page"); //$NON-NLS-1$ Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project= .ui/src/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/sr= c/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 201= 0-05-13 11:27:22 UTC (rev 22054) +++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.project.ui/sr= c/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 201= 0-05-13 12:32:34 UTC (rev 22055) @@ -41,8 +41,12 @@ return ESBProjectConstant.ESB_PROJECT_FACET; } = - protected void createPresetPanel(Composite top) { - new Label(top, SWT.NONE); +// protected void createPresetPanel(Composite top) { +// new Label(top, SWT.NONE); +// } + protected void createPrimaryFacetComposite(Composite top) { + super.createPrimaryFacetComposite(top); + super.handlePrimaryFacetVersionSelectedEvent(); } = @Override --===============6708425770215640676==-- From jbosstools-commits at lists.jboss.org Thu May 13 08:35:56 2010 Content-Type: multipart/mixed; boundary="===============8858988955541655456==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22056 - branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal. Date: Thu, 13 May 2010 08:35:56 -0400 Message-ID: <201005131235.o4DCZu0Q025032@svn01.web.mwc.hst.phx2.redhat.com> --===============8858988955541655456== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-13 08:35:56 -0400 (Thu, 13 May 2010) New Revision: 22056 Modified: branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jboss= core/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior= .java Log: JBIDE-6056 branch Modified: branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.cor= e/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerB= ehavior.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbos= score/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavio= r.java 2010-05-13 12:32:34 UTC (rev 22055) +++ branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbos= score/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavio= r.java 2010-05-13 12:35:56 UTC (rev 22056) @@ -82,6 +82,8 @@ } = public int getPublishType(int kind, int deltaKind, int modulePublishState= ) { + if( ServerBehaviourDelegate.ADDED =3D=3D deltaKind ) = + return IJBossServerPublisher.FULL_PUBLISH; = if (ServerBehaviourDelegate.REMOVED =3D=3D deltaKind) { return IJBossServerPublisher.REMOVE_PUBLISH; } else if (kind =3D=3D IServer.PUBLISH_FULL || modulePublishState =3D=3D= IServer.PUBLISH_STATE_FULL || kind =3D=3D IServer.PUBLISH_CLEAN ) { --===============8858988955541655456==-- From jbosstools-commits at lists.jboss.org Thu May 13 08:53:59 2010 Content-Type: multipart/mixed; boundary="===============5525654096060513208==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22057 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory. Date: Thu, 13 May 2010 08:53:59 -0400 Message-ID: <201005131253.o4DCrxZ6026767@svn01.web.mwc.hst.phx2.redhat.com> --===============5525654096060513208== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-13 08:53:58 -0400 (Thu, 13 May 2010) New Revision: 22057 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/BeanMember.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/MethodDefinition.java Log: https://jira.jboss.org/jira/browse/JBIDE-6258 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/BeanMember.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanMember.java 2010-05-13 12:35:56 UTC (rev 22056) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanMember.java 2010-05-13 12:53:58 UTC (rev 22057) @@ -54,10 +54,12 @@ String start =3D content.substring(sr.getOffset(), nr.getOffset()); int off =3D -1; int off0 =3D -1; + int bc =3D 0; for (int i =3D start.length() - 1; i >=3D 0; i--) { char ch =3D start.charAt(i); + if(ch =3D=3D '>') bc++; else if(ch =3D=3D '<') bc--; if(Character.isWhitespace(ch)) { - if(off >=3D 0) break; + if(off >=3D 0 && bc <=3D 0) break; } else if(Character.isJavaIdentifierPart(ch) || ch =3D=3D '.' || c= h =3D=3D '$' || ch =3D=3D '<' || ch =3D=3D '>') { off =3D i; if(off0 < 0) off0 =3D i + 1; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/MethodDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-13 12:35:56 UTC (re= v 22056) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-13 12:53:58 UTC (re= v 22057) @@ -78,7 +78,10 @@ int start =3D paramStart + 1; = for (int i =3D 0; i < params.length; i++) { - if(params[i].indexOf('@') < 0) continue; //do not need parameters witho= ut annotation + if(params[i].indexOf('@') < 0) { + start +=3D params[i].length() + 1; + continue; //do not need parameters without annotation + } = ParameterDefinition pd =3D new ParameterDefinition(); = --===============5525654096060513208==-- From jbosstools-commits at lists.jboss.org Thu May 13 09:05:49 2010 Content-Type: multipart/mixed; boundary="===============7283484306121067914==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22058 - in trunk/jsf: tests/org.jboss.tools.jsf.ui.bot.test/resources and 4 other directories. Date: Thu, 13 May 2010 09:05:49 -0400 Message-ID: <201005131305.o4DD5nCh001819@svn01.web.mwc.hst.phx2.redhat.com> --===============7283484306121067914== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yzhishko Date: 2010-05-13 09:05:47 -0400 (Thu, 13 May 2010) New Revision: 22058 Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2M= oveTestPageRefactor.html trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2R= enameTestPageRefactor.html trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2T= estPage.html trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/= ui/bot/test/jsf2/ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/= ui/bot/test/jsf2/refactor/ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/= ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/= ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/= ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refac= toring/JSF2RenameParticipant.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/= ui/bot/test/JSFAllBotTests.java trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/= ui/bot/test/JSFAutoTestCase.java Log: https://jira.jboss.org/jira/browse/JBIDE-5942 - swtbot test were added Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf= 2/refactoring/JSF2RenameParticipant.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refa= ctoring/JSF2RenameParticipant.java 2010-05-13 12:53:58 UTC (rev 22057) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refa= ctoring/JSF2RenameParticipant.java 2010-05-13 13:05:47 UTC (rev 22058) @@ -92,11 +92,11 @@ if (!"org.eclipse.wst.html.core.htmlsource".equals(contentType.getId()))= { //$NON-NLS-1$ return false; } - if ((JSF2ComponentModelManager.getManager() - .checkCompositeInterface(JSF2ComponentModelManager - .getReadableDOMDocument(file))) =3D=3D null) { - return false; - } +// if ((JSF2ComponentModelManager.getManager() +// .checkCompositeInterface(JSF2ComponentModelManager +// .getReadableDOMDocument(file))) =3D=3D null) { +// return false; +// } return true; } = Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/j= sf2MoveTestPageRefactor.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2= MoveTestPageRefactor.html (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2= MoveTestPageRefactor.html 2010-05-13 13:05:47 UTC (rev 22058) @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/j= sf2RenameTestPageRefactor.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2= RenameTestPageRefactor.html (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2= RenameTestPageRefactor.html 2010-05-13 13:05:47 UTC (rev 22058) @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/j= sf2TestPage.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2= TestPage.html (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/resources/refactor/jsf2= TestPage.html 2010-05-13 13:05:47 UTC (rev 22058) @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/too= ls/jsf/ui/bot/test/JSFAllBotTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf= /ui/bot/test/JSFAllBotTests.java 2010-05-13 12:53:58 UTC (rev 22057) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf= /ui/bot/test/JSFAllBotTests.java 2010-05-13 13:05:47 UTC (rev 22058) @@ -9,6 +9,8 @@ import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3579Test; import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE3920Test; import org.jboss.tools.jsf.ui.bot.test.cssdialog.jbide.JBIDE4391Test; +import org.jboss.tools.jsf.ui.bot.test.jsf2.refactor.JSF2MoveParticipantTe= st; +import org.jboss.tools.jsf.ui.bot.test.jsf2.refactor.JSF2RenameParticipant= Test; import org.jboss.tools.jsf.ui.bot.test.smoke.AddRemoveJSFCapabilitiesTest; import org.jboss.tools.jsf.ui.bot.test.smoke.CreateNewJSFProjectTest; import org.jboss.tools.jsf.ui.bot.test.templates.SetTemplateForUnknownTagT= est; @@ -32,6 +34,8 @@ suite.addTestSuite(UnknownTemplateTest.class); suite.addTestSuite(SetTemplateForUnknownTagTest.class); suite.addTestSuite(CSSSelectorJBIDE3288.class); + suite.addTestSuite(JSF2MoveParticipantTest.class); + suite.addTestSuite(JSF2RenameParticipantTest.class); return suite; } } \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/too= ls/jsf/ui/bot/test/JSFAutoTestCase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf= /ui/bot/test/JSFAutoTestCase.java 2010-05-13 12:53:58 UTC (rev 22057) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf= /ui/bot/test/JSFAutoTestCase.java 2010-05-13 13:05:47 UTC (rev 22058) @@ -2,6 +2,7 @@ = import java.io.File; import java.io.IOException; +import java.util.Scanner; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Platform; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; @@ -36,23 +37,23 @@ String filePath =3D FileLocator .toFileURL( Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile() + "= resources/" + testPage; //$NON-NLS-1$ //$NON-NLS-2$ - = - File file =3D new File(filePath); - if (!file.exists() || !file.isFile()) { - filePath =3D FileLocator - .toFileURL( - Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()= + testPage; //$NON-NLS-1$ //$NON-NLS-2$ - } - = + + File file =3D new File(filePath); + if (!file.exists() || !file.isFile()) { + filePath =3D FileLocator + .toFileURL( + Platform.getBundle(Activator.PLUGIN_ID).getEntry( + "/")).getFile() + testPage; //$NON-NLS-1$ = + } return filePath; - = } = protected void openTestPage() { SWTBot innerBot =3D bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) .bot(); SWTBotTree tree =3D innerBot.tree(); - tree.expandNode(JBT_TEST_PROJECT_NAME) + tree + .expandNode(JBT_TEST_PROJECT_NAME) .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubl= eClick(); //$NON-NLS-1$ //$NON-NLS-2$ } = @@ -61,6 +62,7 @@ performContentTestByDocument(testPage, bot .multiPageEditorByTitle(TEST_PAGE)); } + @Override protected void closeUnuseDialogs() { } @@ -84,4 +86,14 @@ super.tearDown(); } = + protected String loadFileContent(String resourceRelativePath) throws IOEx= ception { + File file =3D new File(getPathToResources(resourceRelativePath)); + StringBuilder builder =3D new StringBuilder(""); //$NON-NLS-1$ + Scanner scanner =3D new Scanner(file); + while (scanner.hasNextLine()) { + builder.append(scanner.nextLine()); + } + return builder.toString(); + } + } Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/= jsf/ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf= /ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf= /ui/bot/test/jsf2/refactor/JSF2AbstractRefactorTest.java 2010-05-13 13:05:4= 7 UTC (rev 22058) @@ -0,0 +1,101 @@ +package org.jboss.tools.jsf.ui.bot.test.jsf2.refactor; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.jsf.ui.bot.test.JSFAutoTestCase; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public abstract class JSF2AbstractRefactorTest extends JSFAutoTestCase { + = + protected static final String JSF2_Test_Page_Name =3D "jsf2TestPage"; //$= NON-NLS-1$ + = + protected void createCompositeComponent() throws Exception { + SWTBot innerBot =3D bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) + .bot(); + SWTBotTree tree =3D innerBot.tree(); + try { + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode= ("WebContent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2= $ //$NON-NLS-3$ + } catch (WidgetNotFoundException e) { + tree + .getTreeItem( + projectProperties.getProperty("JSFProjectName")).expandNode("WebConte= nt").select(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$N= ON-NLS-2$ //$NON-NLS-3$ + bot.textWithLabel("Folder name:").setText("resources"); //$NON-NLS-1$ /= /$NON-NLS-2$ + bot.button("Finish").click(); //$NON-NLS-1$ + } + try { + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode= ("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NO= N-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } catch (WidgetNotFoundException e) { + tree + .getTreeItem( + projectProperties.getProperty("JSFProjectName")).expandNode("WebConte= nt").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-N= LS-3$ + bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$N= ON-NLS-2$ //$NON-NLS-3$ + bot.textWithLabel("Folder name:").setText("mycomp"); //$NON-NLS-1$ //$N= ON-NLS-2$ + bot.button("Finish").click(); //$NON-NLS-1$ + } + try { + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode= ("WebContent").expandNode("resources").expandNode("mycomp").select(); //$NO= N-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } catch (WidgetNotFoundException e) { + tree + .getTreeItem( + projectProperties.getProperty("JSFProjectName")).expandNode("WebConte= nt").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-N= LS-3$ + bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$N= ON-NLS-2$ //$NON-NLS-3$ + bot.textWithLabel("Folder name:").setText("mycomp"); //$NON-NLS-1$ //$N= ON-NLS-2$ + bot.button("Finish").click(); //$NON-NLS-1$ + } + try { + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNode= ("WebContent").expandNode("resources").expandNode("mycomp").expandNode("ech= o.xhtml"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-N= LS-5$ + } catch (WidgetNotFoundException e) { + tree + .getTreeItem( + projectProperties.getProperty("JSFProjectName")).expandNode("WebConte= nt").expandNode("resources").expandNode("mycomp").select(); //$NON-NLS-1$ /= /$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //= $NON-NLS-2$ //$NON-NLS-3$ + bot.shell("New").activate(); //$NON-NLS-1$ + tree =3D bot.tree(); + tree.expandNode("JBoss Tools Web").select("XHTML Page"); //$NON-NLS-1$ = //$NON-NLS-2$ + bot.button("Next >").click(); //$NON-NLS-1$ + bot.textWithLabel("File name:").setText("echo"); //$NON-NLS-1$ //$NON-N= LS-2$ + bot.button("Finish").click(); //$NON-NLS-1$ + bot.sleep(2000); + bot.editorByTitle("echo.xhtml").close(); //$NON-NLS-1$ + } + } + + protected void createTestPage() throws Exception { + SWTBot innerBot =3D bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) + .bot(); + SWTBotTree tree =3D innerBot.tree(); + try { + tree.expandNode(projectProperties.getProperty("JSFProjectName")).expand= Node("WebContent"). //$NON-NLS-1$ //$NON-NLS-2$ + getNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); //$NON-NLS-1$ + } catch (WidgetNotFoundException e) { + tree + .getTreeItem( + projectProperties.getProperty("JSFProjectName")).select(); //$NON-N= LS-1$ + bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS-1$ //= $NON-NLS-2$ //$NON-NLS-3$ + bot.shell("New").activate(); //$NON-NLS-1$ + tree =3D bot.tree(); + tree.expandNode("JBoss Tools Web").select("XHTML Page"); //$NON-NLS-1$ = //$NON-NLS-2$ + bot.button("Next >").click(); //$NON-NLS-1$ + bot.textWithLabel("File name:").setText(JSF2_Test_Page_Name); //$NON-NL= S-1$ + bot.button("Finish").click(); //$NON-NLS-1$ + } + SWTBotEclipseEditor editor =3D bot.editorByTitle( + JSF2_Test_Page_Name + ".xhtml").toTextEditor(); //$NON-NLS-1$ + editor.setFocus(); + bot.sleep(2000); + bot.menu("Edit").menu("Select All").click(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$//$NON-NLS-2$ + bot.sleep(2000); + editor.setText(loadFileContent("refactor/jsf2TestPage.html")); //$NON-NL= S-1$ + bot.sleep(2000); + editor.saveAndClose(); + } + +} Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/= jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf= /ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf= /ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java 2010-05-13 13:05:47= UTC (rev 22058) @@ -0,0 +1,87 @@ +package org.jboss.tools.jsf.ui.bot.test.jsf2.refactor; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public class JSF2MoveParticipantTest extends JSF2AbstractRefactorTest { + + public void testJSF2MoveParticipant() throws Exception { + createTestPage(); + createCompositeComponent(); + createDistResFolder(); + moveCurrResFolder(); + checkContent(); + } + + private void checkContent() throws Exception { + SWTBot innerBot =3D bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) + .bot(); + SWTBotTree tree =3D innerBot.tree(); + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNod= e("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); /= /$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + delay(); + SWTBotEclipseEditor editor =3D bot.editorByTitle( + JSF2_Test_Page_Name + ".xhtml").toTextEditor(); //$NON-NLS-1$ + assertEquals( + loadFileContent("refactor/jsf2MoveTestPageRefactor.html"), editor.getT= ext()); //$NON-NLS-1$ + delay(); + editor.close(); + } + + private void moveCurrResFolder() throws Exception { + SWTBot innerBot =3D bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) + .bot(); + SWTBotTree tree =3D innerBot.tree(); + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNod= e("WebContent").expandNode("resources").expandNode("mycomp").select(); //$N= ON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + bot.menu("Refactor").menu("Move...").click(); //$NON-NLS-1$ //$NON-NLS-2$ + innerBot =3D bot.shell("Move").bot(); //$NON-NLS-1$ + tree =3D innerBot.tree(); + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNod= e("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$= NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + delay(); + bot.button("OK").click(); //$NON-NLS-1$ + delay(); + } + + private void createDistResFolder() throws Exception { + SWTBot innerBot =3D bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) + .bot(); + SWTBotTree tree =3D innerBot.tree(); + try { + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNo= de("WebContent").expandNode("resources").expandNode("mycomp1").select(); //= $NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + } catch (WidgetNotFoundException e) { + tree + .getTreeItem( + projectProperties.getProperty("JSFProjectName")).expandNode("WebCon= tent").expandNode("resources").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON= -NLS-3$ + bot.menu("File").menu("New").menu("Folder").click(); //$NON-NLS-1$ //$N= ON-NLS-2$ //$NON-NLS-3$ + bot.textWithLabel("Folder name:").setText("mycomp1"); //$NON-NLS-1$ //$= NON-NLS-2$ + bot.button("Finish").click(); //$NON-NLS-1$ + delay(); + } + } + + @Override + protected void tearDown() throws Exception { + SWTBot innerBot =3D bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) + .bot(); + SWTBotTree tree =3D innerBot.tree(); + delay(); + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNod= e("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON= -NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.button("OK").click(); //$NON-NLS-1$ + delay(); + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNod= e("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$= NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.button("OK").click(); //$NON-NLS-1$ + delay(); + super.tearDown(); + } + +} Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/= jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf= /ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf= /ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java 2010-05-13 13:05:= 47 UTC (rev 22058) @@ -0,0 +1,62 @@ +package org.jboss.tools.jsf.ui.bot.test.jsf2.refactor; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public class JSF2RenameParticipantTest extends JSF2AbstractRefactorTest { + + public void testJSF2RenameParticipant() throws Exception { + createTestPage(); + createCompositeComponent(); + renameCompositeComponent(); + checkContent(); + } + + private void renameCompositeComponent() throws Exception { + SWTBot innerBot =3D bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) + .bot(); + SWTBotTree tree =3D innerBot.tree(); + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNod= e("WebContent").expandNode("resources").expandNode("mycomp").expandNode("ec= ho.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4= $ //$NON-NLS-5$ + bot.menu("Refactor").menu("Rename...").click(); //$NON-NLS-1$ //$NON-NLS= -2$ + bot.textWithLabel("New name:").setText("echo1.xhtml"); //$NON-NLS-1$ //$= NON-NLS-2$ + bot.button("OK").click(); //$NON-NLS-1$ + delay(); + } + + private void checkContent() throws Exception { + SWTBot innerBot =3D bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) + .bot(); + SWTBotTree tree =3D innerBot.tree(); + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNod= e("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").doubleClick(); /= /$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + delay(); + SWTBotEclipseEditor editor =3D bot.editorByTitle( + JSF2_Test_Page_Name + ".xhtml").toTextEditor(); //$NON-NLS-1$ + assertEquals( + loadFileContent("refactor/jsf2RenameTestPageRefactor.html"), editor.ge= tText()); //$NON-NLS-1$ + delay(); + editor.close(); + } + + @Override + protected void tearDown() throws Exception { + SWTBot innerBot =3D bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER) + .bot(); + SWTBotTree tree =3D innerBot.tree(); + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNod= e("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON= -NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.button("OK").click(); //$NON-NLS-1$ + delay(); + tree + .expandNode(projectProperties.getProperty("JSFProjectName")).expandNod= e("WebContent").expandNode("resources").expandNode("mycomp").expandNode("ec= ho1.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-= 4$ //$NON-NLS-5$ + bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$ + bot.button("OK").click(); //$NON-NLS-1$ + delay(); + super.tearDown(); + } + +} --===============7283484306121067914==-- From jbosstools-commits at lists.jboss.org Thu May 13 09:07:32 2010 Content-Type: multipart/mixed; boundary="===============7364791911961129739==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22059 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refactoring. Date: Thu, 13 May 2010 09:07:32 -0400 Message-ID: <201005131307.o4DD7WDV001846@svn01.web.mwc.hst.phx2.redhat.com> --===============7364791911961129739== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yzhishko Date: 2010-05-13 09:07:31 -0400 (Thu, 13 May 2010) New Revision: 22059 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refac= toring/JSf2MoveParticipant.java Log: Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf= 2/refactoring/JSf2MoveParticipant.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refa= ctoring/JSf2MoveParticipant.java 2010-05-13 13:05:47 UTC (rev 22058) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/refa= ctoring/JSf2MoveParticipant.java 2010-05-13 13:07:31 UTC (rev 22059) @@ -1,3 +1,14 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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.jsf.jsf2.refactoring; = import java.util.HashMap; @@ -20,6 +31,12 @@ import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; = +/** + * = + * @author yzhishko + * + */ + public class JSf2MoveParticipant extends MoveParticipant { = private IProject project; --===============7364791911961129739==-- From jbosstools-commits at lists.jboss.org Thu May 13 09:39:47 2010 Content-Type: multipart/mixed; boundary="===============6532269223408122129==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22060 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation. Date: Thu, 13 May 2010 09:39:47 -0400 Message-ID: <201005131339.o4DDdlVS005542@svn01.web.mwc.hst.phx2.redhat.com> --===============6532269223408122129== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-13 09:39:46 -0400 (Thu, 13 May 2010) New Revision: 22060 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-6252 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-13 13:07:31 UTC (rev 220= 59) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-13 13:39:46 UTC (rev 220= 60) @@ -442,8 +442,7 @@ for (IBeanMethod disposerMethod : disposers) { if(!boundDisposers.contains(disposerMethod)) { for (ITextSourceReference declaration : disposerDeclarations) { - // TODO uncomment it when https://jira.jboss.org/jira/browse/JBIDE-6= 252 is resolved = -// addError(CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOSER, CDIP= references.NO_PRODUCER_MATCHING_DISPOSER, declaration, bean.getResource()); + addError(CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOSER, CDIPre= ferences.NO_PRODUCER_MATCHING_DISPOSER, declaration, bean.getResource()); } } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-13 13:07:31 UTC (rev 22059) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-13 13:39:46 UTC (rev 22060) @@ -50,7 +50,7 @@ BOTH_INTERCEPTOR_AND_DECORATOR=3DThe bean class of a managed bean is annot= ated with both the @Interceptor and @Decorator stereotypes SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR=3DBean class of a session = bean is annotated @Interceptor or @Decorator PRODUCER_IN_INTERCEPTOR=3DInterceptor has a member annotated @Produces -PRODUCER_IN_OR_DECORATOR=3DDecorator has a member annotated @Produces +PRODUCER_IN_DECORATOR=3DDecorator has a member annotated @Produces DISPOSER_IN_INTERCEPTOR=3DInterceptor has a method annotated @Disposes DISPOSER_IN_DECORATOR=3DDecorator has a method annotated @Disposes MULTIPLE_DELEGATE=3DDecorator has more than one delegate injection point --===============6532269223408122129==-- From jbosstools-commits at lists.jboss.org Thu May 13 09:39:49 2010 Content-Type: multipart/mixed; boundary="===============4887104796005122968==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22061 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck. Date: Thu, 13 May 2010 09:39:49 -0400 Message-ID: <201005131339.o4DDdnMU005552@svn01.web.mwc.hst.phx2.redhat.com> --===============4887104796005122968== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-13 09:39:48 -0400 (Thu, 13 May 2010) New Revision: 22061 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6258 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-13 13:39:46 UTC (rev 22060) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-13 13:39:48 UTC (rev 22061) @@ -410,8 +410,8 @@ */ public void testParameterizedTypeWithWildcard() throws Exception { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/field/definition/broken/parameterizedReturnTypeWit= hWildcard/SpiderProducerWildCardType_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, A= bstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD= _TYPE_HAS_WILDCARD, 23, 1008, 1033); - AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, A= bstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD= _TYPE_HAS_WILDCARD, 24, 10011, 1036); + AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, A= bstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD= _TYPE_HAS_WILDCARD, 23, 1011, 1026); + AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, A= bstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD= _TYPE_HAS_WILDCARD, 24, 1100, 1125); } = /** --===============4887104796005122968==-- From jbosstools-commits at lists.jboss.org Thu May 13 09:47:31 2010 Content-Type: multipart/mixed; boundary="===============2665576635025967564==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22062 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation. Date: Thu, 13 May 2010 09:47:31 -0400 Message-ID: <201005131347.o4DDlV0L006638@svn01.web.mwc.hst.phx2.redhat.com> --===============2665576635025967564== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-13 09:47:30 -0400 (Thu, 13 May 2010) New Revision: 22062 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-13 13:39:48 UTC (rev 220= 61) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-13 13:47:30 UTC (rev 220= 62) @@ -727,7 +727,7 @@ */ IField[] fields =3D type.getFields(); for (IField field : fields) { - if(Flags.isPublic(field.getFlags())) { + if(Flags.isPublic(field.getFlags()) && !Flags.isStatic(field.getFlags= ())) { addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_P= UBLIC_FIELD, CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, declaration, be= an.getResource()); break; } --===============2665576635025967564==-- From jbosstools-commits at lists.jboss.org Thu May 13 10:07:33 2010 Content-Type: multipart/mixed; boundary="===============2966505050314639592==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22063 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core. Date: Thu, 13 May 2010 10:07:33 -0400 Message-ID: <201005131407.o4DE7XJA015241@svn01.web.mwc.hst.phx2.redhat.com> --===============2966505050314639592== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-13 10:07:32 -0400 (Thu, 13 May 2010) New Revision: 22063 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= IBeanMethod.java Log: https://jira.jboss.org/jira/browse/JBIDE-6251 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/IBeanMethod.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IBeanMethod.java 2010-05-13 13:47:30 UTC (rev 22062) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IBeanMethod.java 2010-05-13 14:07:32 UTC (rev 22063) @@ -34,4 +34,16 @@ * @return */ List getParameters(); + + /** + * Returns true if method has a parameter annotated with @Disposes + * @return + */ + boolean isDisposer(); + + /** + * Returns true if method has a parameter annotated with @Observes + * @return + */ + public boolean isObserver(); } \ No newline at end of file --===============2966505050314639592==-- From jbosstools-commits at lists.jboss.org Thu May 13 10:13:07 2010 Content-Type: multipart/mixed; boundary="===============7461681518314379914==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22064 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck. Date: Thu, 13 May 2010 10:13:05 -0400 Message-ID: <201005131413.o4DED5hM015738@svn01.web.mwc.hst.phx2.redhat.com> --===============7461681518314379914== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-13 10:13:04 -0400 (Thu, 13 May 2010) New Revision: 22064 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-13 14:07:32 UTC (rev 22063) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-13 14:13:04 UTC (rev 22064) @@ -375,6 +375,7 @@ public void testUnresolvedDisposalMethod() throws Exception { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/disposal/method/definition/broken/unresolvedMethod/SpiderPr= oducer_Broken.java"); AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOSER,= 35); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOS= ER, 31); } = /** --===============7461681518314379914==-- From jbosstools-commits at lists.jboss.org Thu May 13 10:37:17 2010 Content-Type: multipart/mixed; boundary="===============6656987081226135761==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22065 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation. Date: Thu, 13 May 2010 10:37:17 -0400 Message-ID: <201005131437.o4DEbHt6018900@svn01.web.mwc.hst.phx2.redhat.com> --===============6656987081226135761== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-13 10:37:16 -0400 (Thu, 13 May 2010) New Revision: 22065 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-13 14:13:04 UTC (rev 220= 64) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-13 14:37:16 UTC (rev 220= 65) @@ -439,11 +439,9 @@ * 3.3.7. Disposer method resolution * - there is no producer method declared by the (same) bean class tha= t is assignable to the disposed parameter of a disposer method */ - for (IBeanMethod disposerMethod : disposers) { - if(!boundDisposers.contains(disposerMethod)) { - for (ITextSourceReference declaration : disposerDeclarations) { - addError(CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOSER, CDIPre= ferences.NO_PRODUCER_MATCHING_DISPOSER, declaration, bean.getResource()); - } + if(!boundDisposers.contains(disposer)) { + for (ITextSourceReference declaration : disposerDeclarations) { + addError(CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOSER, CDIPref= erences.NO_PRODUCER_MATCHING_DISPOSER, declaration, bean.getResource()); } } } --===============6656987081226135761==-- From jbosstools-commits at lists.jboss.org Thu May 13 10:55:31 2010 Content-Type: multipart/mixed; boundary="===============2932861207291808051==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22066 - branches/modular_build. Date: Thu, 13 May 2010 10:55:30 -0400 Message-ID: <201005131455.o4DEtUwA020898@svn01.web.mwc.hst.phx2.redhat.com> --===============2932861207291808051== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-13 10:55:29 -0400 (Thu, 13 May 2010) New Revision: 22066 Modified: branches/modular_build/genpom.xml Log: support -DCOMPONENTS=3D... so that genpom.xml can be used to create the com= ponent agg pom.xml files too Modified: branches/modular_build/genpom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/genpom.xml 2010-05-13 14:37:16 UTC (rev 22065) +++ branches/modular_build/genpom.xml 2010-05-13 14:55:29 UTC (rev 22066) @@ -2,7 +2,6 @@ - = - - + + = @@ -467,77 +466,110 @@ = - - - - - - Error: no parent-pom.xml found in ${WORKINGDIR}/${pathToParentPo= m} - - + = - - - + + + + + + - - + + + + + + + + + + - COMPONENT =3D ${COMPONENT}, pathToParentPom =3D = ${pathToParentPom} + + + + COMPONENT =3D ${COMPONENT} + + + + + + Error: no parent-pom.xml found in ${WORKINGDIR}/${pathToParent= PomInput} + + = - - + = - - - - - - - - - + + + + + + + + + = - - - + + + = - - - - - - - - - - - - - - - ${WORKINGDIR}/${COMPONENT} :: Modules: ${modulecoun= t}, Aggregations: ${aggregatorcount} - - - - - - - ${show.pom.exists.warning.count} ${COMPONENT} = pom.xml file(s) already exist. To overwrite, use -Doverwrite.existing.pom.x= ml=3Dtrue - - + + + + + + + + + + + + + + + ${WORKINGDIR}/${COMPONENT} :: Modules: ${moduleco= unt}, Aggregations: ${aggregatorcount} + + + + + + + ${show.pom.exists.warning.count} ${COMPONENT= } pom.xml file(s) already exist. To overwrite, use -Doverwrite.existing.pom= .xml=3Dtrue + + + + + + + + = --===============2932861207291808051==-- From jbosstools-commits at lists.jboss.org Thu May 13 11:03:21 2010 Content-Type: multipart/mixed; boundary="===============8631540341097946183==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22067 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests. Date: Thu, 13 May 2010 11:03:21 -0400 Message-ID: <201005131503.o4DF3L7x024575@svn01.web.mwc.hst.phx2.redhat.com> --===============8631540341097946183== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-13 11:03:19 -0400 (Thu, 13 May 2010) New Revision: 22067 Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/Abst= ractResourceMarkerTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tes= ts/AbstractResourceMarkerTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/Abs= tractResourceMarkerTest.java 2010-05-13 14:55:29 UTC (rev 22066) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/Abs= tractResourceMarkerTest.java 2010-05-13 15:03:19 UTC (rev 22067) @@ -65,9 +65,10 @@ public static IMarker[] findMarkers(IResource resource, String type, Stri= ng pattern) throws CoreException { List result =3D new ArrayList(); IMarker[] markers =3D resource.findMarkers(type, true, IResource.DEPTH_I= NFINITE); + System.out.println(""); for (int i =3D 0; i < markers.length; i++) { String message =3D markers[i].getAttribute(IMarker.MESSAGE, ""); //$NON= -NLS-1$ - if (message.matches(pattern) && markers[i].exists()) { + if ((message.matches(pattern)||message.equals(pattern)) && markers[i].e= xists()) { result.add(markers[i]); } } --===============8631540341097946183==-- From jbosstools-commits at lists.jboss.org Thu May 13 11:26:11 2010 Content-Type: multipart/mixed; boundary="===============1591986117990848376==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22068 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests. Date: Thu, 13 May 2010 11:26:11 -0400 Message-ID: <201005131526.o4DFQBE3030578@svn01.web.mwc.hst.phx2.redhat.com> --===============1591986117990848376== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-13 11:26:09 -0400 (Thu, 13 May 2010) New Revision: 22068 Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/Abst= ractResourceMarkerTest.java Log: Removed System.out() Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tes= ts/AbstractResourceMarkerTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/Abs= tractResourceMarkerTest.java 2010-05-13 15:03:19 UTC (rev 22067) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/Abs= tractResourceMarkerTest.java 2010-05-13 15:26:09 UTC (rev 22068) @@ -65,7 +65,6 @@ public static IMarker[] findMarkers(IResource resource, String type, Stri= ng pattern) throws CoreException { List result =3D new ArrayList(); IMarker[] markers =3D resource.findMarkers(type, true, IResource.DEPTH_I= NFINITE); - System.out.println(""); for (int i =3D 0; i < markers.length; i++) { String message =3D markers[i].getAttribute(IMarker.MESSAGE, ""); //$NON= -NLS-1$ if ((message.matches(pattern)||message.equals(pattern)) && markers[i].e= xists()) { --===============1591986117990848376==-- From jbosstools-commits at lists.jboss.org Thu May 13 12:42:31 2010 Content-Type: multipart/mixed; boundary="===============0675099200767182491==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22069 - trunk/documentation/guides/GettingStartedGuide/en-US. Date: Thu, 13 May 2010 12:42:31 -0400 Message-ID: <201005131642.o4DGgVFf013788@svn01.web.mwc.hst.phx2.redhat.com> --===============0675099200767182491== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-13 12:42:30 -0400 (Thu, 13 May 2010) New Revision: 22069 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-37 - Added description of the A= rchived download option = Modified: trunk/documentation/guides/GettingStartedGuide/en-US/getting_star= ted.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xm= l 2010-05-13 15:26:09 UTC (rev 22068) +++ trunk/documentation/guides/GettingStartedGuide/en-US/getting_started.xm= l 2010-05-13 16:42:30 UTC (rev 22069) @@ -714,7 +714,10 @@
Installation From Zip file - You can download Jboss tools in a zip file from one of the pages = below: + = + Now you can install JBoss Tools using Eclipse P2 update manager an= d a common zip file which is = + one installer for all platforms. + You can download Jboss Tools in a zip file from one of the pages = below: Stable Releases: --===============0856226534343005463== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-13 14:12:30 -0400 (Thu, 13 May 2010) New Revision: 22070 Modified: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/sr= c/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6277 Modified: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.= test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/s= rc/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java 2010-05-13 = 16:42:30 UTC (rev 22069) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/s= rc/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java 2010-05-13 = 18:12:30 UTC (rev 22070) @@ -36,7 +36,7 @@ import org.jboss.tools.common.text.ext.util.AxisUtil; import org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner; import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.TestProjectProvider; +import org.jboss.tools.common.test.util.TestProjectProvider; = public class ELExprPartitionerTest extends TestCase { TestProjectProvider provider =3D null; --===============0856226534343005463==-- From jbosstools-commits at lists.jboss.org Thu May 13 17:19:38 2010 Content-Type: multipart/mixed; boundary="===============1247897456076699562==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22071 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: views and 1 other directory. Date: Thu, 13 May 2010 17:19:38 -0400 Message-ID: <201005132119.o4DLJcaa012357@svn01.web.mwc.hst.phx2.redhat.com> --===============1247897456076699562== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-13 17:19:38 -0400 (Thu, 13 May 2010) New Revision: 22071 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/J= AXRSTester.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/J= AXRSWSTestView.java Log: OPEN - issue JBIDE-6280: [tester] full response (body and headers) should b= e shown for REST requests = https://jira.jboss.org/jira/browse/JBIDE-6280 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= utils/JAXRSTester.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXRSTester.java 2010-05-13 18:12:30 UTC (rev 22070) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXRSTester.java 2010-05-13 21:19:38 UTC (rev 22071) @@ -11,6 +11,7 @@ package org.jboss.tools.ws.ui.utils; = import java.io.BufferedReader; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStreamWriter; @@ -208,16 +209,34 @@ } = // retrieve result and put string results into the response - InputStream is =3D (InputStream) httpurlc.getInputStream(); - BufferedReader br =3D new BufferedReader(new InputStreamReader(is,= "UTF-8"));//$NON-NLS-1$ - StringBuilder sb =3D new StringBuilder(); - String line; - while ((line =3D br.readLine()) !=3D null) { - sb.append(line); - sb.append("\n");//$NON-NLS-1$ + InputStream is =3D null; + try { + is =3D httpurlc.getInputStream(); + BufferedReader br =3D new BufferedReader(new InputStreamReader(is= , "UTF-8"));//$NON-NLS-1$ + StringBuilder sb =3D new StringBuilder(); + String line; + while ((line =3D br.readLine()) !=3D null) { + sb.append(line); + sb.append("\n");//$NON-NLS-1$ + } + br.close(); + resultBody =3D sb.toString(); + } catch (IOException ie) { + try { + is =3D httpurlc.getErrorStream(); + BufferedReader br =3D new BufferedReader(new InputStreamReader(i= s, "UTF-8"));//$NON-NLS-1$ + StringBuilder sb =3D new StringBuilder(); + String line; + while ((line =3D br.readLine()) !=3D null) { + sb.append(line); + sb.append("\n");//$NON-NLS-1$ + } + br.close(); + resultBody =3D sb.toString(); + } catch (IOException ie2) { + resultBody =3D ie2.getLocalizedMessage(); + } } - br.close(); - resultBody =3D sb.toString(); = resultHeaders =3D httpurlc.getHeaderFields(); = Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/JAXRSWSTestView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-13 18:12:30 UTC (rev 22070) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-13 21:19:38 UTC (rev 22071) @@ -652,11 +652,11 @@ } } = + JAXRSTester tester =3D new JAXRSTester(); + // now actually call it try { = - JAXRSTester tester =3D new JAXRSTester(); - = // call the service tester.doTest(address, parameters, headers, method, body); = @@ -693,12 +693,43 @@ return status; = } catch (Exception e) { - WSTestStatus status =3D new WSTestStatus(IStatus.ERROR, = + String result =3D tester.getResultBody(); + + // put the results in the result text field + String cleanedUp =3D WSTestUtils.addNLsToXML(result); + + WSTestStatus status =3D new WSTestStatus(IStatus.OK, = JBossWSUIPlugin.PLUGIN_ID, = - JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalizedMe= ssage()); - status.setResultsText(e.toString()); - e.printStackTrace(); + JBossWSUIMessages.JAXRSWSTestView_JAXRS_Success_Status); + status.setResultsText(cleanedUp); + + String listText =3D EMPTY_STRING; + if (tester.getResultHeaders() !=3D null) { + Iterator iter =3D tester.getResultHeaders().entrySet().iterator(); + while (iter.hasNext()) { + String text =3D EMPTY_STRING; + Entry entry =3D (Entry) iter.next(); + if (entry.getKey() =3D=3D null) = + text =3D entry.getValue().toString(); + else + text =3D text + entry.toString(); + listText =3D listText + text; + if (iter.hasNext()) { + listText =3D listText + RESULT_HEADER_DELIMITER; + } + } + } + + System.out.println(listText); + status.setHeadersList(listText); + monitor.worked(10); return status; +// WSTestStatus status =3D new WSTestStatus(IStatus.ERROR, = +// JBossWSUIPlugin.PLUGIN_ID, = +// JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalized= Message()); +// status.setResultsText(e.toString()); +// e.printStackTrace(); +// return status; } } = --===============1247897456076699562==-- From jbosstools-commits at lists.jboss.org Thu May 13 18:28:00 2010 Content-Type: multipart/mixed; boundary="===============0012041475855162480==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22072 - in trunk/jst: tests/org.jboss.tools.jst.web.kb.test/META-INF and 2 other directories. Date: Thu, 13 May 2010 18:27:59 -0400 Message-ID: <201005132227.o4DMRx9w026475@svn01.web.mwc.hst.phx2.redhat.com> --===============0012041475855162480== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-13 18:27:59 -0400 (Thu, 13 May 2010) New Revision: 22072 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/pages/inputUserName.jsp trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/= web/kb/test/WebKbTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6284 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml 2010-0= 5-13 21:19:38 UTC (rev 22071) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/taglibs/JsfCore.xml 2010-0= 5-13 22:27:59 UTC (rev 22072) @@ -2,8 +2,8 @@ = - - + + Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST= .MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 20= 10-05-13 21:19:38 UTC (rev 22071) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 20= 10-05-13 22:27:59 UTC (rev 22072) @@ -8,7 +8,9 @@ org.eclipse.core.resources, org.jboss.tools.jst.web.kb, org.junit, - org.jboss.tools.tests + org.jboss.tools.tests, + org.jboss.tools.common.el.core, + org.jboss.tools.common Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor.0 Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMo= del/WebContent/pages/inputUserName.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/We= bContent/pages/inputUserName.jsp 2010-05-13 21:19:38 UTC (rev 22071) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/We= bContent/pages/inputUserName.jsp 2010-05-13 22:27:59 UTC (rev 22072) @@ -1,6 +1,6 @@ <%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f" %> <%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h" %> - + = = Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/too= ls/jst/web/kb/test/WebKbTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst= /web/kb/test/WebKbTest.java 2010-05-13 21:19:38 UTC (rev 22071) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst= /web/kb/test/WebKbTest.java 2010-05-13 22:27:59 UTC (rev 22072) @@ -12,7 +12,14 @@ = import junit.framework.TestCase; = +import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; +import org.jboss.tools.common.el.core.resolver.ELContext; +import org.jboss.tools.common.text.TextProposal; +import org.jboss.tools.jst.web.kb.KbQuery; +import org.jboss.tools.jst.web.kb.PageContextFactory; +import org.jboss.tools.jst.web.kb.PageProcessor; +import org.jboss.tools.jst.web.kb.KbQuery.Type; import org.jboss.tools.jst.web.kb.internal.taglib.CustomTagLibAttribute; import org.jboss.tools.jst.web.kb.taglib.CustomTagLibManager; import org.jboss.tools.jst.web.kb.taglib.ICustomTagLibrary; @@ -49,8 +56,32 @@ } } = + /** + * https://jira.jboss.org/jira/browse/JBIDE-6284 + */ + public void testFFacet() { + IFile file =3D testProject.getFile("WebContent/pages/inputUserName.jsp"); + ELContext context =3D PageContextFactory.createPageContext(file); + KbQuery query =3D new KbQuery(); + query.setMask(true); + query.setOffset(130); + query.setType(Type.TAG_NAME); + query.setPrefix("f"); + query.setUri("http://java.sun.com/jsf/core"); + query.setValue("f:facet"); + + TextProposal[] proposals =3D PageProcessor.getInstance().getProposals(qu= ery, context); + for (TextProposal proposal : proposals) { + if("".equals(proposal.getReplacementString())) { + return; + } + } + fail("Can't find proposal."); + } + public void testCustomExtensions() { CustomTagLibAttribute[] attributes =3D CustomTagLibManager.getInstance()= .getComponentExtensions(); assertNotNull("Can't load component extensions.", attributes); assertFalse("Can't load component extensions.", attributes.length=3D=3D0= ); - }} \ No newline at end of file + } +} \ No newline at end of file --===============0012041475855162480==-- From jbosstools-commits at lists.jboss.org Thu May 13 18:33:19 2010 Content-Type: multipart/mixed; boundary="===============3316572997804088696==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22073 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views. Date: Thu, 13 May 2010 18:33:19 -0400 Message-ID: <201005132233.o4DMXJhV027063@svn01.web.mwc.hst.phx2.redhat.com> --===============3316572997804088696== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-13 18:33:18 -0400 (Thu, 13 May 2010) New Revision: 22073 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/D= elimitedStringList.java Log: OPEN - issue JBIDE-6282: [tester] Cannot see more than 7 request parameters= /headers = https://jira.jboss.org/jira/browse/JBIDE-6282 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/DelimitedStringList.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= DelimitedStringList.java 2010-05-13 22:27:59 UTC (rev 22072) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= DelimitedStringList.java 2010-05-13 22:33:18 UTC (rev 22073) @@ -136,7 +136,7 @@ mSpacerComposite.setLayout(new GridLayout()); } { - this.mPropsList =3D new List(this, SWT.BORDER); + this.mPropsList =3D new List(this, SWT.BORDER | SWT.V_SCROLL); final GridData gridData =3D new GridData( GridData.HORIZONTAL_ALIGN_FILL | GridData.VERTICAL_ALIGN_FILL); --===============3316572997804088696==-- From jbosstools-commits at lists.jboss.org Thu May 13 19:41:05 2010 Content-Type: multipart/mixed; boundary="===============8359544387742892122==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22074 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 4 other directories. Date: Thu, 13 May 2010 19:41:04 -0400 Message-ID: <201005132341.o4DNf459008820@svn01.web.mwc.hst.phx2.redhat.com> --===============8359544387742892122== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-13 19:41:02 -0400 (Thu, 13 May 2010) New Revision: 22074 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDIConstants.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= ISessionBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/CDIProject.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/SessionBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/AnnotationHelper.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/TypeDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDIValidationMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : session bean specifies an illegal scope (a stateless session bean must be= long = to the @Dependent pseudo-scope; a singleton bean must belong to either the @ApplicationScoped scope or to the @Dependent pseudo-scope, a stateful se= ssion = bean may have any scope) Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDIConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIConstants.java 2010-05-13 22:33:18 UTC (rev 22073) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIConstants.java 2010-05-13 23:41:02 UTC (rev 22074) @@ -43,6 +43,7 @@ = public String STATEFUL_ANNOTATION_TYPE_NAME =3D "javax.ejb.Stateful"; public String STATELESS_ANNOTATION_TYPE_NAME =3D "javax.ejb.Stateless"; + public String SINGLETON_ANNOTATION_TYPE_NAME =3D "javax.ejb.Singleton"; public String LOCAL_ANNOTATION_TYPE_NAME =3D "javax.ejb.Local"; = public String RESOURCE_ANNOTATION_TYPE_NAME =3D "javax.annotation.Resourc= e"; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDIUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-13 22:33:18 UTC (rev 22073) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-13 23:41:02 UTC (rev 22074) @@ -131,6 +131,19 @@ } = /** + * Checks if the bean has @ApplicationScoped scope. If it has different s= cope then @ApplicationScoped + * then returns this scope declaration or a stereotype which declares the + * scope. Otherwise returns null. + * = + * @param bean + * @param scopeTypeName + * @return + */ + public static IAnnotationDeclaration getDifferentScopeDeclarationThanAppl= icationScoped(IScoped scoped) { + return getAnotherScopeDeclaration(scoped, CDIConstants.APPLICATION_SCOPE= D_ANNOTATION_TYPE_NAME); + } + + /** * Checks if the bean has given scope. If it has different scope then giv= en * then returns this scope declaration or a stereotype which declares the * scope. Otherwise returns null. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/ISessionBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /ISessionBean.java 2010-05-13 22:33:18 UTC (rev 22073) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /ISessionBean.java 2010-05-13 23:41:02 UTC (rev 22074) @@ -10,7 +10,6 @@ *************************************************************************= *****/ package org.jboss.tools.cdi.core; = - /** * Represents a session bean. * = @@ -26,6 +25,20 @@ boolean isStateful(); = /** + * Returns "true" if this bean is a stateless session bean. + * = + * @return "true" if this bean is a stateless session bean. + */ + boolean isStateless(); + + /** + * Returns "true" if this bean is a singleton session bean. + * = + * @return "true" if this bean is a singleton session bean. + */ + boolean isSingleton(); + + /** * Returns @Statefull annotaion declaration. * = * @return @Statefull annotaion declaration. @@ -38,4 +51,11 @@ * @return @Stateless annotaion declaration. */ IAnnotationDeclaration getStatelessDeclaration(); + + /** + * Returns @Singleton annotaion declaration. + * = + * @return @Singleton annotaion declaration. + */ + IAnnotationDeclaration getSingletonDeclaration(); } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/CDIProject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/CDIProject.java 2010-05-13 22:33:18 UTC (rev 22073) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/CDIProject.java 2010-05-13 23:41:02 UTC (rev 22074) @@ -691,7 +691,7 @@ bean =3D new InterceptorBean(); } else if(typeDefinition.getDecoratorAnnotation() !=3D null) { bean =3D new DecoratorBean(); - } else if(typeDefinition.getStatefulAnnotation() !=3D null || typeDefin= ition.getStatelessAnnotation() !=3D null) { + } else if(typeDefinition.getStatefulAnnotation() !=3D null || typeDefin= ition.getStatelessAnnotation() !=3D null || typeDefinition.getSingletonAnno= tation() !=3D null) { bean =3D new SessionBean(); } else { bean =3D new ClassBean(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/SessionBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/SessionBean.java 2010-05-13 22:33:18 UTC (rev 22073) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/SessionBean.java 2010-05-13 23:41:02 UTC (rev 22074) @@ -33,9 +33,33 @@ = /* * (non-Javadoc) + * @see org.jboss.tools.cdi.core.ISessionBean#getSingletonDeclaration() + */ + public IAnnotationDeclaration getSingletonDeclaration() { + return getDefinition().getSingletonAnnotation(); + } + + /* + * (non-Javadoc) * @see org.jboss.tools.cdi.core.ISessionBean#isStateful() */ public boolean isStateful() { return getDefinition().getStatefulAnnotation() !=3D null; } + + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.ISessionBean#isSingleton() + */ + public boolean isSingleton() { + return getDefinition().getSingletonAnnotation() !=3D null; + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.ISessionBean#isStateless() + */ + public boolean isStateless() { + return getDefinition().getStatelessAnnotation() !=3D null; + } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/AnnotationHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/AnnotationHelper.java 2010-05-13 22:33:18 UTC (re= v 22073) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/AnnotationHelper.java 2010-05-13 23:41:02 UTC (re= v 22074) @@ -34,6 +34,7 @@ = BASIC_ANNOTATION_TYPES.add(STATEFUL_ANNOTATION_TYPE_NAME); BASIC_ANNOTATION_TYPES.add(STATELESS_ANNOTATION_TYPE_NAME); + BASIC_ANNOTATION_TYPES.add(SINGLETON_ANNOTATION_TYPE_NAME); = SCOPE_ANNOTATION_TYPES.add(APPLICATION_SCOPED_ANNOTATION_TYPE_NAME); SCOPE_ANNOTATION_TYPES.add(CONVERSATION_SCOPED_ANNOTATION_TYPE_NAME); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/TypeDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/TypeDefinition.java 2010-05-13 22:33:18 UTC (rev = 22073) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/TypeDefinition.java 2010-05-13 23:41:02 UTC (rev = 22074) @@ -94,4 +94,8 @@ public AnnotationDeclaration getStatelessAnnotation() { return annotationsByType.get(CDIConstants.STATELESS_ANNOTATION_TYPE_NAME= ); } + + public AnnotationDeclaration getSingletonAnnotation() { + return annotationsByType.get(CDIConstants.SINGLETON_ANNOTATION_TYPE_NAME= ); + } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-13 22:33:18 UTC (rev 220= 73) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-13 23:41:02 UTC (rev 220= 74) @@ -314,6 +314,8 @@ validateDisposers(bean); if(!(bean instanceof ISessionBean)) { validateManagedBean(bean); + } else { + validateSessionBean((ISessionBean)bean); } } = @@ -703,6 +705,33 @@ } } = + private void validateSessionBean(ISessionBean bean) { + if(bean.isStateless()) { + /* + * 3.2. Session beans + * - session bean specifies an illegal scope + * (a stateless session bean must belong to the @Dependent pseudo-sco= pe) = + */ + ITextSourceReference declaration =3D CDIUtil.getDifferentScopeDeclarati= onThanDepentend(bean); + if(declaration!=3Dnull) { + addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_STATELESS_SESSION_BEA= N, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, declaration, bean.getReso= urce()); + } + } else if(bean.isSingleton()) { + /* + * 3.2. Session beans + * - session bean specifies an illegal scope + * (a singleton bean must belong to either the @ApplicationScoped sco= pe or to the @Dependent pseudo-scope) = + */ + ITextSourceReference declaration =3D CDIUtil.getDifferentScopeDeclarati= onThanDepentend(bean); + if(declaration!=3Dnull) { + declaration =3D CDIUtil.getDifferentScopeDeclarationThanApplicationSco= ped(bean); + } + if(declaration!=3Dnull) { + addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_SINGLETON_SESSION_BEA= N, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, declaration, bean.getReso= urce()); + } + } + } + private void validateManagedBean(IClassBean bean) { /* * 3.1. Managed beans @@ -751,7 +780,7 @@ try { IBean sBean =3D bean.getSpecializedBean(); if(sBean!=3Dnull) { - if(sBean instanceof ISessionBean || sBean.getAnnotation(CDIConstants.= STATELESS_ANNOTATION_TYPE_NAME)!=3Dnull) { + if(sBean instanceof ISessionBean || sBean.getAnnotation(CDIConstants.= STATELESS_ANNOTATION_TYPE_NAME)!=3Dnull || sBean.getAnnotation(CDIConstants= .SINGLETON_ANNOTATION_TYPE_NAME)!=3Dnull) { // The specializing bean directly extends an enterprise bean class addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CD= IPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, specializesDeclaration, bea= n.getResource()); } else { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDIValidationMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-13 22:33:18 UTC (re= v 22073) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-13 23:41:02 UTC (re= v 22074) @@ -43,7 +43,8 @@ public static String STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE; public static String ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD; public static String ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_GENERIC_TYPE; - public static String ILLEGAL_SCOPE_FOR_SESSION_BEAN; + public static String ILLEGAL_SCOPE_FOR_STATELESS_SESSION_BEAN; + public static String ILLEGAL_SCOPE_FOR_SINGLETON_SESSION_BEAN; public static String ILLEGAL_SCOPE_FOR_PRODUCER_METHOD; public static String ILLEGAL_SCOPE_FOR_PRODUCER_FIELD; public static String ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-13 22:33:18 UTC (rev 22073) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-13 23:41:02 UTC (rev 22074) @@ -52,6 +52,11 @@ - bean class of a session bean is annotated @Interceptor or @Decorator - session bean with a parameterized bean class declares any scope other th= an @Dependent = + + + + + 3.2.4. Specializing a session bean - session bean class annotated @Specializes does not directly extend = the bean class of another session bean Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-13 22:33:18 UTC (rev 22073) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-13 23:41:02 UTC (rev 22074) @@ -22,7 +22,8 @@ STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE=3DStereotype declares more than on= e scope ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD=3DManaged bean with a pub= lic field declares any scope other than @Dependent ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_GENERIC_TYPE=3DManaged bean with a par= ameterized bean class declares any scope other than @Dependent -ILLEGAL_SCOPE_FOR_SESSION_BEAN=3DSession bean specifies an illegal scope (= a stateless session bean must belong to the @Dependent pseudo-scope; a sing= leton bean must belong to either the @ApplicationScoped scope or to the @De= pendent pseudo-scope, a stateful session bean may have any scope) +ILLEGAL_SCOPE_FOR_STATELESS_SESSION_BEAN=3DSession bean specifies an illeg= al scope. A stateless session bean must belong to the @Dependent pseudo-sco= pe. +ILLEGAL_SCOPE_FOR_SINGLETON_SESSION_BEAN=3DSession bean specifies an illeg= al scope. A singleton bean must belong to either the @ApplicationScoped sco= pe or to the @Dependent pseudo-scope. ILLEGAL_SCOPE_FOR_PRODUCER_METHOD=3DProducer method with a parameterized r= eturn type with a type variable declares any scope other than @Dependent ILLEGAL_SCOPE_FOR_PRODUCER_FIELD=3DProducer field with a parameterized typ= e with a type variable declares any scope other than @Dependent ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED=3DBean that declares an= y scope other than @Dependent has an injection point of type InjectionPoint= and qualifier @Default Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-13 22:33:18 UTC (rev 22073) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-13 23:41:02 UTC (rev 22074) @@ -63,7 +63,7 @@ {CDIPreferences.MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE, CDIPrefer= encesMessages.CDIValidatorConfigurationBlock_pb_missingScopeWhenThereIsNoDe= faultScope_label}, {CDIPreferences.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE, CDIPreferences= Messages.CDIValidatorConfigurationBlock_pb_stereotypeDeclaresMoreThanOneSco= pe_label}, {CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, CDIPreferencesMessages.= CDIValidatorConfigurationBlock_pb_illegalScopeForManagedBean_label}, -// {CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalScopeForSessionBean_label}, + {CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, CDIPreferencesMessages.= CDIValidatorConfigurationBlock_pb_illegalScopeForSessionBean_label}, {CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerMethod_label}, {CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalScopeForProducerField_label}, // {CDIPreferences.ILLEGAL_SCOPE_WHEN_TYPE_INJECTIONPOINT_IS_INJECTED, C= DIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalScopeWhenTyp= eInjectionPointIsInjected_label}, Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-13 22:33:18 UTC (rev 22073) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-13 23:41:02 UTC (rev 22074) @@ -266,6 +266,91 @@ } = /** + * 3.2. Session beans + * - session bean specifies an illegal scope + * (a stateless session bean must belong to the @Dependent pseudo-scope= ) = + * = + * @throws Exception + */ + public void testStatelessWithRequestScopeFails() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/enterprise/broken/statelessWithRequestScope/Beagle_Broken.j= ava"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_STATELESS_SE= SSION_BEAN, 23); + } + + /** + * 3.2. Session beans + * - session bean specifies an illegal scope + * (a stateless session bean must belong to the @Dependent pseudo-scope= ) = + * = + * @throws Exception + */ + public void testStatelessWithApplicationScopeFails() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/enterprise/broken/statelessWithApplicationScope/DachshundLo= cal_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_STATELESS_SE= SSION_BEAN, 23); + } + + /** + * 3.2. Session beans + * - session bean specifies an illegal scope + * (a stateless session bean must belong to the @Dependent pseudo-scope= ) = + * = + * @throws Exception + */ + public void testStatelessWithConversationScopeFails() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/enterprise/broken/statelessWithConversationScope/Boxer_Brok= en.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_STATELESS_SE= SSION_BEAN, 23); + } + + /** + * 3.2. Session beans + * - session bean specifies an illegal scope + * (a stateless session bean must belong to the @Dependent pseudo-scope= ) = + * = + * @throws Exception + */ + public void testStatelessWithSessionScopeFails() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/enterprise/broken/statelessWithSessionScope/Bullmastiff_Bro= ken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_STATELESS_SE= SSION_BEAN, 23); + } + + + /** + * 3.2. Session beans + * - session bean specifies an illegal scope + * (a singleton bean must belong to either the @ApplicationScoped scope= or to the @Dependent pseudo-scope) = + * = + * @throws Exception + */ + public void testSingletonWithConversationScopeFails() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/enterprise/broken/singletonWithConversationScope/Husky_Brok= en.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_SINGLETON_SE= SSION_BEAN, 24); + } + + /** + * 3.2. Session beans + * - session bean specifies an illegal scope + * (a singleton bean must belong to either the @ApplicationScoped scope= or to the @Dependent pseudo-scope) = + * = + * @throws Exception + */ + public void testSingletonWithSessionScopeFails() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/enterprise/broken/singletonWithSessionScope/IrishTerrier_Br= oken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_SINGLETON_SE= SSION_BEAN, 25); + } + + /** + * 3.2. Session beans + * - session bean specifies an illegal scope + * (a singleton bean must belong to either the @ApplicationScoped scope= or to the @Dependent pseudo-scope) = + * = + * @throws Exception + */ + public void testSingletonWithRequestScopeFails() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/enterprise/broken/singletonWithRequestScope/Greyhound_Broke= n.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_SINGLETON_SE= SSION_BEAN, 23); + } + + /** * 3.5.1. Declaring a resource * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) * = --===============8359544387742892122==-- From jbosstools-commits at lists.jboss.org Thu May 13 19:44:22 2010 Content-Type: multipart/mixed; boundary="===============2747536852547027995==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22075 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck. Date: Thu, 13 May 2010 19:44:22 -0400 Message-ID: <201005132344.o4DNiMwA008857@svn01.web.mwc.hst.phx2.redhat.com> --===============2747536852547027995== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-13 19:44:21 -0400 (Thu, 13 May 2010) New Revision: 22075 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Fixed JUnit test. Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-13 23:41:02 UTC (rev 22074) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-13 23:44:21 UTC (rev 22075) @@ -285,7 +285,7 @@ * @throws Exception */ public void testStatelessWithApplicationScopeFails() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/enterprise/broken/statelessWithApplicationScope/DachshundLo= cal_Broken.java"); + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/enterprise/broken/statelessWithApplicationScope/Dachshund_B= roken.java"); AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_STATELESS_SE= SSION_BEAN, 23); } = --===============2747536852547027995==-- From jbosstools-commits at lists.jboss.org Thu May 13 20:05:31 2010 Content-Type: multipart/mixed; boundary="===============7612508574967571048==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22076 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: views and 1 other directory. Date: Thu, 13 May 2010 20:05:31 -0400 Message-ID: <201005140005.o4E05VMo017894@svn01.web.mwc.hst.phx2.redhat.com> --===============7612508574967571048== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-13 20:05:30 -0400 (Thu, 13 May 2010) New Revision: 22076 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/message= s/JBossWSUI.properties trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/message= s/JBossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/D= elimitedStringList.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/J= AXRSWSTestView.java Log: OPEN - issue JBIDE-6283: [tester] User input for request parameters/headers= should be validated = https://jira.jboss.org/jira/browse/JBIDE-6283 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= messages/JBossWSUI.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUI.properties 2010-05-13 23:44:21 UTC (rev 22075) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUI.properties 2010-05-14 00:05:30 UTC (rev 22076) @@ -2,6 +2,8 @@ Command=3Dwsconsume.sh Bin=3Dbin Client=3Dclient +DelimitedStringList_NO_COMMAS_WARNING=3DThere are no commas delimiting the= name and value for this key/value pair. +DelimitedStringList_NO_EQUALS_DELIMITER_WARNING=3DParameters should be in = 'name=3Dvalue' format. Lib=3Dlib Endorsed=3Dendorsed # END NON-TRANSLATABLE Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= messages/JBossWSUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUIMessages.java 2010-05-13 23:44:21 UTC (rev 22075) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUIMessages.java 2010-05-14 00:05:30 UTC (rev 22076) @@ -27,6 +27,8 @@ public static String Bin; public static String Command; public static String Client; + public static String DelimitedStringList_NO_COMMAS_WARNING; + public static String DelimitedStringList_NO_EQUALS_DELIMITER_WARNING; public static String Lib; public static String Endorsed; = Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/DelimitedStringList.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= DelimitedStringList.java 2010-05-13 23:44:21 UTC (rev 22075) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= DelimitedStringList.java 2010-05-14 00:05:30 UTC (rev 22076) @@ -26,6 +26,7 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; import org.eclipse.swt.widgets.Text; import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; @@ -52,6 +53,7 @@ private List mPropsList; private Text mAddText; private boolean isReadOnly =3D false; + private Label mWarningLabel; = // current delimiter private String mDelimiter =3D DELIMITER; @@ -85,7 +87,7 @@ public DelimitedStringList(Composite parent, int style) { this(parent, style, false); } - = + /** * Constructor * = @@ -108,6 +110,13 @@ gridLayout.numColumns =3D 2; setLayout(gridLayout); { + this.mWarningLabel =3D new Label(this, SWT.NONE); + GridData wlGridData =3D new GridData(GridData.FILL_HORIZONTAL); + wlGridData.horizontalSpan =3D 2; + this.mWarningLabel.setLayoutData(wlGridData); + this.mWarningLabel.setForeground(this.mWarningLabel.getDisplay().getSys= temColor(SWT.COLOR_RED)); + } + { this.mAddText =3D new Text(this, SWT.BORDER | additionalStyles); this.mAddText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); this.mAddText.addModifyListener(new AddTextModifyListener(this)); @@ -406,15 +415,25 @@ value =3D this.mAddText.getText(); boolean flag =3D value !=3D null && value.trim().length() > 0; boolean valid =3D validateText(value); + if (!valid) { + this.mWarningLabel.setText(this.mWarning); + } else { + this.mWarningLabel.setText(""); //$NON-NLS-1$ + } this.mAddButton.setEnabled(flag && valid); + = } = } = private boolean validateText(String text) { if (text !=3D null && text.trim().length() > 0 && text.indexOf(",") > -1= ) { //$NON-NLS-1$ - this.mWarning =3D "There are no commas delimiting the name and value fo= r this key/value pair."; //$NON-NLS-1$ + this.mWarning =3D JBossWSUIMessages.DelimitedStringList_NO_COMMAS_WARNI= NG; return false; } + else if (text !=3D null && text.trim().length() > 0 && text.indexOf("=3D= ") =3D=3D -1) { //$NON-NLS-1$ + this.mWarning =3D JBossWSUIMessages.DelimitedStringList_NO_EQUALS_DELIM= ITER_WARNING; + return false; + } this.mWarning =3D null; return true; } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/JAXRSWSTestView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-13 23:44:21 UTC (rev 22075) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-14 00:05:30 UTC (rev 22076) @@ -268,7 +268,7 @@ = Button sampleButton =3D new Button(buttonBar, SWT.PUSH); sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_L= abel); - sampleButton.setVisible(true); + sampleButton.setVisible(false); = sampleButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { --===============7612508574967571048==-- From jbosstools-commits at lists.jboss.org Thu May 13 21:02:42 2010 Content-Type: multipart/mixed; boundary="===============4750269738561324390==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22077 - trunk/documentation/guides/JBDS_Release_Notes/en-US. Date: Thu, 13 May 2010 21:02:42 -0400 Message-ID: <201005140102.o4E12gGh025015@svn01.web.mwc.hst.phx2.redhat.com> --===============4750269738561324390== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: irooskov(a)redhat.com Date: 2010-05-13 21:02:42 -0400 (Thu, 13 May 2010) New Revision: 22077 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml Log: updated fixed issues with 2 new JBDS JIRA issues added Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-14 00:05:30 UTC (rev 22076) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-14 01:02:42 UTC (rev 22077) @@ -162,6 +162,11 @@ + JBDS-1215= : The installer was unable to locate the Seam runtimes within the J= Boss Enterprise Application Platform 4.3. This occurred because the Seam ru= ntime locations bundled within the JBoss Enterprise Application Platform 4.= 3 had recently changed from jboss-eap-4.3/seam and jboss-eap-4.3/seamfp to being jboss-eap-4.3/sea= m1 and jboss-eap-4.3/seam2. This version of= the JBoss Developer Studio includes an updated installer that contains the= new Seam runtime locations. The installer is now able to find the Seam run= times for the latest versions of the JBoss Enterprise Application Platform = 4.3. + + + + JBDS-1187= : An empty URL tag (<url>) caused the Classic Up= date option under PreferencesGeneralCapabilities to error upon installation of a plug-in. To fix this iss= ue the unused URL element has been removed. The Classic Update= option is now usable and installs plug-ins correctly. @@ -185,6 +190,11 @@ JBDS-1091= : Two bugs were found. A problem was found in the org.jbo= ss.tools.runtime_1.1.0 plug-in and the visibility of the Instance field was changed from public to private. These bugs= respectively caused the JBoss Developer Studio Server View to not display all available servers on occasion after using the inst= aller and jBPM runtimes to not be initialized correctly. The org.= jboss.tools.runtime_1.1.0 plug-in has now been updated to force = a refresh of the Server View post installation, which = can be verified by a refresh message appearing in the log file and the org.jboss.tools.jbpm.common plug-in has been updated to se= t public static final PreferencesManager INSTANCE =3D new Preferences= Manager();. By correcting the org.jboss.tools.runtime_1.1.= 0 plug-! in, all installed servers now appear in the Server View directly after installation of the JBoss Developer Studio through the in= staller. Fixing the org.jboss.tools.jbpm.common plug-i= n now allows for jBPM runtimes to be initialized correctly. Both issues are= fixed with this update. + + + JBDS-1088= : When installing the JBoss Developer Studio, if a previous install= ation was detected a dialog box would ask if you wished to overwrite the ex= isting directory. If a user continued with installation they would then hav= e a mixture of the old and new product versions. To better assist users a n= ew warning is displayed in this situation, which indicates that you cannot = upgrade by installing a new version over an old version. This new dialog bo= x ensures that a user is informed of what will happen. + + --===============4750269738561324390==-- From jbosstools-commits at lists.jboss.org Fri May 14 04:17:39 2010 Content-Type: multipart/mixed; boundary="===============6202356280203877138==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22078 - in workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces: resources and 3 other directories. Date: Fri, 14 May 2010 04:17:39 -0400 Message-ID: <201005140817.o4E8Hd0b027668@svn01.web.mwc.hst.phx2.redhat.com> --===============6202356280203877138== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-14 04:17:38 -0400 (Fri, 14 May 2010) New Revision: 22078 Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceCommandButtonTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/template/mock/impl/VpeUICommand.java Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/.classpath workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/resources/jsf-api.j= ar workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/resources/jsf-impl.= jar workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templ= ates-icefaces.xml Log: Processing ice button has been added, https://jira.jboss.org/jira/browse/JB= IDE-4710 = Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/.classpath 2010-05= -14 01:02:42 UTC (rev 22077) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/.classpath 2010-05= -14 08:17:38 UTC (rev 22078) @@ -3,10 +3,10 @@ - + - + Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/resources/js= f-api.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/resources/js= f-impl.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/t= ools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java = (rev 0) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-14 08:17:= 38 UTC (rev 22078) @@ -0,0 +1,60 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jsf.vpe.icefaces.template; + +import javax.faces.render.Renderer; + +import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; +import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUICommand; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.template.VpeTemplateManager; +import org.jboss.tools.vpe.editor.util.VisualDomUtil; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * @author mareshkau + * + */ +public class IceCommandButtonTemplate extends VpeAbstractTemplate{ + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + try { + VpeFacesContext.getInstance().setResponseWriter(null); + Renderer render =3D new com.icesoft.faces.component.ext.renderkit.Butto= nRenderer(); + VpeUICommand uiComponent =3D new VpeUICommand( + (Element) sourceNode); + Node result =3D VpeRendererUtil.processRenderer(render, uiComponent); + nsIDOMNode resultVisualNode =3D VpeRendererUtil.createVisualNode( + result, visualDocument); + if (resultVisualNode.getNodeType() =3D=3D Node.TEXT_NODE) { + nsIDOMElement domElement =3D VisualDomUtil + .createBorderlessContainer(visualDocument); + domElement.appendChild(resultVisualNode); + resultVisualNode =3D domElement; + } + return new VpeCreationData(resultVisualNode); + } catch (Throwable th) { + IceFacesActivator.getDefault().logError(th); + } + return VpeTemplateManager.getInstance().getDefTemplate().create( + pageContext, sourceNode, visualDocument); + } + +} Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/t= ools/jsf/vpe/template/mock/impl/VpeUICommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeUICommand.java (rev= 0) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeUICommand.java 2010-05-14 08:17:38 UTC (rev= 22078) @@ -0,0 +1,128 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jsf.vpe.template.mock.impl; + +import java.util.HashMap; +import java.util.Map; +import javax.el.ELContext; +import javax.el.ELException; +import javax.el.PropertyNotFoundException; +import javax.el.PropertyNotWritableException; +import javax.el.ValueExpression; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import com.icesoft.faces.component.ext.HtmlCommandButton; + +/** + * @author mareshkau + * + */ +public class VpeUICommand extends HtmlCommandButton { + + private Map attributesMap; + = + public VpeUICommand(Element sourceElement) { + attributesMap =3D new HashMap(); + NamedNodeMap attributes =3D sourceElement.getAttributes(); + for(int i=3D0;i getExpectedType() { + // TODO Auto-generated method stub + return String.class; + } + + @Override + public Class getType(ELContext arg0) + throws NullPointerException, PropertyNotFoundException, + ELException { + // TODO Auto-generated method stub + return String.class; + } + + @Override + public Object getValue(ELContext arg0) throws NullPointerException, + PropertyNotFoundException, ELException { + return getAttributes().get(name); + } + + @Override + public boolean isReadOnly(ELContext arg0) + throws NullPointerException, PropertyNotFoundException, + ELException { + // TODO Auto-generated method stub + return false; + } + + @Override + public void setValue(ELContext arg0, Object arg1) + throws NullPointerException, PropertyNotFoundException, + PropertyNotWritableException, ELException { + // TODO Auto-generated method stub + = + } + + @Override + public boolean equals(Object arg0) { + // TODO Auto-generated method stub + return false; + } + + @Override + public String getExpressionString() { + // TODO Auto-generated method stub + return (String) getAttributes().get(name); + } + + @Override + public int hashCode() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public boolean isLiteralText() { + // TODO Auto-generated method stub + return false; + } + = + }; + } + +} Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vp= e-templates-icefaces.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-temp= lates-icefaces.xml 2010-05-14 01:02:42 UTC (rev 22077) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-temp= lates-icefaces.xml 2010-05-14 08:17:38 UTC (rev 22078) @@ -37,5 +37,17 @@ - = + + + + + + + + + + + + --===============6202356280203877138==-- From jbosstools-commits at lists.jboss.org Fri May 14 05:43:34 2010 Content-Type: multipart/mixed; boundary="===============8021030198045813734==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22079 - trunk/esb/docs/esb_ref_guide/en-US. Date: Fri, 14 May 2010 05:43:34 -0400 Message-ID: <201005140943.o4E9hY77011496@svn01.web.mwc.hst.phx2.redhat.com> --===============8021030198045813734== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-14 05:43:34 -0400 (Fri, 14 May 2010) New Revision: 22079 Modified: trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-11 - Updated the doc according = to ESB for SOA-P 5.0 examples added. Modified: trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml 2010-05-14 08:17:38 = UTC (rev 22078) +++ trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml 2010-05-14 09:43:34 = UTC (rev 22079) @@ -144,9 +144,36 @@ = Clicking Next - brings you to the wizard page where yo= u can select a ESB project example from the example list. - Every ESB example has two projects, one is a ESB p= roject and another is a Java project used to test the ESB project. - Here is a list of ready examples available: + brings you to the wizard page where you can select a ESB p= roject example from the example list. + = +
+ Project Example Wizard</tit= le> + <mediaobject> + <imageobject> + <imagedata fileref= =3D"images/esb_project/05a_esb_project_example.png"/> + </imageobject> + </mediaobject> + </figure> + <note> + <title>Note: + Under the Projects + section you can find two categories relate= d to ESB: + = + + ESB= + ESB for SO= A-P 5.0 + + = + = + It means that if you use a runtime pointed t= o a SOA-P 5.0, you should download the examples from + the + ESB for SOA-P 5.0 + category in order to avoid the= incompatibility errors. + + + = + Every ESB example has two projects, one is a ESB pro= ject and another is a Java project used to test the ESB project. + Here is a list of ready examples available in both c= ategories (ESB and ESB for SOA-P 5.0): = = --===============8021030198045813734==-- From jbosstools-commits at lists.jboss.org Fri May 14 08:08:32 2010 Content-Type: multipart/mixed; boundary="===============3723044934066220572==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22080 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 4 other directories. Date: Fri, 14 May 2010 08:08:32 -0400 Message-ID: <201005141208.o4EC8WBi014098@svn01.web.mwc.hst.phx2.redhat.com> --===============3723044934066220572== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-14 08:08:31 -0400 (Fri, 14 May 2010) New Revision: 22080 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/sessionbeans/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/sessionbeans/SessionBeanAnnotatedDecoratorBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/sessionbeans/SessionBeanAnnotatedInterceptorBroken.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDIValidationMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : bean class of a session bean is annotated @Interceptor or @Decorator Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDIUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-14 09:43:34 UTC (rev 22079) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-14 12:08:31 UTC (rev 22080) @@ -254,4 +254,53 @@ } return declarations; } + + /** + * Returns true if the class bean is a session bean. + * = + * @param bean + * @return + */ + public static IAnnotationDeclaration getSessionDeclaration(IClassBean bea= n) { + IAnnotationDeclaration declaration =3D bean.getAnnotation(CDIConstants.S= TATEFUL_ANNOTATION_TYPE_NAME); + if(declaration!=3Dnull) { + return declaration; + } + declaration =3D bean.getAnnotation(CDIConstants.STATELESS_ANNOTATION_TYP= E_NAME); + if(declaration!=3Dnull) { + return declaration; + } + declaration =3D bean.getAnnotation(CDIConstants.SINGLETON_ANNOTATION_TYP= E_NAME); + return declaration; + } + + /** + * Returns true if the class bean is a session bean. + * = + * @param bean + * @return + */ + public static boolean isSessionBean(IBean bean) { + return bean instanceof ISessionBean || (bean instanceof IClassBean && (b= ean.getAnnotation(CDIConstants.STATEFUL_ANNOTATION_TYPE_NAME)!=3Dnull || be= an.getAnnotation(CDIConstants.STATELESS_ANNOTATION_TYPE_NAME)!=3Dnull || be= an.getAnnotation(CDIConstants.SINGLETON_ANNOTATION_TYPE_NAME)!=3Dnull)); + } + + /** + * Returns true if the class bean is a decorator. + * = + * @param bean + * @return + */ + public static boolean isDecorator(IBean bean) { + return bean instanceof IDecorator || (bean instanceof IClassBean && bean= .getAnnotation(CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME)!=3Dnull); + } + + /** + * Returns true if the class bean is an interceptor. + * = + * @param bean + * @return + */ + public static boolean isInterceptor(IBean bean) { + return bean instanceof IInterceptor || (bean instanceof IClassBean && be= an.getAnnotation(CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME)!=3Dnull); + } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-14 09:43:34 UTC (rev 220= 79) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-14 12:08:31 UTC (rev 220= 80) @@ -229,7 +229,6 @@ validateStereotype(type); } = - // TODO return OK_STATUS; } = @@ -248,8 +247,6 @@ } IStereotype stereotype =3D cdiProject.getStereotype(file.getFullPath()); validateStereotype(stereotype); - - // TODO } = /** @@ -306,8 +303,6 @@ if(bean instanceof IClassBean) { validateClassBean((IClassBean)bean); } - - // TODO } = private void validateClassBean(IClassBean bean) { @@ -317,6 +312,7 @@ } else { validateSessionBean((ISessionBean)bean); } + validateMixedClassBean(bean); } = private void validateDisposers(IClassBean bean) { @@ -705,6 +701,36 @@ } } = + /** + * Validates class bean which may be both a session and decorator (or int= erceptor). + * = + * @param bean + */ + private void validateMixedClassBean(IClassBean bean) { + ITextSourceReference sessionDeclaration =3D CDIUtil.getSessionDeclaratio= n(bean); + ITextSourceReference decoratorDeclaration =3D bean.getAnnotation(CDICons= tants.DECORATOR_STEREOTYPE_TYPE_NAME); + ITextSourceReference interceptorDeclaration =3D bean.getAnnotation(CDICo= nstants.INTERCEPTOR_ANNOTATION_TYPE_NAME); + + if(sessionDeclaration!=3Dnull) { + /* + * 3.2. Session beans + * - bean class of a session bean is annotated @Decorator = + */ + if(decoratorDeclaration!=3Dnull) { + addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_DECORATOR, CDIPr= eferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, sessionDeclarati= on, bean.getResource()); + addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_DECORATOR, CDIPr= eferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, decoratorDeclara= tion, bean.getResource()); + } + /* + * 3.2. Session beans + * - bean class of a session bean is annotated @Interceptor = + */ + if(interceptorDeclaration!=3Dnull) { + addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_INTERCEPTOR, CDI= Preferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, sessionDeclara= tion, bean.getResource()); + addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_INTERCEPTOR, CDI= Preferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, interceptorDec= laration, bean.getResource()); + } + } + } + private void validateSessionBean(ISessionBean bean) { if(bean.isStateless()) { /* Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDIValidationMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-14 09:43:34 UTC (re= v 22079) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-14 12:08:31 UTC (re= v 22080) @@ -70,7 +70,8 @@ public static String ILLEGAL_CONDITIONAL_OBSERVER; = public static String BOTH_INTERCEPTOR_AND_DECORATOR; - public static String SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR; + public static String SESSION_BEAN_ANNOTATED_INTERCEPTOR; + public static String SESSION_BEAN_ANNOTATED_DECORATOR; public static String PRODUCER_IN_INTERCEPTOR; public static String PRODUCER_IN_DECORATOR; public static String DISPOSER_IN_INTERCEPTOR; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-14 09:43:34 UTC (rev 22079) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-14 12:08:31 UTC (rev 22080) @@ -49,7 +49,8 @@ ILLEGAL_CONDITIONAL_OBSERVER=3DBean with scope @Dependent has an observer = method declared receive=3DIF_EXISTS = BOTH_INTERCEPTOR_AND_DECORATOR=3DThe bean class of a managed bean is annot= ated with both the @Interceptor and @Decorator stereotypes -SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR=3DBean class of a session = bean is annotated @Interceptor or @Decorator +SESSION_BEAN_ANNOTATED_INTERCEPTOR=3DBean class of a session bean is annot= ated @Interceptor +SESSION_BEAN_ANNOTATED_DECORATOR=3DBean class of a session bean is annotat= ed @Decorator PRODUCER_IN_INTERCEPTOR=3DInterceptor has a member annotated @Produces PRODUCER_IN_DECORATOR=3DDecorator has a member annotated @Produces DISPOSER_IN_INTERCEPTOR=3DInterceptor has a method annotated @Disposes Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-14 09:43:34 UTC (rev 22079) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-14 12:08:31 UTC (rev 22080) @@ -101,7 +101,7 @@ CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_intercepto= r_and_decorator, new String[][]{ {CDIPreferences.BOTH_INTERCEPTOR_AND_DECORATOR, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_bothInterceptorAndDecorator_label}, -// {CDIPreferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, CDI= PreferencesMessages.CDIValidatorConfigurationBlock_pb_sessionBeanAnnotatedI= nterceptorOrDecorator_label}, + {CDIPreferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, CDIPr= eferencesMessages.CDIValidatorConfigurationBlock_pb_sessionBeanAnnotatedInt= erceptorOrDecorator_label}, // {CDIPreferences.PRODUCER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferences= Messages.CDIValidatorConfigurationBlock_pb_producerInInterceptorOrDecorator= _label}, {CDIPreferences.DISPOSER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferencesMe= ssages.CDIValidatorConfigurationBlock_pb_disposerInInterceptorOrDecorator_l= abel}, // {CDIPreferences.MULTIPLE_DELEGATE, CDIPreferencesMessages.CDIValidat= orConfigurationBlock_pb_multipleDelegate_label}, Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/sessionbeans/SessionBeanAnnotatedDecoratorBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/sessionbeans/SessionBeanAnnotatedDecoratorBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/sessionbeans/SessionBeanAnnotatedDecoratorBroken.java 2010-05-14 = 12:08:31 UTC (rev 22080) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.sessionbeans; + +import javax.decorator.Decorator; +import javax.ejb.Stateless; + +(a)Decorator +(a)Stateless +public class SessionBeanAnnotatedDecoratorBroken { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/sessionbeans/SessionBeanAnnotatedDecoratorBroken= .java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/sessionbeans/SessionBeanAnnotatedInterceptorBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/sessionbeans/SessionBeanAnnotatedInterceptorBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/sessionbeans/SessionBeanAnnotatedInterceptorBroken.java 2010-05-1= 4 12:08:31 UTC (rev 22080) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.sessionbeans; + +import javax.ejb.Singleton; +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; + +(a)Interceptor +(a)Singleton +public class SessionBeanAnnotatedInterceptorBroken { + @AroundInvoke + public Object alwaysReturnThis(InvocationContext ctx) throws Exception { + return ctx.proceed(); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/sessionbeans/SessionBeanAnnotatedInterceptorBrok= en.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-14 09:43:34 UTC (rev 22079) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-14 12:08:31 UTC (rev 22080) @@ -351,6 +351,28 @@ } = /** + * 3.2. Session beans + * - bean class of a session bean is annotated @Interceptor = + * = + * @throws Exception + */ + public void testSessionBeanAnnotatedInterceptor() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/sessionbeans/SessionBeanAnnotatedInterceptorBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.SESSION_BEAN_ANNOTATED_INTERCE= PTOR, 8, 9); + } + + /** + * 3.2. Session beans + * - bean class of a session bean is annotated @Decorator = + * = + * @throws Exception + */ + public void testSessionBeanAnnotatedDecorator() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/sessionbeans/SessionBeanAnnotatedDecoratorBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.SESSION_BEAN_ANNOTATED_DECORAT= OR, 6, 7); + } + + /** * 3.5.1. Declaring a resource * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) * = --===============3723044934066220572==-- From jbosstools-commits at lists.jboss.org Fri May 14 08:14:13 2010 Content-Type: multipart/mixed; boundary="===============6712386326136720466==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22081 - trunk/jst/plugins/org.jboss.tools.jst.web.ui. Date: Fri, 14 May 2010 08:14:12 -0400 Message-ID: <201005141214.o4ECECHu014594@svn01.web.mwc.hst.phx2.redhat.com> --===============6712386326136720466== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2010-05-14 08:14:12 -0400 (Fri, 14 May 2010) New Revision: 22081 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml Log: https://jira.jboss.org/jira/browse/JBIDE-6257 , duplicated wizards were rem= oved. Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-14 12:0= 8:31 UTC (rev 22080) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-14 12:1= 4:12 UTC (rev 22081) @@ -102,6 +102,7 @@ + + + = + --> --===============2666004461793823284== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2010-05-14 08:23:04 -0400 (Fri, 14 May 2010) New Revision: 22082 Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst/= web/ui/test/WebWizardsTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6257 , junits for duplicated wizar= ds were removed. Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/too= ls/jst/web/ui/test/WebWizardsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst= /web/ui/test/WebWizardsTest.java 2010-05-14 12:14:12 UTC (rev 22081) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/src/org/jboss/tools/jst= /web/ui/test/WebWizardsTest.java 2010-05-14 12:23:04 UTC (rev 22082) @@ -36,11 +36,11 @@ */ public class WebWizardsTest extends AbstractModelNewWizardTest { = - public void testNewCssWizardInstanceIsCreated() { + public void _testNewCssWizardInstanceIsCreated() { testNewWizardInstanceIsCreated(NewCSSFileWizard.class.getName()); } = - public void testNewJsWizardInstanceIsCreated() { + public void _testNewJsWizardInstanceIsCreated() { testNewWizardInstanceIsCreated(NewJSFileWizard.class.getName()); } = @@ -48,14 +48,19 @@ testNewWizardInstanceIsCreated(NewWebFileWizard.class.getName()); } = - public void testNewJspWizardInstanceIsCreated() { + public void _testNewJspWizardInstanceIsCreated() { testNewWizardInstanceIsCreated(NewJSPFileWizard.class.getName()); } - //rewritten by Maksim Areshkau, as fix for https://jira.jboss.org/jira/br= owse/JBIDE-6216, - //https://jira.jboss.org/jira/browse/JBIDE-6190 + /* + * rewritten by Maksim Areshkau, as fix for + * https://jira.jboss.org/jira/browse/JBIDE-6216, + * https://jira.jboss.org/jira/browse/JBIDE-6190 = + */ public void testNewXhtmlWizardInstanceIsCreated() { - //commented by Maksim Areshkau, because in this methid not called - //init for wizard + /* + * commented by Maksim Areshkau, = + * because in this method not called init for wizard + */ //testNewWizardInstanceIsCreated(NewXHTMLWizard.class.getName()); IWorkbenchWizard = aWizard =3D (IWorkbenchWizard) WorkbenchUtils.findWizardByDefId( @@ -64,7 +69,9 @@ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), aWizard); try { - //here we show view to get initialized selection + /* + * here we show view to get initialized selection + */ PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().sh= owView("org.eclipse.jdt.ui.PackageExplorer"); //$NON-NLS-1$ } catch (PartInitException e) { fail(e.toString()); @@ -85,7 +92,7 @@ } } = - public void testNewHtmlWizardInstanceIsCreated() { + public void _testNewHtmlWizardInstanceIsCreated() { testNewWizardInstanceIsCreated(NewHTMLFileWizard.class.getName()); } = --===============2666004461793823284==-- From jbosstools-commits at lists.jboss.org Fri May 14 08:32:32 2010 Content-Type: multipart/mixed; boundary="===============3373704168399322487==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22083 - in trunk/cdi/plugins/org.jboss.tools.cdi.text.ext: src/org/jboss/tools/cdi/text/ext and 1 other directories. Date: Fri, 14 May 2010 08:32:32 -0400 Message-ID: <201005141232.o4ECWWvM017329@svn01.web.mwc.hst.phx2.redhat.com> --===============3373704168399322487== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-14 08:32:31 -0400 (Fri, 14 May 2010) New Revision: 22083 Added: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/t= ext/ext/hyperlink/DisposerHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/t= ext/ext/hyperlink/ProducerDisposerHyperlinkDetector.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/t= ext/ext/hyperlink/ProducerHyperlink.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/plugin.properties trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/plugin.xml trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/t= ext/ext/CDIExtensionsMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/t= ext/ext/messages.properties Log: https://jira.jboss.org/jira/browse/JBIDE-6251 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/plugin.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/plugin.properties 2010-0= 5-14 12:23:04 UTC (rev 22082) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/plugin.properties 2010-0= 5-14 12:32:31 UTC (rev 22083) @@ -1,3 +1,4 @@ providerName=3DJBoss by Red Hat InjectedPointHyperlinkDetector=3DCDI Injected Point +ProducerDisposerHyperlinkDetector=3DCDI Produser & Disposer Bundle-Name.0 =3D CDI Text Editors Extensions \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/plugin.xml 2010-05-14 12= :23:04 UTC (rev 22082) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/plugin.xml 2010-05-14 12= :32:31 UTC (rev 22083) @@ -11,5 +11,15 @@ targetId=3D"org.eclipse.jdt.ui.javaCode"> + + + + + = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tool= s/cdi/text/ext/CDIExtensionsMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/CDIExtensionsMessages.java 2010-05-14 12:23:04 UTC (rev 22082) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/CDIExtensionsMessages.java 2010-05-14 12:32:31 UTC (rev 22083) @@ -22,4 +22,6 @@ public static String CDI_EXT_PLUGIN_NO_MESSAGE; public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN; public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_CLASS; + public static String CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER; + public static String CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER; } Added: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/c= di/text/ext/hyperlink/DisposerHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/hyperlink/DisposerHyperlink.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/hyperlink/DisposerHyperlink.java 2010-05-14 12:32:31 UTC (rev 2208= 3) @@ -0,0 +1,69 @@ +/*************************************************************************= ****** = + * 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.cdi.text.ext.hyperlink; + +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.ui.JavaUI; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.PartInitException; +import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages; +import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; +import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; + +public class DisposerHyperlink extends AbstractHyperlink{ + IMethod method; + IRegion region; + = + public DisposerHyperlink(IRegion region, IMethod method, IDocument docume= nt){ + this.method =3D method; + this.region =3D region; + setDocument(document); + } + = + + @Override + protected IRegion doGetHyperlinkRegion(int offset) { + return region; + } + + protected void doHyperlink(IRegion region) { + IEditorPart part =3D null; + = + if(method !=3D null){ + try{ + part =3D JavaUI.openInEditor(method); + }catch(JavaModelException ex){ + CDIExtensionsPlugin.log(ex); + }catch(PartInitException ex){ + CDIExtensionsPlugin.log(ex); + } + = + if (part !=3D null) { + JavaUI.revealInEditor(part, (IJavaElement)method); + } = + } + if (part =3D=3D null) + openFileFailed(); + } + + @Override + public String getHyperlinkText() { + String text =3D CDIExtensionsMessages.CDI_PRODUCER_DISPOSER_HYPERLINK_OP= EN_BOUND_DISPOSER+" "; + if(method !=3D null) + text +=3D method.getElementName(); + return text; + } + = +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org= /jboss/tools/cdi/text/ext/hyperlink/DisposerHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/c= di/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2010-05-14 12:32:= 31 UTC (rev 22083) @@ -0,0 +1,190 @@ +/*************************************************************************= ****** = + * 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.cdi.text.ext.hyperlink; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.jdt.core.ICodeAssist; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility; +import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; +import org.eclipse.jdt.internal.ui.text.JavaWordFinder; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.ui.texteditor.ITextEditor; +import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDICoreNature; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.IBeanMethod; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.core.IClassBean; +import org.jboss.tools.cdi.core.IProducer; +import org.jboss.tools.cdi.core.IProducerMethod; +import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; + +public class ProducerDisposerHyperlinkDetector extends AbstractHyperlinkDe= tector { + = + public IHyperlink[] detectHyperlinks(ITextViewer textViewer, + IRegion region, boolean canShowMultipleHyperlinks) { + ITextEditor textEditor=3D (ITextEditor)getAdapter(ITextEditor.class); + if (region =3D=3D null || !canShowMultipleHyperlinks || !(textEditor ins= tanceof JavaEditor)) + return null; + = + int offset=3D region.getOffset(); + = + IJavaElement input=3D EditorUtility.getEditorInputJavaElement(textEditor= , false); + if (input =3D=3D null) + return null; + + if (input.getResource() =3D=3D null || input.getResource().getProject() = =3D=3D null) + return null; + + IDocument document=3D textEditor.getDocumentProvider().getDocument(textE= ditor.getEditorInput()); + IRegion wordRegion=3D JavaWordFinder.findWord(document, offset); + if (wordRegion =3D=3D null) + return null; + = + IFile file =3D null; + = + try { + IResource resource =3D input.getCorrespondingResource(); + if (resource instanceof IFile) + file =3D (IFile) resource; + } catch (JavaModelException e) { + CDIExtensionsPlugin.log(e); + } + = + if(file =3D=3D null) + return null; + = + Set beans =3D getBeans(file); + = + if(beans =3D=3D null) + return null; + = + IJavaElement[] elements =3D null; + = + try { + elements =3D ((ICodeAssist)input).codeSelect(wordRegion.getOffset(), wo= rdRegion.getLength()); + if (elements =3D=3D null) = + return null; + = + ArrayList hyperlinks =3D new ArrayList(); + for (IJavaElement element : elements) { + = + if(element instanceof IType){ + if(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME.equals(((IType) element= ).getFullyQualifiedName())){ + ICompilationUnit cUnit =3D (ICompilationUnit)input; + element =3D cUnit.getElementAt(wordRegion.getOffset()); + if(element =3D=3D null) + continue; + } + } + = + if (element instanceof IMethod) { + for(IBean bean : beans){ + if(bean instanceof IClassBean){ + IProducerMethod producer =3D getProducer((IClassBean)bean, (IMethod= )element); + if(producer !=3D null){ + List disposers =3D findDisposerMethods(producer); + for(IMethod method : disposers){ + hyperlinks.add(new DisposerHyperlink(region, method, document)); + } + }else{ + IBeanMethod disposer =3D getDisposer((IClassBean)bean, (IMethod)el= ement); + if(disposer !=3D null){ + List producers =3D findProducerMethods((IClassBean)bean,= disposer); + for(IMethod method : producers){ + hyperlinks.add(new ProducerHyperlink(region, method, document)); + } + } + } + } + } + } + } + = + if (hyperlinks !=3D null && !hyperlinks.isEmpty()) { + return (IHyperlink[])hyperlinks.toArray(new IHyperlink[hyperlinks.size= ()]); + } + } catch (JavaModelException jme) { + CDIExtensionsPlugin.log(jme); + } + return null; + } + = + private Set getBeans(IFile file){ + CDICoreNature cdiNature =3D CDICorePlugin.getCDI(file.getProject(), true= ); + = + if(cdiNature =3D=3D null) + return null; + = + = + ICDIProject cdiProject =3D cdiNature.getDelegate(); + = + if(cdiProject =3D=3D null) + return null; + = + = + Set beans =3D cdiProject.getBeans(file.getFullPath()); + return beans; + } + = + private IProducerMethod getProducer(IClassBean classBean, IMethod method){ + for(IProducer producer : classBean.getProducers()){ + if(producer instanceof IProducerMethod && ((IProducerMethod)producer).g= etMethod().equals(method)) + return (IProducerMethod)producer; + } + return null; + } + + private IBeanMethod getDisposer(IClassBean classBean, IMethod method){ + for(IBeanMethod disposer : classBean.getDisposers()){ + if(disposer.getMethod().equals(method)) + return disposer; + } + return null; + } + = + private List findProducerMethods(IClassBean classBean, IBeanMeth= od disposer){ + ArrayList methods =3D new ArrayList(); + for(IProducer producer : classBean.getProducers()){ + if(producer instanceof IProducerMethod){ + for(IBeanMethod beanMethod : producer.getCDIProject().resolveDisposers= ((IProducerMethod)producer)){ + if(beanMethod.equals(disposer)) + methods.add(((IProducerMethod)producer).getMethod()); + } + } + } + return methods; + } + + private List findDisposerMethods(IProducerMethod producer){ + ArrayList methods =3D new ArrayList(); + for(IBeanMethod beanMethod : producer.getCDIProject().resolveDisposers(p= roducer)){ + methods.add(beanMethod.getMethod()); + } + return methods; + } + = +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org= /jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/c= di/text/ext/hyperlink/ProducerHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/hyperlink/ProducerHyperlink.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/hyperlink/ProducerHyperlink.java 2010-05-14 12:32:31 UTC (rev 2208= 3) @@ -0,0 +1,32 @@ +/*************************************************************************= ****** = + * 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.cdi.text.ext.hyperlink; + +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages; + +public class ProducerHyperlink extends DisposerHyperlink{ + = + public ProducerHyperlink(IRegion region, IMethod method, IDocument docume= nt){ + super(region, method, document); + } + + @Override + public String getHyperlinkText() { + String text =3D CDIExtensionsMessages.CDI_PRODUCER_DISPOSER_HYPERLINK_OP= EN_BOUND_PRODUCER+" "; + if(method !=3D null) + text +=3D method.getElementName(); + return text; + } + = +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org= /jboss/tools/cdi/text/ext/hyperlink/ProducerHyperlink.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tool= s/cdi/text/ext/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/messages.properties 2010-05-14 12:23:04 UTC (rev 22082) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/messages.properties 2010-05-14 12:32:31 UTC (rev 22083) @@ -1,3 +1,5 @@ CDI_EXT_PLUGIN_NO_MESSAGE=3DNo message CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN=3DOpen CDI Bean CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_CLASS=3DOpen Injected Class +CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER=3DOpen Bound Disposer = Method +CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER=3DOpen Bound Producer = Method --===============3373704168399322487==-- From jbosstools-commits at lists.jboss.org Fri May 14 08:34:39 2010 Content-Type: multipart/mixed; boundary="===============5223269163615451151==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22084 - in workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces: src/org/jboss/tools/jsf/vpe/template/mock/impl and 1 other directories. Date: Fri, 14 May 2010 08:34:39 -0400 Message-ID: <201005141234.o4ECYdJl017354@svn01.web.mwc.hst.phx2.redhat.com> --===============5223269163615451151== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-14 08:34:39 -0400 (Fri, 14 May 2010) New Revision: 22084 Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceInputTextTemplate.java Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/template/mock/impl/VpeUIComponent.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templ= ates-icefaces.xml Log: https://jira.jboss.org/jira/browse/JBIDE-4710 input text has been added tem= plate Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/t= ools/jsf/vpe/icefaces/template/IceInputTextTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceInputTextTemplate.java = (rev 0) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-14 12:34:39 U= TC (rev 22084) @@ -0,0 +1,61 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jsf.vpe.icefaces.template; + +import javax.faces.render.Renderer; + +import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; +import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUICommand; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.template.VpeTemplateManager; +import org.jboss.tools.vpe.editor.util.VisualDomUtil; +import org.mozilla.interfaces.nsIDOMDocument; +import org.mozilla.interfaces.nsIDOMElement; +import org.mozilla.interfaces.nsIDOMNode; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * @author mareshkau + * + */ +public class IceInputTextTemplate extends VpeAbstractTemplate{ + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + try { + VpeFacesContext.getInstance().setResponseWriter(null); + Renderer render =3D new com.icesoft.faces.component.ext.renderkit.Input= TextRenderer(); + VpeUICommand uiComponent =3D new VpeUICommand( + (Element) sourceNode); + Node result =3D VpeRendererUtil.processRenderer(render, uiComponent); + nsIDOMNode resultVisualNode =3D VpeRendererUtil.createVisualNode( + result, visualDocument); + if (resultVisualNode.getNodeType() =3D=3D Node.TEXT_NODE) { + nsIDOMElement domElement =3D VisualDomUtil + .createBorderlessContainer(visualDocument); + domElement.appendChild(resultVisualNode); + resultVisualNode =3D domElement; + } + return new VpeCreationData(resultVisualNode); + } catch (Throwable th) { + IceFacesActivator.getDefault().logError(th); + } + return VpeTemplateManager.getInstance().getDefTemplate().create( + pageContext, sourceNode, visualDocument); + } + +} Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/template/mock/impl/VpeUIComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeUIComponent.java 2010-05-14 12:32:31 UTC (r= ev 22083) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeUIComponent.java 2010-05-14 12:34:39 UTC (r= ev 22084) @@ -12,6 +12,11 @@ = import java.util.HashMap; import java.util.Map; + +import javax.el.ELContext; +import javax.el.ELException; +import javax.el.PropertyNotWritableException; +import javax.el.ValueExpression; import javax.faces.context.FacesContext; import javax.faces.el.EvaluationException; import javax.faces.el.PropertyNotFoundException; @@ -65,36 +70,72 @@ } = /* (non-Javadoc) - * @see javax.faces.component.UIComponent#getValueBinding(java.lang.Strin= g) + * @see javax.faces.component.UIComponent#getValueExpression(java.lang.St= ring) */ @Override - public ValueBinding getValueBinding(String arg0) { + public ValueExpression getValueExpression(final String name) { + return new ValueExpression(){ = - final String value=3Darg0; - return new ValueBinding() { - = @Override - public void setValue(FacesContext arg0, Object arg1) - throws EvaluationException, PropertyNotFoundException { = + public Class getExpectedType() { + // TODO Auto-generated method stub + return String.class; } - = + @Override - public boolean isReadOnly(FacesContext arg0) throws EvaluationException, - PropertyNotFoundException { - return true; + public Class getType(ELContext arg0) + throws NullPointerException, PropertyNotFoundException, + ELException { + // TODO Auto-generated method stub + return String.class; } - = + @Override - public Object getValue(FacesContext arg0) throws EvaluationException, - PropertyNotFoundException { - return getAttributes().get(value); + public Object getValue(ELContext arg0) throws NullPointerException, + PropertyNotFoundException, ELException { + return getAttributes().get(name); } - = + @Override - public Class getType(FacesContext arg0) throws EvaluationException, - PropertyNotFoundException { - return null; + public boolean isReadOnly(ELContext arg0) + throws NullPointerException, PropertyNotFoundException, + ELException { + // TODO Auto-generated method stub + return false; } + + @Override + public void setValue(ELContext arg0, Object arg1) + throws NullPointerException, PropertyNotFoundException, + PropertyNotWritableException, ELException { + // TODO Auto-generated method stub + = + } + + @Override + public boolean equals(Object arg0) { + // TODO Auto-generated method stub + return false; + } + + @Override + public String getExpressionString() { + // TODO Auto-generated method stub + return (String) getAttributes().get(name); + } + + @Override + public int hashCode() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public boolean isLiteralText() { + // TODO Auto-generated method stub + return false; + } + = }; } = Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vp= e-templates-icefaces.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-temp= lates-icefaces.xml 2010-05-14 12:32:31 UTC (rev 22083) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-temp= lates-icefaces.xml 2010-05-14 12:34:39 UTC (rev 22084) @@ -3,12 +3,6 @@ - - - -
#Input Text
- - = + + + + + + + + + + + + --===============5223269163615451151==-- From jbosstools-commits at lists.jboss.org Fri May 14 08:44:23 2010 Content-Type: multipart/mixed; boundary="===============1629907051310224316==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22085 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/validation/sessionbeans and 1 other directories. Date: Fri, 14 May 2010 08:44:23 -0400 Message-ID: <201005141244.o4ECiNvD018320@svn01.web.mwc.hst.phx2.redhat.com> --===============1629907051310224316== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-14 08:44:22 -0400 (Fri, 14 May 2010) New Revision: 22085 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/sessionbeans/FooBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/sessionbeans/LocalFoo.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDIValidationMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/messages.properties trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : session bean with a parameterized bean class declares any scope other tha= n @Dependent Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-14 12:34:39 UTC (rev 220= 84) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-14 12:44:22 UTC (rev 220= 85) @@ -732,29 +732,44 @@ } = private void validateSessionBean(ISessionBean bean) { - if(bean.isStateless()) { - /* - * 3.2. Session beans - * - session bean specifies an illegal scope - * (a stateless session bean must belong to the @Dependent pseudo-sco= pe) = - */ - ITextSourceReference declaration =3D CDIUtil.getDifferentScopeDeclarati= onThanDepentend(bean); - if(declaration!=3Dnull) { - addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_STATELESS_SESSION_BEA= N, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, declaration, bean.getReso= urce()); + IAnnotationDeclaration declaration =3D CDIUtil.getDifferentScopeDeclarat= ionThanDepentend(bean); + if(declaration!=3Dnull) { + IType type =3D bean.getBeanClass(); + try { + /* + * 3.2. Session beans + * - session bean with a parameterized bean class declares any scope = other than @Dependent = + */ + String[] typeVariables =3D type.getTypeParameterSignatures(); + if(typeVariables.length>0) { + addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_SESSION_BEAN_WITH_GE= NERIC_TYPE, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, declaration, bea= n.getResource()); + } else { + if(bean.isStateless()) { + /* + * 3.2. Session beans + * - session bean specifies an illegal scope + * (a stateless session bean must belong to the @Dependent pseudo-= scope) = + */ + if(declaration!=3Dnull) { + addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_STATELESS_SESSION_= BEAN, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, declaration, bean.getR= esource()); + } + } else if(bean.isSingleton()) { + /* + * 3.2. Session beans + * - session bean specifies an illegal scope + * (a singleton bean must belong to either the @ApplicationScoped = scope or to the @Dependent pseudo-scope) = + */ + if(declaration!=3Dnull) { + declaration =3D CDIUtil.getDifferentScopeDeclarationThanApplication= Scoped(bean); + } + if(declaration!=3Dnull) { + addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_SINGLETON_SESSION_= BEAN, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, declaration, bean.getR= esource()); + } + } + } + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); } - } else if(bean.isSingleton()) { - /* - * 3.2. Session beans - * - session bean specifies an illegal scope - * (a singleton bean must belong to either the @ApplicationScoped sco= pe or to the @Dependent pseudo-scope) = - */ - ITextSourceReference declaration =3D CDIUtil.getDifferentScopeDeclarati= onThanDepentend(bean); - if(declaration!=3Dnull) { - declaration =3D CDIUtil.getDifferentScopeDeclarationThanApplicationSco= ped(bean); - } - if(declaration!=3Dnull) { - addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_SINGLETON_SESSION_BEA= N, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, declaration, bean.getReso= urce()); - } } } = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDIValidationMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-14 12:34:39 UTC (re= v 22084) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-14 12:44:22 UTC (re= v 22085) @@ -43,6 +43,7 @@ public static String STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE; public static String ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD; public static String ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_GENERIC_TYPE; + public static String ILLEGAL_SCOPE_FOR_SESSION_BEAN_WITH_GENERIC_TYPE; public static String ILLEGAL_SCOPE_FOR_STATELESS_SESSION_BEAN; public static String ILLEGAL_SCOPE_FOR_SINGLETON_SESSION_BEAN; public static String ILLEGAL_SCOPE_FOR_PRODUCER_METHOD; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-14 12:34:39 UTC (rev 22084) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-14 12:44:22 UTC (rev 22085) @@ -22,6 +22,7 @@ STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE=3DStereotype declares more than on= e scope ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_PUBLIC_FIELD=3DManaged bean with a pub= lic field declares any scope other than @Dependent ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_GENERIC_TYPE=3DManaged bean with a par= ameterized bean class declares any scope other than @Dependent +ILLEGAL_SCOPE_FOR_SESSION_BEAN_WITH_GENERIC_TYPE=3DSession bean with a par= ameterized bean class declares any scope other than @Dependent ILLEGAL_SCOPE_FOR_STATELESS_SESSION_BEAN=3DSession bean specifies an illeg= al scope. A stateless session bean must belong to the @Dependent pseudo-sco= pe. ILLEGAL_SCOPE_FOR_SINGLETON_SESSION_BEAN=3DSession bean specifies an illeg= al scope. A singleton bean must belong to either the @ApplicationScoped sco= pe or to the @Dependent pseudo-scope. ILLEGAL_SCOPE_FOR_PRODUCER_METHOD=3DProducer method with a parameterized r= eturn type with a type variable declares any scope other than @Dependent Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/sessionbeans/FooBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/sessionbeans/FooBroken.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/sessionbeans/FooBroken.java 2010-05-14 12:44:22 UTC (rev 22085) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.sessionbeans; + +import javax.ejb.Stateful; +import javax.enterprise.context.RequestScoped; + +(a)RequestScoped +(a)Stateful +class FooBroken implements LocalFoo { + + public void foo() { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/sessionbeans/FooBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/sessionbeans/LocalFoo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/sessionbeans/LocalFoo.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/sessionbeans/LocalFoo.java 2010-05-14 12:44:22 UTC (rev 22085) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.sessionbeans; + +import javax.ejb.Local; + +(a)Local +public interface LocalFoo { + + void foo(); +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/sessionbeans/LocalFoo.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-14 12:34:39 UTC (rev 22084) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-14 12:44:22 UTC (rev 22085) @@ -373,6 +373,17 @@ } = /** + * 3.2. Session beans + * - session bean with a parameterized bean class declares any scope oth= er than @Dependent = + * = + * @throws Exception + */ + public void testNonDependentGenericSessionBeanNotOk() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/sessionbeans/FooBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_SESSION_BEAN= _WITH_GENERIC_TYPE, 6); + } + + /** * 3.5.1. Declaring a resource * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) * = --===============1629907051310224316==-- From jbosstools-commits at lists.jboss.org Fri May 14 10:03:27 2010 Content-Type: multipart/mixed; boundary="===============0743999902662507871==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22086 - in trunk/jsf/docs/userguide/en-US: images/editors_features and 1 other directory. Date: Fri, 14 May 2010 10:03:27 -0400 Message-ID: <201005141403.o4EE3RHY007715@svn01.web.mwc.hst.phx2.redhat.com> --===============0743999902662507871== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-14 10:03:26 -0400 (Fri, 14 May 2010) New Revision: 22086 Added: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_features_= 27b.png Modified: trunk/jsf/docs/userguide/en-US/editors.xml Log:

https://jira.jboss.org/jira/browse/TOOLSDOC-10 -Investigated JBIDE-2118:= Added info about EL support of CA to "3.1.2. Content Assist". Modified: trunk/jsf/docs/userguide/en-US/editors.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/docs/userguide/en-US/editors.xml 2010-05-14 12:44:22 UTC (rev= 22085) +++ trunk/jsf/docs/userguide/en-US/editors.xml 2010-05-14 14:03:26 UTC (rev= 22086) @@ -819,6 +819,21 @@

+
+ Content Assist for EL expressions + Content Assist also provide= s an expression language (JSF EL) support. + It is used in web application pages to access the = JavaBeans components = + in the page bean and in other beans associated wit= h the web application, = + such as the session bean and the application bean.= +
+ EL Content Assist + + + + + +
+
= = @@ -834,6 +849,7 @@ + = If XHTML file uses custom Facelets components, the C= ontent Assist should also be available for them. For details, see "C= ontent Assist for Custom Added: trunk/jsf/docs/userguide/en-US/images/editors_features/editors_featu= res_27b.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en-US/images/editors_features= /editors_features_27b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============0743999902662507871==-- From jbosstools-commits at lists.jboss.org Fri May 14 10:11:59 2010 Content-Type: multipart/mixed; boundary="===============7129046620439273640==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22087 - trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test. Date: Fri, 14 May 2010 10:11:58 -0400 Message-ID: <201005141411.o4EEBwmj008652@svn01.web.mwc.hst.phx2.redhat.com> --===============7129046620439273640== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-14 10:11:58 -0400 (Fri, 14 May 2010) New Revision: 22087 Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/HyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/CdiTextExtAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/InjectedPointHyperlinkDetectorTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6251 Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/CdiTextExtAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/CdiTextExtAllTests.java 2010-05-14 14:03:26 UTC (rev 22086) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/CdiTextExtAllTests.java 2010-05-14 14:11:58 UTC (rev 22087) @@ -8,6 +8,7 @@ public static Test suite() { TestSuite suite =3D new TestSuite(CdiTextExtAllTests.class.getName()); suite.addTest(InjectedPointHyperlinkDetectorTest.suite()); + suite.addTest(ProducerDisposerHyperlinkDetectorTest.suite()); return suite; } } Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tool= s/cdi/text/ext/test/HyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/HyperlinkDetectorTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/HyperlinkDetectorTest.java 2010-05-14 14:11:58 UTC (rev 22= 087) @@ -0,0 +1,140 @@ +package org.jboss.tools.cdi.text.ext.test; + +import java.util.ArrayList; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jdt.internal.ui.text.JavaWordFinder; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.Region; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; +import org.eclipse.ui.ide.IDE; +import org.eclipse.ui.texteditor.ITextEditor; +import org.eclipse.wst.sse.core.StructuredModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IModelManager; +import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; +import org.jboss.tools.common.text.ext.util.AxisUtil; + +import junit.framework.TestCase; + +public class HyperlinkDetectorTest extends TestCase { + protected boolean findOffsetInRegions(int offset, ArrayList regio= nList){ + for(Region region : regionList){ + if(offset >=3D region.getOffset() && offset <=3D region.getOffset()+reg= ion.getLength()) + return true; + } + return false; + } + + protected IEditorPart openFileInEditor(IFile input) { + if (input !=3D null && input.exists()) { + try { + IWorkbenchPage page =3D PlatformUI.getWorkbench() + .getActiveWorkbenchWindow().getActivePage(); + return IDE.openEditor(page, input, true); + } catch (PartInitException pie) { + = + } + } + return null; + } + + class TestData { + IDocument document; + int offset; + IRegion region; + String contentType; + private IHyperlinkRegion hyperlinkRegion =3D null; + + TestData (IDocument document, int offset) { + this.document =3D document; + this.offset =3D offset; + init(); + } + + private void init() { + this.region =3D getDocumentRegion(); + this.contentType =3D getContentType(); + this.hyperlinkRegion =3D getHyperlinkRegion(); + } + + private IRegion getDocumentRegion() { + IRegion region =3D null; + try { + region =3D JavaWordFinder.findWord(document, offset); + } catch (Exception x) {} + = + return region; + } + + public IHyperlinkRegion getHyperlinkRegion() { + if (hyperlinkRegion !=3D null) + return hyperlinkRegion; + + return new IHyperlinkRegion() { + public String getAxis() { + return AxisUtil.getAxis(document, region.getOffset()); + } + public String getContentType() { + return contentType; + } + public String getType() { + return region.toString(); + } + public int getLength() { + return region.getLength(); + } + public int getOffset() { + return region.getOffset(); + } + public String toString() { + return "[" + getOffset() + "-" + (getOffset() + getLength= () - 1) + ":" + getType() + ":" + getContentType() + "]"; + } + }; + } + + /** + * Returns the content type of document + * = + * @param document - + * assumes document is not null + * @return String content type of given document + */ + private String getContentType() { + String type =3D null; + = + IModelManager mgr =3D StructuredModelManager.getModelManager(); + IStructuredModel model =3D null; + try { + model =3D mgr.getExistingModelForRead(document); + if (model !=3D null) { + type =3D model.getContentTypeIdentifier(); + } + } finally { + if (model !=3D null) { + model.releaseFromRead(); + } + } + return type; + } + } + + class TestContext implements IAdaptable{ + ITextEditor editor; + + public TestContext(ITextEditor editor){ + this.editor =3D editor; + } + + public Object getAdapter(Class adapter) { + if(adapter.equals(ITextEditor.class)) + return editor; + return null; + } + } +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/= org/jboss/tools/cdi/text/ext/test/HyperlinkDetectorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-14 14:03:2= 6 UTC (rev 22086) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-14 14:11:5= 8 UTC (rev 22087) @@ -33,7 +33,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.AxisUtil; = -public class InjectedPointHyperlinkDetectorTest extends TestCase { +public class InjectedPointHyperlinkDetectorTest extends HyperlinkDetectorT= est { private static final String PROJECT_NAME =3D "/tests/lookup/injectionpoin= t"; private static final String FILE_NAME =3D "JavaSource/org/jboss/jsr299/tc= k/tests/lookup/injectionpoint/LoggerConsumer.java"; = @@ -111,7 +111,7 @@ } else { for(Region region : regionList){ if(i >=3D region.getOffset() && i <=3D region.getOffset()+region.getL= ength()) - fail("Wrong detection for region - "+region.getOffset()+" : "+region= .getLength()+region.getLength()+" region - "+i); + fail("Wrong detection for region - "+region.getOffset()+" : "+region= .getLength()+" region - "+i); } } } @@ -121,118 +121,5 @@ documentProvider.disconnect(editorInput); } = - private boolean findOffsetInRegions(int offset, ArrayList regionL= ist){ - for(Region region : regionList){ - if(offset >=3D region.getOffset() && offset <=3D region.getOffset()+reg= ion.getLength()) - return true; - } - return false; - } = - private IEditorPart openFileInEditor(IFile input) { - if (input !=3D null && input.exists()) { - try { - IWorkbenchPage page =3D PlatformUI.getWorkbench() - .getActiveWorkbenchWindow().getActivePage(); - return IDE.openEditor(page, input, true); - } catch (PartInitException pie) { - = - } - } - return null; - } - - class TestData { - IDocument document; - int offset; - IRegion region; - String contentType; - private IHyperlinkRegion hyperlinkRegion =3D null; - - TestData (IDocument document, int offset) { - this.document =3D document; - this.offset =3D offset; - init(); - } - - private void init() { - this.region =3D getDocumentRegion(); - this.contentType =3D getContentType(); - this.hyperlinkRegion =3D getHyperlinkRegion(); - } - - private IRegion getDocumentRegion() { - IRegion region =3D null; - try { - region =3D JavaWordFinder.findWord(document, offset); - } catch (Exception x) {} - = - return region; - } - - public IHyperlinkRegion getHyperlinkRegion() { - if (hyperlinkRegion !=3D null) - return hyperlinkRegion; - - return new IHyperlinkRegion() { - public String getAxis() { - return AxisUtil.getAxis(document, region.getOffset()); - } - public String getContentType() { - return contentType; - } - public String getType() { - return region.toString(); - } - public int getLength() { - return region.getLength(); - } - public int getOffset() { - return region.getOffset(); - } - public String toString() { - return "[" + getOffset() + "-" + (getOffset() + getLength= () - 1) + ":" + getType() + ":" + getContentType() + "]"; - } - }; - } - - /** - * Returns the content type of document - * = - * @param document - - * assumes document is not null - * @return String content type of given document - */ - private String getContentType() { - String type =3D null; - = - IModelManager mgr =3D StructuredModelManager.getModelManager(); - IStructuredModel model =3D null; - try { - model =3D mgr.getExistingModelForRead(document); - if (model !=3D null) { - type =3D model.getContentTypeIdentifier(); - } - } finally { - if (model !=3D null) { - model.releaseFromRead(); - } - } - return type; - } - } - - class TestContext implements IAdaptable{ - ITextEditor editor; - - public TestContext(ITextEditor editor){ - this.editor =3D editor; - } - - public Object getAdapter(Class adapter) { - if(adapter.equals(ITextEditor.class)) - return editor; - return null; - } - } } \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tool= s/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java 2010-05-14 14:1= 1:58 UTC (rev 22087) @@ -0,0 +1,110 @@ +package org.jboss.tools.cdi.text.ext.test; + +import java.util.ArrayList; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.texteditor.DocumentProviderRegistry; +import org.eclipse.ui.texteditor.IDocumentProvider; +import org.eclipse.ui.texteditor.ITextEditor; +import org.jboss.tools.cdi.core.test.tck.TCKTest; +import org.jboss.tools.cdi.text.ext.hyperlink.ProducerDisposerHyperlinkDet= ector; + +public class ProducerDisposerHyperlinkDetectorTest extends HyperlinkDetect= orTest{ + private static final String PROJECT_NAME =3D "/tests/decorators/invocatio= n/producer/method"; + private static final String FILE_NAME =3D "JavaSource/org/jboss/jsr299/tc= k/tests/decorators/invocation/producer/method/ProducerImpl.java"; + + public static Test suite() { + return new TestSuite(ProducerDisposerHyperlinkDetectorTest.class); + } + + public void testProducerDisposerHyperlinkDetector() throws Exception { + IProject project =3D TCKTest.importPreparedProject(PROJECT_NAME); + doTest(project); + TCKTest.cleanProject(PROJECT_NAME); + } + + private void doTest(IProject project) throws Exception { + IFile javaFile =3D project.getFile(FILE_NAME); + + TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile !=3D null)); + TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile.exists())); + + FileEditorInput editorInput =3D new FileEditorInput(javaFile); + + IDocumentProvider documentProvider =3D null; + Throwable exception =3D null; + try { + documentProvider =3D DocumentProviderRegistry.getDefault().getDocumentP= rovider(editorInput); + } catch (Exception x) { + exception =3D x; + x.printStackTrace(); + } + assertNull("An exception caught: " + (exception !=3D null? exception.get= Message() : ""), exception); + + assertNotNull("The document provider for the file \"" + FILE_NAME + "\" = is not loaded", documentProvider); + + try { + documentProvider.connect(editorInput); + } catch (Exception x) { + exception =3D x; + x.printStackTrace(); + assertTrue("The document provider is not able to be initialized with th= e editor input", false); + } + assertNull("An exception caught: " + (exception !=3D null? exception.get= Message() : ""), exception); + + IDocument document =3D documentProvider.getDocument(editorInput); + + assertNotNull("The document for the file \"" + FILE_NAME + "\" is not lo= aded", document); + + ProducerDisposerHyperlinkDetector elPartitioner =3D new ProducerDisposer= HyperlinkDetector(); + + ArrayList regionList =3D new ArrayList(); + regionList.add(new Region(1199, 8)); // @Produces + regionList.add(new Region(1222, 7)); // producer + regionList.add(new Region(1291, 7)); // disposer + + IEditorPart part =3D openFileInEditor(javaFile); + ISourceViewer viewer =3D null; + if(part instanceof JavaEditor){ + viewer =3D ((JavaEditor)part).getViewer(); + } + + elPartitioner.setContext(new TestContext((ITextEditor)part)); + + int counter =3D 0; + for (int i =3D 0; i < document.getLength(); i++) { + TestData testData =3D new TestData(document, i); + IHyperlink[] links =3D elPartitioner.detectHyperlinks(viewer, testData.= getHyperlinkRegion(), true); + + boolean recognized =3D links !=3D null; + + if (recognized) { + counter++; + if(!findOffsetInRegions(i, regionList)){ + fail("Wrong detection for offset - "+i); + } + } else { + for(Region region : regionList){ + if(i >=3D region.getOffset() && i <=3D region.getOffset()+region.getL= ength()) + fail("Wrong detection for region - "+region.getOffset()+" : "+region= .getLength()+" region - "+i); + } + } + } + + assertEquals("Wrong recognized region count: ", 25, counter); + + documentProvider.disconnect(editorInput); + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/= org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============7129046620439273640==-- From jbosstools-commits at lists.jboss.org Fri May 14 10:55:27 2010 Content-Type: multipart/mixed; boundary="===============3948455411893497460==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22088 - in trunk/cdi: plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 1 other directories. Date: Fri, 14 May 2010 10:55:26 -0400 Message-ID: <201005141455.o4EEtQYf014429@svn01.web.mwc.hst.phx2.redhat.com> --===============3948455411893497460== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-14 10:55:26 -0400 (Fri, 14 May 2010) New Revision: 22088 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : session bean class annotated @Specializes does not directly extend the be= an class of another session bean Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-14 14:11:58 UTC (rev 220= 87) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-14 14:55:26 UTC (rev 220= 88) @@ -771,6 +771,21 @@ CDICorePlugin.getDefault().logError(e); } } + /* + * 3.2.4. Specializing a session bean + * - session bean class annotated @Specializes does not directly extend= the bean class of another session bean = + */ + IAnnotationDeclaration specializesDeclaration =3D bean.getSpecializesAnn= otationDeclaration(); + if(specializesDeclaration!=3Dnull) { + IBean sBean =3D bean.getSpecializedBean(); + if(sBean=3D=3Dnull) { + // The specializing bean extends nothing + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIP= references.ILLEGAL_SPECIALIZING_SESSION_BEAN, specializesDeclaration, bean.= getResource()); + } else if(!CDIUtil.isSessionBean(sBean)) { + // The specializing bean directly extends a non-session bean class + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIP= references.ILLEGAL_SPECIALIZING_SESSION_BEAN, specializesDeclaration, bean.= getResource()); + } + } } = private void validateManagedBean(IClassBean bean) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-14 14:11:58 UTC (rev 22087) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-14 14:55:26 UTC (rev 22088) @@ -39,11 +39,6 @@ - managed bean class annotated @Specializes does not directly extend = the bean class of another managed bean = - - - - - 3.2. Session beans - session bean specifies an illegal scope (a stateless session bean must b= elong = to the @Dependent pseudo-scope; a singleton bean must belong to either t= he @@ -52,14 +47,14 @@ - bean class of a session bean is annotated @Interceptor or @Decorator - session bean with a parameterized bean class declares any scope other th= an @Dependent = +3.2.4. Specializing a session bean +- session bean class annotated @Specializes does not directly extend = + the bean class of another session bean = = = = = -3.2.4. Specializing a session bean -- session bean class annotated @Specializes does not directly extend = - the bean class of another session bean = 3.3. Producer methods = - producer method return type contains a wildcard type parameter Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-14 14:11:58 UTC (rev 22087) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-14 14:55:26 UTC (rev 22088) @@ -123,7 +123,7 @@ CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_specializ= ing, new String[][]{ {CDIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_illegalSpecializingManagedBean_label}, -// {CDIPreferences.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIPreferencesMes= sages.CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_labe= l}, + {CDIPreferences.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_label}, // {CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label}, // {CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferencesMes= sages.CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label= }, // {CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreference= sMessages.CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBe= an_label}, Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-14 14:11:58 UTC (rev 22087) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-14 14:55:26 UTC (rev 22088) @@ -384,6 +384,39 @@ } = /** + * 3.2.4. Specializing a session bean + * - session bean class annotated @Specializes does not directly extend = the bean class of another session bean = + * = + * @throws Exception + */ + public void testSpecializingClassDirectlyExtendsSimpleBean() throws Excep= tion { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /inheritance/specialization/enterprise/broken/directlyExtendsSimpleBean/Tra= ctor_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_B= EAN, 22); + } + = + /** + * 3.2.4. Specializing a session bean + * - session bean class annotated @Specializes does not directly extend = the bean class of another session bean = + * = + * @throws Exception + */ + public void testSpecializingEnterpriseClassImplementsInterfaceAndExtendsN= othing() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /inheritance/specialization/enterprise/broken/implementInterfaceAndExtendsN= othing/Donkey_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_B= EAN, 22); + } + + /** + * 3.2.4. Specializing a session bean + * - session bean class annotated @Specializes does not directly extend = the bean class of another session bean = + * = + * @throws Exception + */ + public void testSpecializingEnterpriseClassDirectlyExtendsNothing() throw= s Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /inheritance/specialization/enterprise/broken/directlyExtendsNothing/Cow_Br= oken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_B= EAN, 22); + } + = + /** * 3.5.1. Declaring a resource * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) * = --===============3948455411893497460==-- From jbosstools-commits at lists.jboss.org Fri May 14 14:48:36 2010 Content-Type: multipart/mixed; boundary="===============2254965110914231967==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22089 - in trunk/seam/docs/reference/en-US: images/seam_editors and 1 other directory. Date: Fri, 14 May 2010 14:48:35 -0400 Message-ID: <201005141848.o4EImZQj000922@svn01.web.mwc.hst.phx2.redhat.com> --===============2254965110914231967== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-14 14:48:35 -0400 (Fri, 14 May 2010) New Revision: 22089 Added: trunk/seam/docs/reference/en-US/images/seam_editors/seam_editors_1c.png Modified: trunk/seam/docs/reference/en-US/seam_editors.xml Log: TOOLSDOC-52-Added EL Code assist for @Named bean - description and image pr= ovided = Added: trunk/seam/docs/reference/en-US/images/seam_editors/seam_editors_1c.= png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/seam/docs/reference/en-US/images/seam_editors/se= am_editors_1c.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/seam/docs/reference/en-US/seam_editors.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/docs/reference/en-US/seam_editors.xml 2010-05-14 14:55:26 UT= C (rev 22088) +++ trunk/seam/docs/reference/en-US/seam_editors.xml 2010-05-14 18:48:35 UT= C (rev 22089) @@ -1,682 +1,697 @@ - - - - - - JBoss Tools - Seam - JBDS - - - - Seam Editors - = - = - This chapter tells about Seam Editors and their features. - = -
- Visual Page Editor - Visual Page Editor fits perfectly for authoring view Seam pa= ges. The major features of VPE are listed in = Main Features of Seam Editors - You can also read more about Visual Page Editor in Visual Page Editor chapter of "Visual Web To= ols Reference Guide". -
- = - = - = - = -
- Seam Pages Editor - = - = - - Seam Pages Editor provides a handy way to = edit the pages.xml file. - = - - = - - You can edit the pages.xml file in three modes: Graphical, Tre= e and Source. - = - - - Seam Pages Editor supports synchronization with Package Explor= er.This means that while renaming files in the Package Explorer all the cha= nges immediately affect the pages.xml file. - = - -
- Graphical Mode - = - = - Graphical mode provides you with a set of visual tools to or= ganize your project pageflow, exception handling etc. -
- Seam Pages Editor: Graphical View - - - - - -
- = - The Graphical part of the editor has some visual elements. T= he table below shows graphical representation of the elements and explains = their meanings. - - - Pages Editor: Graphical View. Visual elements = - - - - Element - = - Description - - - - - = - - - - - - - A yellow box with a solid border represents a= - <page> - element. - - = - - = - - - - - - - Pressing on the plus icon ( - - - - ) - = - = - on the - <page> - element reveals a box that lists the parameter= s for the page. - - = - = - = - - - - - - - = - A red cross in the upper left corner of the = page box indicates that the view-id is not found in the project. - - = - = - - - - - - - - A gray box with a dashed border represents a page = that has navigation = - (navigation rule) to but the page is not defined i= n the page.xml file. - - = - = - = - - - - - - - An <exception> is re= presented by a blue box with a orange diamond. - = - = - = - = - = - = - - -
- = - = - Pageflow relations are shown with gray arrows, when you select a= relationship the arrow is changed to orange. = - = - = - = - On the lefthand side of the Graphical view of Seam= Page Editor you can find a toolbar with a set of icons for the = most frequently used commands. = - - - Pages Editor: Graphical View. Commands Icons = - - - - Icon Image - = - Command - - - - - - - - - - - = - - Select a page element - = - = - = - - - - - - - Marquee a page item - = - = - = - - - - - - - - = - - Add a page relationship - = - = - = - - - - - - - = - = - - Add an exception rule - = - = - - -
= - = - Context menus are also available when you click either on= an item or a blank space. - = - = - A context menu called on a blank space of the diagram pro= vides the following options: - - Page crea= tes a new page element on the diagram - Exception= creates a new exception element on the diagram - Auto Layout formats the layout of the diagram automatically - Select Element calls the Select Element Wizard with a filter to= perform a quick search through the pages.xml file = - - Rightclicking on a selected - <page> - element calls a context menu where you can choose the= following options if you click on the New menu item: - = - = - = - - Rule opens th= e Add Navigation Rule dialog in which you can browse y= our project for a view page to set the view-id in the navigation rule and = specify render or redirect navigation options - Param calls a= dialog box where you can define a parameter (using the = - <param> = - tag) for the = - <page> - element - - = - = -
- Seam Pages Diagram Preferences - = - = - = - In order to customize the layout of Diagram you can go= to = - Window > Preferences > JBoss Tools > Web > Sea= m > Editors > Seam Pages Diagram. - - = -
- Preferences of Seam Pages Diagram - - - - - -
-
-
- = - = -
- Tree Mode - = - Tree Mode provides a wider range of options and way to e= dit and modify the pages.xml file. - = - = - = -
- Seam Pages Editor: Tree View - - - - - -
- = - - In this mode all elements and attributes of the page.xml - file can be viewed and edited in a visual, user friendly w= ay. - - = -
- = - = -
- Outline Support for Seam Pages Editor - = - = - Seam Pages Editor provides Outline = view support. - You can explore the pages.xml using Outline view in two mo= des: Tree ( - - - - ) and Diagram Navigation ( - - - - ). - = - - The Diagram Navigation mode of Outline view gives a birds-= view of the layout to allow quick navigation for large-scale applications. = - - = -
- Outline view: Diagram Navigation mode - - - - - -
- = - = - The Tree mode shows a tree for every element in the page= s.xml file. You can get a quick overview of the whole file. When selecting = an element in the Outline view the related element is highlighted in the G= raphical, Tree or Source page of Seam Pages Editor. - = - = - = -
- Outline view: Tree mode - - - - - -
- = - = - = - = -
- - = - = -
- = - = - = - = -
- = - = - Seam Components Editor - = - When editing components.xml a structure= d tree editor is available - in addition to pure source editing. It has a graphical view (T= ree tab) and source - (Source tab). - = -
- component.xml Editor - - - - - -
- = - - Note: - = - You can view and edit components.xml and other xml files - directly in the Project Explorer and Properties sheet with= out opening the - components.xml editor. - -
- component.xml Editor - - - - - -
- = -
- = - = - = -
- Main Features of Seam Editors - - In this chapter you will know what Seam Editors features are and= how to work with them. - -
- - Content Assist - - Content Assist (Ctrl + Space) is availa= ble when using EL expressions in the following file formats: - - - JSP - - - XHTML - - - XML - - - JAVA - - - - Notice, the code completion for the Seam components shows th= e proposals marked with Seam icon. - -
- Content Assist - - - - - -
- Content Assist is also available for the - "jsfc " - attribute, it lets you select from a list of possible = attribute values. Whereas, JSF components appear above all other components= in the list. -
- Content Assist for the "jsfc" attribute</titl= e> - <mediaobject> - <imageobject> - <imagedata fileref=3D"images/seam_editors/seam_editors= _12.png" scale=3D"70"/> - </imageobject> - </mediaobject> - </figure> - <note> - <title>Note: - - To get Code Assist available for an externally generated= and imported project, - don't forget to enable Seam features and configure Se= am Settings in Project Preferences. - - -
- Content Assist for components.xml - - While you are editing a - components.xml - file you can make use of the Content Assist fo= r inserting needed - elements. - -
- Content Assist in the component.xml Editor - - - - - -
- - The editor also makes code completion aware of methods/a= ttributes for EntityQuery - component. - -
- Content Assist for EntityQuery Component - - - - - -
-
- - = -
-
- Content Assist for Page Descriptors - = - Content Assist ( CA ) is available for Page Descriptors, = - .page.xml and page.xml files. = - Content Assist lets you easily compose a Page Descriptor f= ile by suggesting elements and attributes. The suggestions are context depe= ndent, which means that CA provides only the elements, attributes and in so= me cases values for the attributes, suitable in a particular place of your= Page Descriptor. = - = - - - Seam Pages Editor also supports code completion in EL-exp= ressions suggesting you possible bean properties and methods. = - -
-
- OpenOn - - OpenOn lets you easily navigate through= your project without - using the Package Explorer or Project Explorer. After pressing= - Ctrl + left click - (or just F3) you will see a corresponding method o= r class. - -
- OpenOn - - - - - -
- OpenOn is available for the following files: - - - - XML files - - - - - JSP/XHTML Pages - - - - Java files - - - - Note: - = - In this section were described only use cases special fo= r Seam applications.For general information please read - OpenOn = section in Visual Web Tools Reference Guide. - - - Using OpenOn in .xhtml file= s you can open: - - components or properties resolved using an EL = expression; - all actions described in pages.xml; - other .xhtml files that paths are specified in= a current file; = - image files that paths are set in the - value property.The files w= ill be opened in the default system graphical editor. = - - - = - OpenOn is also supported in Page Descriptors (.page.xml and pages.xml). OpenOn allows= you to navigate to Java beans as well as to view pages. - You can Ctrl + left click on a bean or on= view page file (e.g. XTML file) to navigate to the file you clicked on. <= /para> - -
- OpenOn in .page.xml file - - - - - -
- If you use Rule-based authorization with Drools in your Seam= application you can apply OpenOn = - in - components.xml to open the= files containing rule definitions in the - "rule-files" tag. - -
- OpenOn in components.xml file - - - - - -
- You can also use OpenOn to open jBPM components that are des= cribed in Seam component descriptor. - Two places where it works are available: = - - inside - <component> definiti= on; -
- OpenOn in components.xml file - - - - - -
- inside - jbpm tags; -
- OpenOn in components.xml file - - - - - -
- - = - = - - OpenOn is also supported in seam components where In annot= ation is presented. - After pressing Ctrl + left click on the seam com= ponent specified in @In you will get the possibility to open = the file where the component is declarated as well as = - all of the seam components where it is used in the next declarations:<= /para> - - @Out - @DataModel - @Role - @Roles = - - = -
- OpenOn in Seam Component - - - - - -
- - -
- -
- Seam Validation - - Validation of various possible problematic definitions is im= plemented for Seam - applications. - - If an issue is found it will be shown in the standard Problems - View. - -
- Seam Validation - - - - - -
- - - Note: - Please note, only files within source path and web conte= nt are validated, meaning temporary files or test files are not included. - - - In the preferences page for Seam Validator you can see and m= odify the validator - behavior. Go to - Window > Preferences > JBoss Tools > Web > Seam = > Validator - and select the severity level for the optional Sea= m Validator - problem. - -
- Seam Validator Preferences - - - - - -
- - On WTP projects validation are enabled by default and thus e= xecuted automatically, but - on normal Java projects you will have to go and add the Valida= tion builder of your - project . It is available in the properties of your project un= der - Validation. - = -
- Enabling the Validation Builder - - - - - -
- = - The validations can be run manually by clicking - Validate via the conte= xt menu on your project (folder or file inside your project) which will - execute all the active WTP validations. Following to the project= 's preferences under - Validation it's possible t= o enable/disable any validator. = - - = - It's also possible to turn off the validation for some res= ource (a file, folder) inside your project via the - Exclude Validation context menu opti= on. - = -
- Excluding Validation for the WebContent Folder - - - - - -
- = - As a result, if you've turned off the validation for a fol= der (or file), it is put to the excluded group of the Validation filters an= d be ignored during the validation. - = -
- Validation Filters - - - - - -
-
- -
- + + + + + + JBoss Tools + Seam + JBDS + + + + Seam Editors + = + = + This chapter tells about Seam Editors and their features. + = +
+ Visual Page Editor + Visual Page Editor fits perfectly for authoring view Seam pa= ges. The major features of VPE are listed in = Main Features of Seam Editors + You can also read more about Visual Page Editor in Visual Page Editor chapter of "Visual Web To= ols Reference Guide". +
+ = + = + = + = +
+ Seam Pages Editor + = + = + + Seam Pages Editor provides a handy way to = edit the pages.xml file. + = + + = + + You can edit the pages.xml file in three modes: Graphical, Tre= e and Source. + = + + + Seam Pages Editor supports synchronization with Package Explor= er.This means that while renaming files in the Package Explorer all the cha= nges immediately affect the pages.xml file. + = + +
+ Graphical Mode + = + = + Graphical mode provides you with a set of visual tools to or= ganize your project pageflow, exception handling etc. +
+ Seam Pages Editor: Graphical View + + + + + +
+ = + The Graphical part of the editor has some visual elements. T= he table below shows graphical representation of the elements and explains = their meanings. + + + Pages Editor: Graphical View. Visual elements = + + + + Element + = + Description + + + + + = + + + + + + + A yellow box with a solid border represents a= + <page> + element. + + = + + = + + + + + + + Pressing on the plus icon ( + + + + ) + = + = + on the + <page> + element reveals a box that lists the parameter= s for the page. + + = + = + = + + + + + + + = + A red cross in the upper left corner of the = page box indicates that the view-id is not found in the project. + + = + = + + + + + + + + A gray box with a dashed border represents a page = that has navigation = + (navigation rule) to but the page is not defined i= n the page.xml file. + + = + = + = + + + + + + + An <exception> is re= presented by a blue box with a orange diamond. + = + = + = + = + = + = + + +
+ = + = + Pageflow relations are shown with gray arrows, when you select a= relationship the arrow is changed to orange. = + = + = + = + On the lefthand side of the Graphical view of Seam= Page Editor you can find a toolbar with a set of icons for the = most frequently used commands. = + + + Pages Editor: Graphical View. Commands Icons = + + + + Icon Image + = + Command + + + + + + + + + + + = + + Select a page element + = + = + = + + + + + + + Marquee a page item + = + = + = + + + + + + + + = + + Add a page relationship + = + = + = + + + + + + + = + = + + Add an exception rule + = + = + + +
= + = + Context menus are also available when you click either on= an item or a blank space. + = + = + A context menu called on a blank space of the diagram pro= vides the following options: + + Page crea= tes a new page element on the diagram + Exception= creates a new exception element on the diagram + Auto Layout formats the layout of the diagram automatically + Select Element calls the Select Element Wizard with a filter to= perform a quick search through the pages.xml file = + + Rightclicking on a selected + <page> + element calls a context menu where you can choose the= following options if you click on the New menu item: + = + = + = + + Rule opens th= e Add Navigation Rule dialog in which you can browse y= our project for a view page to set the view-id in the navigation rule and = specify render or redirect navigation options + Param calls a= dialog box where you can define a parameter (using the = + <param> = + tag) for the = + <page> + element + + = + = +
+ Seam Pages Diagram Preferences + = + = + = + In order to customize the layout of Diagram you can go= to = + Window > Preferences > JBoss Tools > Web > Sea= m > Editors > Seam Pages Diagram. + + = +
+ Preferences of Seam Pages Diagram + + + + + +
+
+
+ = + = +
+ Tree Mode + = + Tree Mode provides a wider range of options and way to e= dit and modify the pages.xml file. + = + = + = +
+ Seam Pages Editor: Tree View + + + + + +
+ = + + In this mode all elements and attributes of the page.xml + file can be viewed and edited in a visual, user friendly w= ay. + + = +
+ = + = +
+ Outline Support for Seam Pages Editor + = + = + Seam Pages Editor provides Outline = view support. + You can explore the pages.xml using Outline view in two mo= des: Tree ( + + + + ) and Diagram Navigation ( + + + + ). + = + + The Diagram Navigation mode of Outline view gives a birds-= view of the layout to allow quick navigation for large-scale applications. = + + = +
+ Outline view: Diagram Navigation mode + + + + + +
+ = + = + The Tree mode shows a tree for every element in the page= s.xml file. You can get a quick overview of the whole file. When selecting = an element in the Outline view the related element is highlighted in the G= raphical, Tree or Source page of Seam Pages Editor. + = + = + = +
+ Outline view: Tree mode + + + + + +
+ = + = + = + = +
+ + = + = +
+ = + = + = + = +
+ = + = + Seam Components Editor + = + When editing components.xml a structure= d tree editor is available + in addition to pure source editing. It has a graphical view (T= ree tab) and source + (Source tab). + = +
+ component.xml Editor + + + + + +
+ = + + Note: + = + You can view and edit components.xml and other xml files + directly in the Project Explorer and Properties sheet with= out opening the + components.xml editor. + +
+ component.xml Editor + + + + + +
+ = +
+ = + = + = +
+ Main Features of Seam Editors + + In this chapter you will know what Seam Editors features are and= how to work with them. + +
+ + Content Assist + + Content Assist (Ctrl + Space) is availa= ble when using EL expressions in the following file formats: + + + JSP + + + XHTML + + + XML + + + JAVA + + + + Notice, the code completion for the Seam components shows th= e proposals marked with Seam icon. + +
+ Content Assist + + + + + +
+ Content Assist is also available for the + "jsfc " + attribute, it lets you select from a list of possible = attribute values. Whereas, JSF components appear above all other components= in the list. +
+ Content Assist for the "jsfc" attribute</titl= e> + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/seam_editors/seam_editors= _12.png" scale=3D"70"/> + </imageobject> + </mediaobject> + </figure> + <note> + <title>Note: + + To get Code Assist available for an externally generated= and imported project, + don't forget to enable Seam features and configure Se= am Settings in Project Preferences. + + +
+ Content Assist for components.xml + + While you are editing a + components.xml + file you can make use of the Content Assist fo= r inserting needed + elements. + +
+ Content Assist in the component.xml Editor + + + + + +
+ + The editor also makes code completion aware of methods/a= ttributes for EntityQuery + component. + +
+ Content Assist for EntityQuery Component + + + + + +
+
+ +
+ Content assist for @Named beans + = + To the nice code completion you can also use Content ass= ist for all occurrences where @Named beans are used. + + = +
+ Content assist for @Named beans + + + + + +
+
+ = +
+
+ Content Assist for Page Descriptors + = + Content Assist ( CA ) is available for Page Descriptors, = + .page.xml and page.xml files. = + Content Assist lets you easily compose a Page Descriptor f= ile by suggesting elements and attributes. The suggestions are context depe= ndent, which means that CA provides only the elements, attributes and in so= me cases values for the attributes, suitable in a particular place of your= Page Descriptor. = + = + + + Seam Pages Editor also supports code completion in EL-exp= ressions suggesting you possible bean properties and methods. = + +
+
+ OpenOn + + OpenOn lets you easily navigate through= your project without + using the Package Explorer or Project Explorer. After pressing= + Ctrl + left click + (or just F3) you will see a corresponding method o= r class. + +
+ OpenOn + + + + + +
+ OpenOn is available for the following files: + + + + XML files + + + + + JSP/XHTML Pages + + + + Java files + + + + Note: + = + In this section were described only use cases special fo= r Seam applications.For general information please read + OpenOn = section in Visual Web Tools Reference Guide. + + + Using OpenOn in .xhtml file= s you can open: + + components or properties resolved using an EL = expression; + all actions described in pages.xml; + other .xhtml files that paths are specified in= a current file; = + image files that paths are set in the + value property.The files w= ill be opened in the default system graphical editor. = + + + = + OpenOn is also supported in Page Descriptors (.page.xml and pages.xml). OpenOn allows= you to navigate to Java beans as well as to view pages. + You can Ctrl + left click on a bean or on= view page file (e.g. XTML file) to navigate to the file you clicked on. <= /para> + +
+ OpenOn in .page.xml file + + + + + +
+ If you use Rule-based authorization with Drools in your Seam= application you can apply OpenOn = + in + components.xml to open the= files containing rule definitions in the + "rule-files" tag. + +
+ OpenOn in components.xml file + + + + + +
+ You can also use OpenOn to open jBPM components that are des= cribed in Seam component descriptor. + Two places where it works are available: = + + inside + <component> definiti= on; +
+ OpenOn in components.xml file + + + + + +
+ inside + jbpm tags; +
+ OpenOn in components.xml file + + + + + +
+ + = + = + + OpenOn is also supported in seam components where In annot= ation is presented. + After pressing Ctrl + left click on the seam com= ponent specified in @In you will get the possibility to open = the file where the component is declarated as well as = + all of the seam components where it is used in the next declarations:<= /para> + + @Out + @DataModel + @Role + @Roles = + + = +
+ OpenOn in Seam Component + + + + + +
+ + +
+ +
+ Seam Validation + + Validation of various possible problematic definitions is im= plemented for Seam + applications. + + If an issue is found it will be shown in the standard Problems + View. + +
+ Seam Validation + + + + + +
+ + + Note: + Please note, only files within source path and web conte= nt are validated, meaning temporary files or test files are not included. + + + In the preferences page for Seam Validator you can see and m= odify the validator + behavior. Go to + Window > Preferences > JBoss Tools > Web > Seam = > Validator + and select the severity level for the optional Sea= m Validator + problem. + +
+ Seam Validator Preferences + + + + + +
+ + On WTP projects validation are enabled by default and thus e= xecuted automatically, but + on normal Java projects you will have to go and add the Valida= tion builder of your + project . It is available in the properties of your project un= der + Validation. + = +
+ Enabling the Validation Builder + + + + + +
+ = + The validations can be run manually by clicking + Validate via the conte= xt menu on your project (folder or file inside your project) which will + execute all the active WTP validations. Following to the project= 's preferences under + Validation it's possible t= o enable/disable any validator. = + + = + It's also possible to turn off the validation for some res= ource (a file, folder) inside your project via the + Exclude Validation context menu opti= on. + = +
+ Excluding Validation for the WebContent Folder + + + + + +
+ = + As a result, if you've turned off the validation for a fol= der (or file), it is put to the excluded group of the Validation filters an= d be ignored during the validation. + = +
+ Validation Filters + + + + + +
+
+ +
+ \ No newline at end of file --===============2254965110914231967==-- From jbosstools-commits at lists.jboss.org Fri May 14 14:51:08 2010 Content-Type: multipart/mixed; boundary="===============3531800970045994100==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22090 - trunk/seam/docs/reference/en-US/images/seam_editors. Date: Fri, 14 May 2010 14:51:08 -0400 Message-ID: <201005141851.o4EIp8MA001434@svn01.web.mwc.hst.phx2.redhat.com> --===============3531800970045994100== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-14 14:51:08 -0400 (Fri, 14 May 2010) New Revision: 22090 Modified: trunk/seam/docs/reference/en-US/images/seam_editors/seam_editors_1c.png Log: TOOLSDOC-52-Added EL Code assist for @Named bean - description and image pr= ovided = Modified: trunk/seam/docs/reference/en-US/images/seam_editors/seam_editors_= 1c.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============3531800970045994100==-- From jbosstools-commits at lists.jboss.org Fri May 14 14:53:05 2010 Content-Type: multipart/mixed; boundary="===============7963902989667128315==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22091 - in trunk/jbpm/docs/reference/en-US: images/the_views and 1 other directory. Date: Fri, 14 May 2010 14:53:05 -0400 Message-ID: <201005141853.o4EIr5Yq001472@svn01.web.mwc.hst.phx2.redhat.com> --===============7963902989667128315== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-14 14:53:05 -0400 (Fri, 14 May 2010) New Revision: 22091 Added: trunk/jbpm/docs/reference/en-US/images/the_views/the_views_6a.png Modified: trunk/jbpm/docs/reference/en-US/the_views.xml Log: TOOLSDOC-72-Template added to better render the jbpm task forms in the visual editor - description and image is added = Added: trunk/jbpm/docs/reference/en-US/images/the_views/the_views_6a.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jbpm/docs/reference/en-US/images/the_views/the_v= iews_6a.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/jbpm/docs/reference/en-US/the_views.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/the_views.xml 2010-05-14 18:51:08 UTC (= rev 22090) +++ trunk/jbpm/docs/reference/en-US/the_views.xml 2010-05-14 18:53:05 UTC (= rev 22091) @@ -1,230 +1,241 @@ - - - - - - jBPM - - - - The views - - Here, it will be explained how to work with views and editors pr= ovided by JBDS. - The views are used for representation and navigation the resourc= es you are working on at - the moment. One of the advantages of all the views is that all mod= ifications made in the - current active file are immediately displayed in them. Let=E2=80= =99s get acquainted more closely - with those that the jPDL perspective provides= . - -
- The jPDL Perspective Views and Editors - - - - - -
- - As you can see in the picture above, the jPDL perspect= ive contains a - complete set of functionality that's necessary for working on= the jBPM project. - -
- - The Outline View - To have a way to quickly see an outline of the process use t= he - Outline view - that is presented as the classical tree. If it is = not visible select - Window > Show view > Outline. <= /emphasis> - -
- The Overview View - - - - - -
-
- -
- - The Overview - The main advantage of this view is that it gives visual repr= esentation of the whole - current developing process. Besides, the - Overview - comes as a scrollable thumbnail which enables a be= tter navigation of the - process structure if it's too large. - -
- The Overview - - - - - -
-
- -
- - The Properties View - Here, we dwell on the JBDS Properties view. - Notice if it's not visible you can access it by navigat= ing - Window > Show view > Properties= . - The view shows the relevant properties of the selected item = in the tabbed form. Every - item has its own set of properties, which can be directly edit= able in the Properties - view or by brining up the context menu. - -
- The Properties View of selected Transition - - - - - -
- - For example, on the picture above the Properties view displa= ys all the properties for - a selected transition. Its name has been changed to - to_auction. We've do= ne it directly in - active General tab of the view. The same way let's change= the name for the - second transition to - to_end. - If no one item is selected, the view represents the properti= es of the whole process - definition. - -
- The Properties View of Process Definition - - - - - -
- - In this case, it contains six tabs. The first one is the - General. It allows to spec= ify a process name and add - necessary description. To illustrate let's change the pro= cess definition name - to - jbay. -
- -
- - The jBPM Graphical Process Designer editor. - The jBPM GPD editor includes four modes= : Diagram, Deployment, - Design and Source, which are available as switchable tabs at t= he bottom of the editor. - Let's dwell on each of them. - -
- The Diagram mode - In this mode we define the process in the form of a dia= gram by means of tools - provided on the left-hand side of the jBPM GPD. - -
- The Diagram mode - - - - - -
- - Besides, some properties can be directly edited in the <= property>Diagram - mode of the graphical editor. One example of th= is is the - name - property of nodes. You can edit this directly = by selecting the node of - which you want to change the name and then click once insi= de this node. This enables - an editor in the node. We change the name of the node to <= emphasis> - auction. -
- -
- - The Source Mode - Now, that we have defined a simple process definition, w= e can have a look at the - XML that is being generated under the covers. To see this = XML click on the Source - tab of the graphical process designer editor. - -
- The Source Mode - - - - - -
- The Source mode enables to easily m= anipulate our XML. That is - manually inserting and editing necessary elements or attri= butes. In addition, here - you can take advantage of content assist. -
- -
- - The Design Mode - One more way to edit your file is to use Desig= n mode. You can - see it in the next picture: -
- The Design Mode - - - - - -
- - As you can see above, this mode looks like a table in th= e first column of which - the process structure is performed. Here, you can also ins= ert, remove and edit - elements or attributes, moreover add comments and instruct= ions. Their values can be - directly edited in the second column of the Design mode ta= ble. - For instance, let=E2=80=99s add a comment on the second = transition. For that, you should - bring up the context menu for it and choose - Add Before > Comment. = - -
- Adding a Comment - - - - - -
- Then, we can put the text This transition lead= s to the end - state in the right column as its value. - -
- Comment is added - - - - - -
- -
- -
- - The Deployment Mode - Finally, to adjust the deployment settings of the projec= t you should switch on to - the tab that opens the Deployment mode. On the picture below - the Deployment mode is performed with= default settings. Here, - you can easily modify them or, if the settings won't = match your needs, to - reset defaults. -
- The Deployment Mode - - - - - -
- - The button - Test Connections - is necessary to make sure whether all your set= tings are valid before - deploying the process. - Now that we've seen how to work with jPDL - perspective, let's pass on to the project testi= ng. -
-
- + + + + + + jBPM + + + + The views + + Here, it will be explained how to work with views and editors pr= ovided by JBDS. + The views are used for representation and navigation the resourc= es you are working on at + the moment. One of the advantages of all the views is that all mod= ifications made in the + current active file are immediately displayed in them. Let=E2=80= =99s get acquainted more closely + with those that the jPDL perspective provides= . + +
+ The jPDL Perspective Views and Editors + + + + + +
+ + As you can see in the picture above, the jPDL perspect= ive contains a + complete set of functionality that's necessary for working on= the jBPM project. + +
+ + The Outline View + To have a way to quickly see an outline of the process use t= he + Outline view + that is presented as the classical tree. If it is = not visible select + Window > Show view > Outline. <= /emphasis> + +
+ The Overview View + + + + + +
+
+ +
+ + The Overview + The main advantage of this view is that it gives visual repr= esentation of the whole + current developing process. Besides, the + Overview + comes as a scrollable thumbnail which enables a be= tter navigation of the + process structure if it's too large. + +
+ The Overview + + + + + +
+
+ +
+ + The Properties View + Here, we dwell on the JBDS Properties view. + Notice if it's not visible you can access it by navigat= ing + Window > Show view > Properties= . + The view shows the relevant properties of the selected item = in the tabbed form. Every + item has its own set of properties, which can be directly edit= able in the Properties + view or by brining up the context menu. + +
+ The Properties View of selected Transition + + + + + +
+ + For example, on the picture above the Properties view displa= ys all the properties for + a selected transition. Its name has been changed to + to_auction. We've do= ne it directly in + active General tab of the view. The same way let's change= the name for the + second transition to + to_end. + If no one item is selected, the view represents the properti= es of the whole process + definition. + +
+ The Properties View of Process Definition + + + + + +
+ + In this case, it contains six tabs. The first one is the + General. It allows to spec= ify a process name and add + necessary description. To illustrate let's change the pro= cess definition name + to + jbay. +
+ +
+ + The jBPM Graphical Process Designer editor. + The jBPM GPD editor includes four modes= : Diagram, Deployment, + Design and Source, which are available as switchable tabs at t= he bottom of the editor. + Let's dwell on each of them. + +
+ The Diagram mode + In this mode we define the process in the form of a dia= gram by means of tools + provided on the left-hand side of the jBPM GPD. + +
+ The Diagram mode + + + + + +
+ + Besides, some properties can be directly edited in the <= property>Diagram + mode of the graphical editor. One example of th= is is the + name + property of nodes. You can edit this directly = by selecting the node of + which you want to change the name and then click once insi= de this node. This enables + an editor in the node. We change the name of the node to <= emphasis> + auction. +
+ +
+ + The Source Mode + Now, that we have defined a simple process definition, w= e can have a look at the + XML that is being generated under the covers. To see this = XML click on the Source + tab of the graphical process designer editor. + +
+ The Source Mode + + + + + +
+ The Source mode enables to easily m= anipulate our XML. That is + manually inserting and editing necessary elements or attri= butes. In addition, here + you can take advantage of content assist. + = + A template is added to better render the jBPM task forms= in the Visual editor. = + Now the jBPM Graphical Process designer can create facel= ets that are associated with tasks and are rendered in the jBPM console. +
+ A task form in VPE + + + + + +
+
+ +
+ + The Design Mode + One more way to edit your file is to use Desig= n mode. You can + see it in the next picture: +
+ The Design Mode + + + + + +
+ + As you can see above, this mode looks like a table in th= e first column of which + the process structure is performed. Here, you can also ins= ert, remove and edit + elements or attributes, moreover add comments and instruct= ions. Their values can be + directly edited in the second column of the Design mode ta= ble. + For instance, let=E2=80=99s add a comment on the second = transition. For that, you should + bring up the context menu for it and choose + Add Before > Comment. = + +
+ Adding a Comment + + + + + +
+ Then, we can put the text This transition lead= s to the end + state in the right column as its value. + +
+ Comment is added + + + + + +
+ +
+ +
+ + The Deployment Mode + Finally, to adjust the deployment settings of the projec= t you should switch on to + the tab that opens the Deployment mode. On the picture below + the Deployment mode is performed with= default settings. Here, + you can easily modify them or, if the settings won't = match your needs, to + reset defaults. +
+ The Deployment Mode + + + + + +
+ + The button + Test Connections + is necessary to make sure whether all your set= tings are valid before + deploying the process. + Now that we've seen how to work with jPDL + perspective, let's pass on to the project testi= ng. +
+
+ \ No newline at end of file --===============7963902989667128315==-- From jbosstools-commits at lists.jboss.org Fri May 14 16:01:02 2010 Content-Type: multipart/mixed; boundary="===============2855056047497829199==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22092 - in branches/hibernatetools-multiversion/hibernatetools/plugins: org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils and 14 other directories. Date: Fri, 14 May 2010 16:01:02 -0400 Message-ID: <201005142001.o4EK12e3015759@svn01.web.mwc.hst.phx2.redhat.com> --===============2855056047497829199== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-14 16:01:00 -0400 (Fri, 14 May 2010) New Revision: 22092 Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/javax/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/javax/persistence/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/javax/persistence/mediator/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/javax/persistence/mediator/x/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/javax/persistence/mediator/x/Embeddable.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/javax/persistence/mediator/x/Entity.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/javax/persistence/mediator/x/MappedSuperclass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/javax/persistence/mediator/x/spi/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/javax/persistence/mediator/x/spi/PersistenceUnitTransactionT= ype.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/Ejb3Configuration.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/packaging/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/packaging/ClassFilter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/packaging/Entry.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/packaging/FileFilter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/packaging/Filter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/packaging/JarVisitor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/packaging/JarVisitorFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/packaging/NamedInputStream.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/packaging/PackageFilter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/packaging/PersistenceMetadata.j= ava branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/packaging/PersistenceXmlLoader.= java Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.= java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse/src/org/hibernate/console/ConsoleConfiguration.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/.classpath branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/x/Document.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/x/Element.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/dom4j/mediator/x/Visitor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/base/HObject.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/Column.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - fix bugs, fix with Hibernat= e 3.5, fix issues with open mapping Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-05-14 1= 8:53:05 UTC (rev 22091) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-05-14 2= 0:01:00 UTC (rev 22092) @@ -447,7 +447,15 @@ build(); buildSessionFactory(); } - return configStub.getEntityResolver(); + EntityResolver res =3D (EntityResolver)execute(new ExecutionContext.Comm= and() { + public Object execute() { + if (configStub !=3D null) { + return configStub.getEntityResolver(); + } + return null; + } + } ); + return res; } = public HQLCodeAssist getHQLCodeAssist() { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappin= gUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils= .java 2010-05-14 18:53:05 UTC (rev 22091) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils= .java 2010-05-14 20:01:00 UTC (rev 22092) @@ -241,7 +241,6 @@ * @param table * @return */ - @SuppressWarnings("unchecked") public static boolean tableInFile(ConsoleConfiguration consoleConfig, IFi= le file, Table table) { EntityResolver entityResolver =3D consoleConfig.getEntityResolver(); = Document doc =3D getDocument(file.getLocation().toFile(), entityResolver= ); @@ -446,7 +445,6 @@ * @param element * @return */ - @SuppressWarnings("unchecked") public static IFile searchInMappingFiles(ConsoleConfiguration consoleConf= ig, Object element) { IFile file =3D null; if (consoleConfig =3D=3D null) { @@ -991,7 +989,7 @@ final Cfg2HbmTool tool =3D Cfg2HbmTool.newInstance(); String toolTag =3D ""; //$NON-NLS-1$ PersistentClass pc =3D property.getPersistentClass(); - if (pc !=3D null && pc.getIdentifierProperty() =3D=3D property) { + if (pc !=3D null && property.equals(pc.getIdentifierProperty())) { if (property.isComposite()) { toolTag =3D "composite-id"; //$NON-NLS-1$ } else { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/.classpath 2010-05-14 18:53:05 UTC (rev 22091) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/.classpath 2010-05-14 20:01:00 UTC (rev 22092) @@ -1,6 +1,6 @@ - + Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/javax/persistence/mediator/x/Embeddable.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/javax/persistence/mediator/x/Embeddable.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/javax/persistence/mediator/x/Embeddable.java 2010-05-14 20:= 01:00 UTC (rev 22092) @@ -0,0 +1,12 @@ +package javax.persistence.mediator.x; + +import org.hibernate.mediator.base.HObject; + +public class Embeddable extends HObject { + + public static final String CL =3D "javax.persistence.Embeddable"; //$NON-= NLS-1$ + + protected Embeddable(Object embeddable) { + super(embeddable, CL); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/javax/persistence/mediator/x/Entity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/javax/persistence/mediator/x/Entity.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/javax/persistence/mediator/x/Entity.java 2010-05-14 20:01:0= 0 UTC (rev 22092) @@ -0,0 +1,12 @@ +package javax.persistence.mediator.x; + +import org.hibernate.mediator.base.HObject; + +public class Entity extends HObject { + + public static final String CL =3D "javax.persistence.Entity"; //$NON-NLS-= 1$ + + protected Entity(Object entity) { + super(entity, CL); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/javax/persistence/mediator/x/MappedSuperclass.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/javax/persistence/mediator/x/MappedSuperclass.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/javax/persistence/mediator/x/MappedSuperclass.java 2010-05-= 14 20:01:00 UTC (rev 22092) @@ -0,0 +1,12 @@ +package javax.persistence.mediator.x; + +import org.hibernate.mediator.base.HObject; + +public class MappedSuperclass extends HObject { + + public static final String CL =3D "javax.persistence.MappedSuperclass"; /= /$NON-NLS-1$ + + protected MappedSuperclass(Object mappedSuperclass) { + super(mappedSuperclass, CL); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/javax/persistence/mediator/x/spi/PersistenceUnitTransact= ionType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/javax/persistence/mediator/x/spi/PersistenceUnitTransaction= Type.java (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/javax/persistence/mediator/x/spi/PersistenceUnitTransaction= Type.java 2010-05-14 20:01:00 UTC (rev 22092) @@ -0,0 +1,19 @@ +package javax.persistence.mediator.x.spi; + +import org.hibernate.mediator.base.HObject; + +public class PersistenceUnitTransactionType extends HObject { + + public static final String CL =3D "javax.persistence.spi.PersistenceUnitT= ransactionType"; //$NON-NLS-1$ + = + public static final PersistenceUnitTransactionType RESOURCE_LOCAL =3D + new PersistenceUnitTransactionType(readStaticFieldValue(CL, "RESOURCE_LO= CAL")); + = + public static final PersistenceUnitTransactionType JTA =3D + new PersistenceUnitTransactionType(readStaticFieldValue(CL, "JTA")); + + protected PersistenceUnitTransactionType(Object persistenceUnitTransactio= nType) { + super(persistenceUnitTransactionType, CL); + } + +} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/dom4j/mediator/x/Document.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Document.java 2010-05-14 18:53:05 UTC = (rev 22091) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Document.java 2010-05-14 20:01:00 UTC = (rev 22092) @@ -23,6 +23,6 @@ = @Override public void accept(Visitor visitor) { - visitor.visit(this); + invoke(mn(), visitor.Obj()); } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/dom4j/mediator/x/Element.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Element.java 2010-05-14 18:53:05 UTC (= rev 22091) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Element.java 2010-05-14 20:01:00 UTC (= rev 22092) @@ -59,7 +59,11 @@ } = public Attribute attribute(String name) { - return new Attribute(invoke(mn(), name)); + Object obj =3D invoke(mn(), name); + if (obj =3D=3D null) { + return null; + } + return new Attribute(obj); } = public String getName() { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/dom4j/mediator/x/Visitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Visitor.java 2010-05-14 18:53:05 UTC (= rev 22091) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/dom4j/mediator/x/Visitor.java 2010-05-14 20:01:00 UTC (= rev 22092) @@ -1,7 +1,63 @@ package org.dom4j.mediator.x; = +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; + +import org.hibernate.mediator.HibernateConsoleRuntimeException; +import org.hibernate.mediator.stubs.util.ClassHelper; +import org.hibernate.mediator.stubs.util.ReflectHelper; + public abstract class Visitor { = + public static final String CL =3D "org.dom4j.Visitor"; //$NON-NLS-1$ + + protected Object visitor; + + public Visitor() { + Class clazz; + try { + clazz =3D ReflectHelper.classForName(CL); + } catch (ClassNotFoundException e) { + throw new HibernateConsoleRuntimeException(e); + } + InvocationHandler handler =3D new InvocationHandler() { + public Object invoke(Object proxy, Method method, Object[] args) throws= Throwable { + if ("visit".equals(method.getName())) { //$NON-NLS-1$ + Visitor.visit(Visitor.this, args[0]); + } + return null; + } + }; + visitor =3D Proxy.newProxyInstance(clazz.getClassLoader(), + new Class[] { clazz }, handler); + } + + // type of store object + public final Class Cl() { + return visitor.getClass(); + } + + // + public final Object Obj() { + return visitor; + } + = + @SuppressWarnings("unchecked") + protected static void visit(Visitor visitor, Object obj) { + if (obj =3D=3D null) { + return; + } + final Class cl =3D obj.getClass(); + if (ClassHelper.isClassOrOffspring(cl, Document.CL)) { + visitor.visit(new Document(obj)); + } else if (ClassHelper.isClassOrOffspring(cl, Element.CL)) { + visitor.visit(new Element(obj)); + } else if (ClassHelper.isClassOrOffspring(cl, Attribute.CL)) { + visitor.visit(new Attribute(obj)); + } + } + = public void visit(Document document) { } = Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/base/HObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/base/HObject.java 2010-05-14 18:53:0= 5 UTC (rev 22091) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/base/HObject.java 2010-05-14 20:01:0= 0 UTC (rev 22092) @@ -45,6 +45,16 @@ return obj; } = + public boolean equals(Object obj) { + if (this =3D=3D obj) { + return true; + } + if (obj instanceof HObject) { + return (this.obj =3D=3D ((HObject)obj).obj); + } + return false; + } + // public Object invoke(final String methodName) { return invoke(methodName, new HObject[0]); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb= 3.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java= 2010-05-14 18:53:05 UTC (rev 22091) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java= 2010-05-14 20:01:00 UTC (rev 22092) @@ -11,23 +11,23 @@ import java.util.Set; import java.util.StringTokenizer; = -import javax.persistence.Embeddable; -import javax.persistence.Entity; -import javax.persistence.MappedSuperclass; -import javax.persistence.spi.PersistenceUnitTransactionType; +import javax.persistence.mediator.x.Embeddable; +import javax.persistence.mediator.x.Entity; +import javax.persistence.mediator.x.MappedSuperclass; +import javax.persistence.mediator.x.spi.PersistenceUnitTransactionType; = -import org.hibernate.ejb.Ejb3Configuration; -import org.hibernate.ejb.HibernatePersistence; -import org.hibernate.ejb.packaging.ClassFilter; -import org.hibernate.ejb.packaging.Entry; -import org.hibernate.ejb.packaging.FileFilter; -import org.hibernate.ejb.packaging.Filter; -import org.hibernate.ejb.packaging.JarVisitor; -import org.hibernate.ejb.packaging.JarVisitorFactory; -import org.hibernate.ejb.packaging.NamedInputStream; -import org.hibernate.ejb.packaging.PackageFilter; -import org.hibernate.ejb.packaging.PersistenceMetadata; -import org.hibernate.ejb.packaging.PersistenceXmlLoader; +import org.hibernate.mediator.x.ejb.Ejb3Configuration; +import org.hibernate.mediator.x.ejb.HibernatePersistence; +import org.hibernate.mediator.x.ejb.packaging.ClassFilter; +import org.hibernate.mediator.x.ejb.packaging.Entry; +import org.hibernate.mediator.x.ejb.packaging.FileFilter; +import org.hibernate.mediator.x.ejb.packaging.Filter; +import org.hibernate.mediator.x.ejb.packaging.JarVisitor; +import org.hibernate.mediator.x.ejb.packaging.JarVisitorFactory; +import org.hibernate.mediator.x.ejb.packaging.NamedInputStream; +import org.hibernate.mediator.x.ejb.packaging.PackageFilter; +import org.hibernate.mediator.x.ejb.packaging.PersistenceMetadata; +import org.hibernate.mediator.x.ejb.packaging.PersistenceXmlLoader; import org.hibernate.mediator.stubs.util.CollectionHelper; import org.xml.sax.EntityResolver; = @@ -63,7 +63,7 @@ if (xmls =3D=3D null || !xmls.hasMoreElements()) { return null; } - final String IMPLEMENTATION_NAME =3D HibernatePersistence.class.getName(= ); + final String IMPLEMENTATION_NAME =3D HibernatePersistence.CL; List res =3D null; while (xmls.hasMoreElements() && res =3D=3D null) { URL url =3D xmls.nextElement(); @@ -164,9 +164,8 @@ * @param metadata * @throws IOException */ - @SuppressWarnings("unchecked") private static void addMetadataFromVisitor(JarVisitor visitor, String add= Path, PersistenceMetadata metadata) throws IOException { - Set[] entries =3D visitor.getMatchingEntries(); + Set[] entries =3D visitor.getMatchingEntries(); Filter[] filters =3D visitor.getFilters(); int size =3D filters.length; List classes =3D metadata.getClasses(); @@ -174,14 +173,13 @@ List hbmFiles =3D metadata.getHbmfiles(); List mappingFiles =3D metadata.getMappingFiles(); for (int index =3D 0; index < size; index++) { - for (Object o : entries[index]) { - Entry entry =3D (Entry) o; + for (Entry entry : entries[index]) { if (filters[index] instanceof ClassFilter) { classes.add(entry.getName()); } else if (filters[index] instanceof PackageFilter) { packages.add(entry.getName()); } else if (filters[index] instanceof FileFilter) { - hbmFiles.add(new NamedInputStream(addPath + "/" + entry.getName(), //= $NON-NLS-1$ + hbmFiles.add(NamedInputStream.create(addPath + "/" + entry.getName(),= //$NON-NLS-1$ entry.getInputStream())); if (mappingFiles !=3D null) { mappingFiles.remove(entry.getName()); @@ -251,30 +249,27 @@ int size =3D (detectedArtifacts[0] ? 2 : 0) + ((searchORM || detectedArt= ifacts[1] || mappingFilesSize > 0) ? 1 : 0); Filter[] filters =3D new Filter[size]; if (detectedArtifacts[0]) { - filters[0] =3D new PackageFilter(false, null) { + filters[0] =3D PackageFilter.newInstance(false, null, new Filter.IAccep= tHolder() { public boolean accept(String javaElementName) { return true; } - }; - filters[1] =3D new ClassFilter( - false, new Class[] { - Entity.class, - MappedSuperclass.class, - Embeddable.class} - ) { - public boolean accept(String javaElementName) { - return true; - } - }; + }); + filters[1] =3D ClassFilter.newInstance(false, = + new Class[] { Entity.class, MappedSuperclass.class, Embeddable.class }= , = + new Filter.IAcceptHolder() { + public boolean accept(String javaElementName) { + return true; + } + }); } if (detectedArtifacts[1] || searchORM || mappingFilesSize > 0) { - filters[size - 1] =3D new FileFilter(true) { + filters[size - 1] =3D FileFilter.newInstance(true, new Filter.IAcceptHo= lder() { public boolean accept(String javaElementName) { return (detectedArtifacts[1] && javaElementName.endsWith("hbm.xml")) = //$NON-NLS-1$ || (searchORM && javaElementName.endsWith(META_INF_ORM_XML)) || (mappingFilesSize > 0 && mappingFiles.contains(javaElementName)); } - }; + }); } return filters; } Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/ejb/Ejb3Configuration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/Ejb3Configuration.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/Ejb3Configuration.java 2010-05= -14 20:01:00 UTC (rev 22092) @@ -0,0 +1,13 @@ +package org.hibernate.mediator.x.ejb; + +import org.hibernate.mediator.base.HObject; + +public class Ejb3Configuration extends HObject { + + public static final String CL =3D "org.hibernate.ejb.Ejb3Configuration"; = //$NON-NLS-1$ + + protected Ejb3Configuration(Object ejb3Configuration) { + super(ejb3Configuration, CL); + } + +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java 2010= -05-14 20:01:00 UTC (rev 22092) @@ -0,0 +1,15 @@ +package org.hibernate.mediator.x.ejb; + +import org.hibernate.mediator.base.HObject; + +public class HibernatePersistence extends HObject { + + public static final String CL =3D "org.hibernate.ejb.HibernatePersistence= "; //$NON-NLS-1$ + + protected HibernatePersistence(Object hibernatePersistence) { + super(hibernatePersistence, CL); + } + + public static final String AUTODETECTION =3D (String)HObject.readStaticFi= eldValue(CL, "AUTODETECTION"); //$NON-NLS-1$ + +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/ejb/packaging/ClassFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/ClassFilter.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/ClassFilter.java 201= 0-05-14 20:01:00 UTC (rev 22092) @@ -0,0 +1,38 @@ +package org.hibernate.mediator.x.ejb.packaging; + +import java.lang.reflect.Method; + +import net.sf.cglib.proxy.Enhancer; +import net.sf.cglib.proxy.MethodInterceptor; +import net.sf.cglib.proxy.MethodProxy; + +import org.hibernate.mediator.HibernateConsoleRuntimeException; +import org.hibernate.mediator.stubs.util.ReflectHelper; + +public class ClassFilter extends Filter { + + public static final String CL =3D "org.hibernate.ejb.packaging.ClassFilte= r"; //$NON-NLS-1$ + + protected ClassFilter(Object classFilter) { + super(classFilter, CL); + } + + @SuppressWarnings("unchecked") + public static ClassFilter newInstance(boolean retrieveStream, Class[] ann= otations, final IAcceptHolder acceptHolder) { + Class clazz; + try { + clazz =3D ReflectHelper.classForName(CL); + } catch (ClassNotFoundException e) { + throw new HibernateConsoleRuntimeException(e); + } + MethodInterceptor mi =3D new MethodInterceptor() { + public Object intercept(Object obj, Method method, Object[] args, Metho= dProxy proxy) throws Throwable { + return acceptHolder.accept((String)args[0]); + } + }; + Enhancer e =3D createEnhancer(clazz, mi); + Object packageFilter =3D e.create(new Class[] { boolean.class, Class[].c= lass }, + new Object[] { retrieveStream, annotations } ); + return new ClassFilter(packageFilter); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/ejb/packaging/Entry.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/Entry.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/Entry.java 2010-05-1= 4 20:01:00 UTC (rev 22092) @@ -0,0 +1,23 @@ +package org.hibernate.mediator.x.ejb.packaging; + +import java.io.InputStream; + +import org.hibernate.mediator.base.HObject; + +public class Entry extends HObject { + + public static final String CL =3D "org.hibernate.ejb.packaging.Entry"; //= $NON-NLS-1$ + + protected Entry(Object entry) { + super(entry, CL); + } + + public String getName() { + return (String)invoke(mn()); + } + + public InputStream getInputStream() { + return (InputStream)invoke(mn()); + } + +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/ejb/packaging/FileFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/FileFilter.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/FileFilter.java 2010= -05-14 20:01:00 UTC (rev 22092) @@ -0,0 +1,38 @@ +package org.hibernate.mediator.x.ejb.packaging; + +import java.lang.reflect.Method; + +import net.sf.cglib.proxy.Enhancer; +import net.sf.cglib.proxy.MethodInterceptor; +import net.sf.cglib.proxy.MethodProxy; + +import org.hibernate.mediator.HibernateConsoleRuntimeException; +import org.hibernate.mediator.stubs.util.ReflectHelper; + +public class FileFilter extends Filter { + + public static final String CL =3D "org.hibernate.ejb.packaging.FileFilter= "; //$NON-NLS-1$ + + protected FileFilter(Object fileFilter) { + super(fileFilter, CL); + } + + public static FileFilter newInstance(boolean retrieveStream, final IAccep= tHolder acceptHolder) { + Class clazz; + try { + clazz =3D ReflectHelper.classForName(CL); + } catch (ClassNotFoundException e) { + throw new HibernateConsoleRuntimeException(e); + } + MethodInterceptor mi =3D new MethodInterceptor() { + public Object intercept(Object obj, Method method, Object[] args, Metho= dProxy proxy) throws Throwable { + return acceptHolder.accept((String)args[0]); + } + }; + Enhancer e =3D createEnhancer(clazz, mi); + Object packageFilter =3D e.create(new Class[] { boolean.class }, + new Object[] { retrieveStream } ); + return new FileFilter(packageFilter); + } + +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/ejb/packaging/Filter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/Filter.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/Filter.java 2010-05-= 14 20:01:00 UTC (rev 22092) @@ -0,0 +1,46 @@ +package org.hibernate.mediator.x.ejb.packaging; + +import java.lang.reflect.Method; + +import net.sf.cglib.proxy.Callback; +import net.sf.cglib.proxy.CallbackFilter; +import net.sf.cglib.proxy.Enhancer; +import net.sf.cglib.proxy.MethodInterceptor; +import net.sf.cglib.proxy.NoOp; + +import org.hibernate.mediator.base.HObject; + +public class Filter extends HObject { + + public static final String CL =3D "org.hibernate.ejb.packaging.Filter"; /= /$NON-NLS-1$ + + protected Filter(Object filter) { + super(filter, CL); + } + + protected Filter(Object filter, String cn) { + super(filter, cn); + } + = + public interface IAcceptHolder { + public boolean accept(String javaElementName); + } + + = + private static final CallbackFilter baseNodeFilter =3D new CallbackFilter= () { + public int accept(Method method) { + if ("accept".equals(method.getName() ) ) { + return 1; + } + return 0; + } + }; + = + public static Enhancer createEnhancer(Class clazz, MethodInterceptor m= i) { + Enhancer e =3D new Enhancer(); + e.setSuperclass(clazz); + e.setCallbacks(new Callback[] { NoOp.INSTANCE, mi }); + e.setCallbackFilter(baseNodeFilter); + return e; + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/ejb/packaging/JarVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/JarVisitor.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/JarVisitor.java 2010= -05-14 20:01:00 UTC (rev 22092) @@ -0,0 +1,43 @@ +package org.hibernate.mediator.x.ejb.packaging; + +import java.util.HashSet; +import java.util.Set; + +import org.hibernate.mediator.base.HObject; + +public class JarVisitor extends HObject { + + public static final String CL =3D "org.hibernate.ejb.packaging.JarVisitor= "; //$NON-NLS-1$ + + protected JarVisitor(Object jarVisitor) { + super(jarVisitor, CL); + } + + public String getUnqualifiedJarName() { + return (String)invoke(mn()); + } + + @SuppressWarnings("unchecked") + public Set[] getMatchingEntries() { + Set[] objs =3D (Set[])invoke(mn()); + Set[] res =3D new Set[objs.length]; + for (int i =3D 0; i < objs.length; i++) { + Set newSet =3D new HashSet(); + for (Object o : objs[i]) { + newSet.add(new Entry(o)); + } + res[i] =3D newSet; + } + return res; + } + + public Filter[] getFilters() { + Object[] objs =3D (Object[])invoke(mn()); + Filter[] res =3D new Filter[objs.length]; + for (int i =3D 0; i < objs.length; i++) { + res[i] =3D new Filter(objs[i]); + } + return res; + } + +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/ejb/packaging/JarVisitorFactory= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/JarVisitorFactory.ja= va (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/JarVisitorFactory.ja= va 2010-05-14 20:01:00 UTC (rev 22092) @@ -0,0 +1,68 @@ +package org.hibernate.mediator.x.ejb.packaging; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.net.URL; + +import org.hibernate.mediator.HibernateConsoleRuntimeException; +import org.hibernate.mediator.base.HObject; +import org.hibernate.mediator.stubs.util.ReflectHelper; +import org.hibernate.mediator.util.MReflectionUtils; + +public class JarVisitorFactory extends HObject { + + public static final String CL =3D "org.hibernate.ejb.packaging.JarVisitor= Factory"; //$NON-NLS-1$ + + protected JarVisitorFactory(Object jarVisitorFactory) { + super(jarVisitorFactory, CL); + } + + public static URL getJarURLFromURLEntry(URL url, String entry) { + return (URL)invokeStaticMethod(CL, mn(), url, entry); + } + + = + public static Object invokeStaticGetVisitor(URL jarUrl, Filter[] filte= rs) { + Class[] signature =3D new Class[2]; + Object[] vals =3D new Object[2]; + // + signature[0] =3D jarUrl.getClass(); + vals[0] =3D jarUrl; + // + Class clazz; + try { + clazz =3D ReflectHelper.classForName(Filter.CL); + } catch (ClassNotFoundException e) { + throw new HibernateConsoleRuntimeException(e); + } + signature[1] =3D java.lang.reflect.Array.newInstance(clazz, 0).getClass(= ); + Object[] objFilters =3D (Object[])java.lang.reflect.Array.newInstance(cl= azz, filters.length); + for (int i =3D 0; i < filters.length; i++) { + objFilters[i] =3D filters[i].Obj(); + } + vals[1] =3D objFilters; + // + try { + clazz =3D ReflectHelper.classForName(CL); + } catch (ClassNotFoundException e) { + throw new HibernateConsoleRuntimeException(e); + } + Method method =3D MReflectionUtils.getMethod(clazz, "getVisitor", signat= ure ); + Object res; + try { + res =3D method.invoke(null, vals); + } catch (IllegalArgumentException e) { + throw new HibernateConsoleRuntimeException(e); + } catch (IllegalAccessException e) { + throw new HibernateConsoleRuntimeException(e); + } catch (InvocationTargetException e) { + throw new HibernateConsoleRuntimeException(e); + } + return res; + } + = + public static JarVisitor getVisitor(URL jarUrl, Filter[] filters) { + //return new JarVisitor(invokeStaticMethod(CL, mn(), jarUrl, filters)); + return new JarVisitor(invokeStaticGetVisitor(jarUrl, filters)); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/ejb/packaging/NamedInputStream.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/NamedInputStream.jav= a (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/NamedInputStream.jav= a 2010-05-14 20:01:00 UTC (rev 22092) @@ -0,0 +1,31 @@ +package org.hibernate.mediator.x.ejb.packaging; + +import java.io.InputStream; + +import org.hibernate.mediator.base.HObject; + +public class NamedInputStream extends HObject { + + public static final String CL =3D "org.hibernate.ejb.packaging.NamedInput= Stream"; //$NON-NLS-1$ + + protected NamedInputStream(Object namedInputStream) { + super(namedInputStream, CL); + } + + public static NamedInputStream newInstance() { + return new NamedInputStream(HObject.newInstance(CL)); + } + + public static NamedInputStream create(String name, InputStream stream) { + return (NamedInputStream)newInstance(CL, name, stream); + } + + public String getName() { + return (String)invoke(mn()); + } + + public InputStream getStream() { + return (InputStream)invoke(mn()); + } + +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/ejb/packaging/PackageFilter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/PackageFilter.java = (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/PackageFilter.java 2= 010-05-14 20:01:00 UTC (rev 22092) @@ -0,0 +1,38 @@ +package org.hibernate.mediator.x.ejb.packaging; + +import java.lang.reflect.Method; + +import net.sf.cglib.proxy.Enhancer; +import net.sf.cglib.proxy.MethodInterceptor; +import net.sf.cglib.proxy.MethodProxy; + +import org.hibernate.mediator.HibernateConsoleRuntimeException; +import org.hibernate.mediator.stubs.util.ReflectHelper; + +public class PackageFilter extends Filter { + + public static final String CL =3D "org.hibernate.ejb.packaging.PackageFil= ter"; //$NON-NLS-1$ + + protected PackageFilter(Object packageFilter) { + super(packageFilter, CL); + } + + @SuppressWarnings("unchecked") + public static PackageFilter newInstance(boolean retrieveStream, Class[] a= nnotations, final IAcceptHolder acceptHolder) { + Class clazz; + try { + clazz =3D ReflectHelper.classForName(CL); + } catch (ClassNotFoundException e) { + throw new HibernateConsoleRuntimeException(e); + } + MethodInterceptor mi =3D new MethodInterceptor() { + public Object intercept(Object obj, Method method, Object[] args, Metho= dProxy proxy) throws Throwable { + return acceptHolder.accept((String)args[0]); + } + }; + Enhancer e =3D createEnhancer(clazz, mi); + Object packageFilter =3D e.create(new Class[] { boolean.class, Class[].c= lass }, + new Object[] { retrieveStream, annotations } ); + return new PackageFilter(packageFilter); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/ejb/packaging/PersistenceMetada= ta.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/PersistenceMetadata.= java (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/PersistenceMetadata.= java 2010-05-14 20:01:00 UTC (rev 22092) @@ -0,0 +1,61 @@ +package org.hibernate.mediator.x.ejb.packaging; + +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; + +import org.hibernate.mediator.base.HObject; + +public class PersistenceMetadata extends HObject { + + public static final String CL =3D "org.hibernate.ejb.packaging.Persistenc= eMetadata"; //$NON-NLS-1$ + + protected PersistenceMetadata(Object persistenceMetadata) { + super(persistenceMetadata, CL); + } + + public String getName() { + return (String)invoke(mn()); + } + + public void setName(Object name) { + invoke(mn(), name); + } + + public String getProvider() { + return (String)invoke(mn()); + } + + public boolean getExcludeUnlistedClasses() { + return (Boolean)invoke(mn()); + } + + @SuppressWarnings("unchecked") + public List getClasses() { + return (List)invoke(mn()); + } + + @SuppressWarnings("unchecked") + public List getPackages() { + return (List)invoke(mn()); + } + + @SuppressWarnings("unchecked") + public List getMappingFiles() { + return (List)invoke(mn()); + } + + @SuppressWarnings("unchecked") + public List getHbmfiles() { + List list =3D (List)invoke(mn()); + List res =3D new ArrayList(); + for (Object obj : list) { + res.add(new NamedInputStream(obj)); + } + return res; + } + + public Properties getProps() { + return (Properties)invoke(mn()); + } +} Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/src/org/hibernate/mediator/x/ejb/packaging/PersistenceXmlLoa= der.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/PersistenceXmlLoader= .java (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/PersistenceXmlLoader= .java 2010-05-14 20:01:00 UTC (rev 22092) @@ -0,0 +1,31 @@ +package org.hibernate.mediator.x.ejb.packaging; + +import java.net.URL; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.persistence.mediator.x.spi.PersistenceUnitTransactionType; + +import org.hibernate.mediator.base.HObject; +import org.xml.sax.EntityResolver; + +public class PersistenceXmlLoader extends HObject { + + public static final String CL =3D "org.hibernate.ejb.packaging.Persistenc= eXmlLoader"; //$NON-NLS-1$ + + protected PersistenceXmlLoader(Object persistenceXmlLoader) { + super(persistenceXmlLoader, CL); + } + + @SuppressWarnings("unchecked") + public static List deploy(URL url, Map overrides, En= tityResolver resolver, + PersistenceUnitTransactionType defaultTransactionType) { + List list =3D (List)invokeStaticMethod(CL, mn(), url, overrides, reso= lver, defaultTransactionType); + List res =3D new ArrayList(= ); + for (Object o : list) { + res.add(new PersistenceMetadata(o)); + } + return res; + } +} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/Column.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Column.java 2010-05-14 18:= 53:05 UTC (rev 22091) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/Column.java 2010-05-14 20:= 01:00 UTC (rev 22092) @@ -7,9 +7,9 @@ public class Column extends Selectable { public static final String CL =3D "org.hibernate.mapping.Column"; //$NON-= NLS-1$ = - public static final int DEFAULT_LENGTH =3D 255; - public static final int DEFAULT_PRECISION =3D 19; - public static final int DEFAULT_SCALE =3D 2; + public static final int DEFAULT_LENGTH =3D (Integer)readStaticFieldValue(= CL, "DEFAULT_LENGTH"); + public static final int DEFAULT_PRECISION =3D (Integer)readStaticFieldVal= ue(CL, "DEFAULT_PRECISION"); + public static final int DEFAULT_SCALE =3D (Integer)readStaticFieldValue(C= L, "DEFAULT_SCALE"); = protected Column(Object column) { super(column, CL); --===============2855056047497829199==-- From jbosstools-commits at lists.jboss.org Fri May 14 16:02:21 2010 Content-Type: multipart/mixed; boundary="===============6800779437784423034==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22093 - trunk/jmx/docs/reference/en-US. Date: Fri, 14 May 2010 16:02:21 -0400 Message-ID: <201005142002.o4EK2LsG016569@svn01.web.mwc.hst.phx2.redhat.com> --===============6800779437784423034== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-14 16:02:20 -0400 (Fri, 14 May 2010) New Revision: 22093 Modified: trunk/jmx/docs/reference/en-US/tasks.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-49 Managing Equinox chapter is updated and corrected Modified: trunk/jmx/docs/reference/en-US/tasks.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/docs/reference/en-US/tasks.xml 2010-05-14 20:01:00 UTC (rev 2= 2092) +++ trunk/jmx/docs/reference/en-US/tasks.xml 2010-05-14 20:02:20 UTC (rev 2= 2093) @@ -1,382 +1,391 @@ - - - - JMX Tools Tasks - This chapter will give you answers on most popular questions ask= ed by JMX - plugin users. -
- Quick Start - = - To start using the JMX Tools it's = necessary to open - MBean Explorer. Go to Window > Show View > Other and then select - MBean Explorer and click OK. - = - The MBean Explorer lists all the domai= ns, mbeans, attributes, and operations inside a - connection. When you double-click a MBean in the MBean Explorer, it opens a multi-page - editor to manage the MBean. The MBean Editor is composed of these pages: - = - - - Attributes page, to get/set the attributes of the MBean - - - Operations page, to invoke operations on the MBean - - - Notifications page, to receive notifications from the MBean - - - Info page,= which displays general information about the MBean - - - = -
- = -
- Managing Application - - -Like it's said earlier in the guide the JMX technology allows to mon= itor and manage Java applications. In this section we will show you how to = get connected to = -a sample Java application and run the sayHello() meth= od remotely from inside of the MBean Explorer. - -Unzip the bundle of sample classes. -Compile the example Java classes from within where you un= packed the files directory. - - = - - -Start the Main application, specifyin= g the properties that expose Main for remote management: - - = - = -If everything was done correctly you will see the "Waiting for incom= ing requests..." message on the screen. = - - = - - Now launch the Eclipse IDE, in Eclipse open the MBean Explorer. Go to Window > Show Vie= w > Other and then select - MBean Explorer and click OK) - - Click the - New Connection icon = - = - = - - - - - = - in the MBean Explorer menu - bar. - - = - In the Create JMX Connection dialog, hit Next and then click the Adv= anced tab. - = - = - In the JMX URL input field enter the= following URL: - = - = - = - - = - Press Finish to esteblish the conne= ction with the application. - - = - Now expand the connection you have just created, then ope= n the com.example package and click sayHello= () method. - Once the sayHello() method is clicked the MBean Editor is activated. - = - - = - In the MBean Editor go to the Operation Details section and hit the sayHello()= button. You will get the "Operation inoked success= fully" message. = - - = - The final step is to make sure the application worked a= s it was expected. Open the terminal where you launched the application in = step 3. Now you see the "hello, world" message on the screen. = - - - - - -
-
- Tomcat Managing - = - It's possible to manage Tomcat using JMX Tool= s. - = - Currently, JMX Tooling is able to connect to Tomcat without = authentication or with - password-based authentication. - Using SSL for authentication is not supported: you need to m= ake sure that the System - property - com.sun.management.jmxremote.ssl - is set to false. - More information to manage Tomcat can be found in Tomcat management documentati= on. - Instructions to manage remotely Tomcat are available in Tomcat&a= pos;s monitoring documentation. - = - = -
- = -
- Eclipse Equinox Managing - = - You can manage Equinox through the Equinox monitoring framew= ork. - Once you have installed the Equinox monitoring framework and= restarted Eclipse: - = - - - Go to - Window > Open Perspective > Other - and select the JMX perspective - - = - - = - - Switch to the MBean Explorer by= going to - Window > Show View > Other - and selecting the MBean Explorer - - = - - Click the - New Connection icon = - = - = - - - - - = - in the MBean Explorer menu - bar. - - = - - Select the - Advanced tab and set t= he JMX URL to - service:jmx:rmi:///jndi/rmi://:8118/jmxs= erver - - - - = - You now have access to the MBeans exposed by Equinox. -
- = - = - - = - = -
- Managing JBoss AS - = - Managing JBoss instances is not supported with the JMX Tools - alone. You must also download and install the AS Too= ls portion of - the JBoss Tools distribution. Even after = installing the proper - tooling, you cannot create a JBoss JMX connection yourself or = through the Connection - Wizard. The first step is to create a JBoss Server. The full i= nstructions for this can - be found in the AS Tools section, however, the short summary i= s: - - - Open the Servers view - - = - - Right-click in the view and select - New > Server - - - = - - In the - JBoss Enterprise Middleware - or in - JBoss Community - section, select a server version - - = - - If a runtime has not yet been created, you'll b= e prompted for the - server's home directory, JDK, and configuration - - = - - Finish the wizard and note that you have a new entry= in both the - Servers view and the MB= ean - Explorer - - = - - Start the server by right-clicking it and selecting = - Start - - - Note that once the server is started, the JMX connec= tion can be - expanded - - - = - Now you can explore MBeans exposed by a JBoss instance. -
- = -
- Managing JBoss AS Remotely - = - JBoss JMX Tool allow you to easily get access and mangane J= Boss AS server remotely. = - In order to get connected to the instance of JBoss AS remotely you need = to run the server or make sure the server is lauched. = - - - - Go to - Window > Open Perspective > Other - and select the JMX perspective. - = - - Switch to the MBean Explorer by= going to - Window > Show View > Other - and selecting the MBean Explorer. - - = - - Click the - New Connection icon = - = - = - - - - - = - in the MBean Explorer menu - bar. - - = - - Select the - Advanced tab and set t= he JMX URL to: = - = - = - Please, note that in this example we connected to the local host= . = - - -
-
= - Extension Task - This section will outline how to contribute your own Server = type with some default - behavior. - = -
- Why we should do that? - = - You might be asking yourself why you'd need to exte= nd this framework if JMX is - a standard. Perhaps you want a connection to be automatica= lly created after some specific - action, or perhaps you want your connection wizard to do m= ore than simply set a host and - port. JBoss, for example, requires setting some credential= s on the client machine, but - using JBoss classes to do it. This requires that the conne= ction have access to JBoss - jars. -
- = -
- Core Extensions - = - To create your own JMX Connection type, you must use the - org.jboss.tools.jmx.core.MBeanServerConnectionProvider ext= ension point. This point takes - one child, a connectionProvider with a class that implemen= ts - org.jboss.tools.jmx.core.IConnectionProvider. - = - An IConnectionProvider is responsible for creation and d= eletion of IConnectionWrapper - objects. It must also keep a list of listeners that it is = expected to inform when a - connection is added or removed from its list. - = - Each IConnectionWrapper is expected to handle running ar= bitrary JMX runnables or getting - a "Root" object representing all JMX nodes. There are some= utility methods the - IConnectionWrapper can make use of. -
- = -
- UI Extensions - There are two extension points currently approved for us= e in the UI - - - org.jboss.tools.jmx.ui.providerUI - provide an i= con, id, displayable name, and - wizardPage class for creation of new connections - - - org.jboss.tools.jmx.ui.attribute.controls - allo= ws you to map class types to some - Control to present them in the MBean Editor - We hope, this guide helped you to get started wi= th the JBoss JMX Tools. Besides, for additional information you are welcome= on JBoss forum. - - -
- = -
-
- = - Connections Creation Task - = - The MBean Explorer supports several dif= ferent types of connections. = - The tooling itself comes only with a default connection type, = however other - adopters can provide additional connection types that may requ= ire additional - or non-spec behavior. Connections can be in either the connect= ed state or - the disconnected state. Some connection types (such as the def= ault connection type) - allow you to control the current state. Other connection types= may not. - = - Similarly, some connection types may be able to be created, = and others may not. = - The default connection type, for example, can be created and d= eleted by you - at will. The AS Tools connection type, which represents a JBos= s server, does not - allow you this level of control. A JBoss JMX connection is cre= ated when a JBoss server is created - in the server's view, and deleted when said server is deleted.= The JMX connection for = - this server is in the connected state only when the server is = started. - = - = -
Establishing Connection - = - There are two ways to connect to an application with re= mote management enabled: - = - The first step is the same for both - to connect to a M= Bean Server, click the - - New Connection icon = - = - = - - - - - = - in the MBean Explorer menu bar. - = - Then to follow the simple one you just need to specify h= ost, port (and optionally user - name and password) and click - OK. - On the Advanced tab you can set the= sever name (it will be displayed in MBean Explorer), = a url to the remote server. - For example, to connect to JBoss AS you need to set the JMX URL to = - - = - If it is required you can enter user name and password for the se= rver connection. = - - = - = - - Note - Only JMX URL based on RMI are supported. - -
-
- - + + + + JMX Tools Tasks + This chapter will give you answers on most popular questions ask= ed by JMX + plugin users. +
+ Quick Start + = + To start using the JMX Tools it's = necessary to open + MBean Explorer. Go to Window > Show View > Other and then select + MBean Explorer and click OK. + = + The MBean Explorer lists all the domai= ns, mbeans, attributes, and operations inside a + connection. When you double-click a MBean in the MBean Explorer, it opens a multi-page + editor to manage the MBean. The MBean Editor is composed of these pages: + = + + + Attributes page, to get/set the attributes of the MBean + + + Operations page, to invoke operations on the MBean + + + Notifications page, to receive notifications from the MBean + + + Info page,= which displays general information about the MBean + + + = +
+ = +
+ Managing Application + + + +Like it's said earlier in the guide the JMX technology allows to mon= itor and manage Java applications. In this section we will show you how to = get connected to = +a sample Java application and run the sayHello() meth= od remotely from inside of the MBean Explorer. + +Unzip the bundle of sample classes. +Compile the example Java classes from within where you un= packed the files directory. + + = + + +Start the Main application, specifyin= g the properties that expose Main for remote management: + + = + = +If everything was done correctly you will see the "Waiting for incom= ing requests..." message on the screen. = + + = + + Now launch the Eclipse IDE, in Eclipse open the MBean Explorer. Go to Window > Show Vie= w > Other and then select + MBean Explorer and click OK) + + Click the + New Connection icon = + = + = + + + + + = + in the MBean Explorer menu + bar. + + = + In the Create JMX Connection dialog, hit Next and then click the Adv= anced tab. + = + = + In the JMX URL input field enter the= following URL: + = + = + = + + = + Press Finish to esteblish the conne= ction with the application. + + = + Now expand the connection you have just created, then ope= n the com.example package and click sayHello= () method. + Once the sayHello() method is clicked the MBean Editor is activated. + = + + = + In the MBean Editor go to the Operation Details section and hit the sayHello()= button. You will get the "Operation inoked success= fully" message. = + + = + The final step is to make sure the application worked a= s it was expected. Open the terminal where you launched the application in = step 3. Now you see the "hello, world" message on the screen. = + + + + + +
+
+ Tomcat Managing + = + It's possible to manage Tomcat using JMX Tool= s. + = + Currently, JMX Tooling is able to connect to Tomcat without = authentication or with + password-based authentication. + Using SSL for authentication is not supported: you need to m= ake sure that the System + property + com.sun.management.jmxremote.ssl + is set to false. + More information to manage Tomcat can be found in Tomcat management documentati= on. + Instructions to manage remotely Tomcat are available in Tomcat&a= pos;s monitoring documentation. + = + = +
+ = +
+ Eclipse Equinox Managing + = + You can manage Equinox through the Equinox monitoring framew= ork. + In this section we will show you how to connect to an Equinox serv= er via JBoss JMX tools. First off, you need to make for example a simple se= rvlet and run it on a server. This guide is not intended to teach you how t= o build application and run them on the server, you can read for example = this tutorial to get a better idea of how to build server-based ap= plications with Eclipse Equinox. + Once you have run an application on the server you can connect to i= t using JBoss JMX tools. + = + + + Go to + Window > Open Perspective > Other + and select the JMX perspective. + + = + + = + + Switch to the MBean Explorer by= going to + Window > Show View > Other + and selecting the MBean Explorer. + + = + + Click the + New Connection icon = + = + = + + + + + = + in the MBean Explorer menu + bar. + + = + + Select the + Advanced tab and set t= he JMX URL to + service:jmx:rmi:///jndi/rmi://:8118/jmxs= erver. + + = +
+ Using JMX Tools to Access Equinox Server + + + + + +
+ + + + = + You now have access to the MBeans exposed by Equinox. +
+ = + = +
+ Managing JBoss AS + = + Managing JBoss instances is not supported with the JMX Tools + alone. You must also download and install the AS Too= ls portion of + the JBoss Tools distribution. Even after = installing the proper + tooling, you cannot create a JBoss JMX connection yourself or = through the Connection + Wizard. The first step is to create a JBoss Server. The full i= nstructions for this can + be found in the AS Tools section, however, the short summary i= s: + + + Open the Servers view + + = + + Right-click in the view and select + New > Server + + + = + + In the + JBoss Enterprise Middleware + or in + JBoss Community + section, select a server version + + = + + If a runtime has not yet been created, you'll b= e prompted for the + server's home directory, JDK, and configuration + + = + + Finish the wizard and note that you have a new entry= in both the + Servers view and the MB= ean + Explorer + + = + + Start the server by right-clicking it and selecting = + Start + + + Note that once the server is started, the JMX connec= tion can be + expanded + + + = + Now you can explore MBeans exposed by a JBoss instance. +
+ = +
+ Managing JBoss AS Remotely + = + JBoss JMX Tool allow you to easily get access and mangane J= Boss AS server remotely. = + In order to get connected to the instance of JBoss AS remotely you need = to run the server or make sure the server is lauched. = + + + + Go to + Window > Open Perspective > Other + and select the JMX perspective. + = + + Switch to the MBean Explorer by= going to + Window > Show View > Other + and selecting the MBean Explorer. + + = + + Click the + New Connection icon = + = + = + + + + + = + in the MBean Explorer menu + bar. + + = + + Select the + Advanced tab and set t= he JMX URL to: = + = + = + Please, note that in this example we connected to the local host= . = + + +
+
= + Extension Task + This section will outline how to contribute your own Server = type with some default + behavior. + = +
+ Why we should do that? + = + You might be asking yourself why you'd need to exte= nd this framework if JMX is + a standard. Perhaps you want a connection to be automatica= lly created after some specific + action, or perhaps you want your connection wizard to do m= ore than simply set a host and + port. JBoss, for example, requires setting some credential= s on the client machine, but + using JBoss classes to do it. This requires that the conne= ction have access to JBoss + jars. +
+ = +
+ Core Extensions + = + To create your own JMX Connection type, you must use the + org.jboss.tools.jmx.core.MBeanServerConnectionProvider ext= ension point. This point takes + one child, a connectionProvider with a class that implemen= ts + org.jboss.tools.jmx.core.IConnectionProvider. + = + An IConnectionProvider is responsible for creation and d= eletion of IConnectionWrapper + objects. It must also keep a list of listeners that it is = expected to inform when a + connection is added or removed from its list. + = + Each IConnectionWrapper is expected to handle running ar= bitrary JMX runnables or getting + a "Root" object representing all JMX nodes. There are some= utility methods the + IConnectionWrapper can make use of. +
+ = +
+ UI Extensions + There are two extension points currently approved for us= e in the UI + + + org.jboss.tools.jmx.ui.providerUI - provide an i= con, id, displayable name, and + wizardPage class for creation of new connections + + + org.jboss.tools.jmx.ui.attribute.controls - allo= ws you to map class types to some + Control to present them in the MBean Editor + We hope, this guide helped you to get started wi= th the JBoss JMX Tools. Besides, for additional information you are welcome= on JBoss forum. + + +
+ = +
+
+ = + Connections Creation Task + = + The MBean Explorer supports several dif= ferent types of connections. = + The tooling itself comes only with a default connection type, = however other + adopters can provide additional connection types that may requ= ire additional + or non-spec behavior. Connections can be in either the connect= ed state or + the disconnected state. Some connection types (such as the def= ault connection type) + allow you to control the current state. Other connection types= may not. + = + Similarly, some connection types may be able to be created, = and others may not. = + The default connection type, for example, can be created and d= eleted by you + at will. The AS Tools connection type, which represents a JBos= s server, does not + allow you this level of control. A JBoss JMX connection is cre= ated when a JBoss server is created + in the server's view, and deleted when said server is deleted.= The JMX connection for = + this server is in the connected state only when the server is = started. + = + = +
Establishing Connection + = + There are two ways to connect to an application with re= mote management enabled: + = + The first step is the same for both - to connect to a M= Bean Server, click the + + New Connection icon = + = + = + + + + + = + in the MBean Explorer menu bar. + = + Then to follow the simple one you just need to specify h= ost, port (and optionally user + name and password) and click + OK. + On the Advanced tab you can set the= sever name (it will be displayed in MBean Explorer), = a url to the remote server. + For example, to connect to JBoss AS you need to set the JMX URL to = + + = + If it is required you can enter user name and password for the se= rver connection. = + + = + = + + Note + Only JMX URL based on RMI are supported. + +
+
+ + --===============6800779437784423034==-- From jbosstools-commits at lists.jboss.org Sat May 15 00:06:58 2010 Content-Type: multipart/mixed; boundary="===============3886475175117305490==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22094 - branches/modular_build. Date: Sat, 15 May 2010 00:06:58 -0400 Message-ID: <201005150406.o4F46wFY030334@svn01.web.mwc.hst.phx2.redhat.com> --===============3886475175117305490== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-15 00:06:57 -0400 (Sat, 15 May 2010) New Revision: 22094 Modified: branches/modular_build/genpom.xml Log: tweak output (ported from teiid designer version) Modified: branches/modular_build/genpom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/genpom.xml 2010-05-14 20:02:20 UTC (rev 22093) +++ branches/modular_build/genpom.xml 2010-05-15 04:06:57 UTC (rev 22094) @@ -492,7 +492,7 @@ "> - COMPONENT =3D ${COMPONENT} + COMPONENT =3D '${COMPONENT}' @@ -511,7 +511,7 @@ - COMPONENT =3D ${COMPONENT}, pathToParentPom = =3D ${pathToParentPom} + COMPONENT =3D '${COMPONENT}', pathToParentPom = =3D ${pathToParentPom} = - + = - + + + + - = = - - + + = @@ -34,6 +34,7 @@ --> = + = @@ -43,45 +44,37 @@ Run As > Ant Build = To run this script via commandline (build default modules + run tests, the= n collect test results and build per-component + overall update site zips): - cd /home/nboldt/workspace36/jbosstools-modular_build; ant + cd /path/to/checked/out/source/tree; ant = or, to build everything but not *run* the tests: - cd /home/nboldt/workspace36/jbosstools-modular_build; \ ant -DMAVEN_FLAGS=3D"clean install -Dmaven.test.skip" or ant -Dnotests=3Dtrue = or, to purge the local repo (or purge then build): - cd /home/nboldt/workspace36/jbosstools-modular_build; \ ant purge -q or ant clean-run = -or, to build specific module(s): = - cd /home/nboldt/workspace36/jbosstools-modular_build; \ - ant -DCOMPONENTS=3Dtests,common,flow,jbpm - or, to rebuild even if sources have not changed: - cd /home/nboldt/workspace36/jbosstools-modular_build; \ - ant -DCOMPONENTS=3Dtests,common -Dbuild.if.sources.unchanged=3Dtrue + ant -Dbuild.if.sources.unchanged=3Dtrue = or, to fetch fresh sources, then build anew: - cd /home/nboldt/workspace36/jbosstools-modular_build; \ - ant -DCOMPONENTS=3Dtests,common,flow,jbpm -Dclean.sources=3Dtrue + ant -Dclean.sources=3Dtrue = or, to (re-)run tests w/o (re-)building first: - cd /home/nboldt/workspace36/jbosstools-modular_build; \ - ant -DCOMPONENTS=3Dtests,common,jmx -DMAVEN_FLAGS=3D"osgi-test:test -B= -fn" + ant -DMAVEN_FLAGS=3D"osgi-test:test -B -fn" = +or, to build specific module(s): = + ant -DCOMPONENTS=3Dtests,common,flow,jbpm + +or, to re-build a single component's update site w/o first building, testi= ng, and installing it into the m2 repo: + ant -DCOMPONENT=3Djmx create.update.site; \ + ant -DCOMPONENT=3Djbpm create.update.site + or, to re-build the overall update site w/o building first: - cd /home/nboldt/workspace36/jbosstools-modular_build; \ ant create.overall.update.site -Dbuild.if.sources.unchanged=3Dtrue = -or, to re-build a single component's update site w/o first building, testi= ng, and installing it into the m2 repo: - cd /home/nboldt/workspace36/jbosstools-modular_build; \ - ant -DCOMPONENT=3Djmx create.update.site; \ - ant -DCOMPONENT=3Djbpm create.update.site - To have hudson manage sources (rather than having this script checkout/upd= ate them) use: = -Dhudson.managed.sources=3Dtrue = @@ -317,12 +310,22 @@ - Update @{COMPONENT} + Update '@{COMPONENT}' - + + + + + + + + @@ -523,11 +526,16 @@ - - The following components' sources have chang= ed and will be built: + + + + + + The following components' sources have chan= ged and will be built: COMPONENTS.to.build =3D ${COMPONENTS.to.build} - + + @@ -570,10 +578,10 @@ Build overall update @{COMPONENT} - Build @{COMPONENT} component + Build '@{COMPONENT}' component - + @@ -584,9 +592,12 @@ /> + + + - Run custom @{COMPONENT}/build.xml + Run custom '@{COMPONENT}/build.xml' @@ -730,7 +741,10 @@ - + @@ -1055,15 +1069,25 @@ = + + + + + + + + + + = - + @@ -1085,7 +1109,10 @@ = = - + --===============0629365001196578781==-- From jbosstools-commits at lists.jboss.org Sat May 15 01:46:18 2010 Content-Type: multipart/mixed; boundary="===============0933462178520172256==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22096 - branches/modular_build/build. Date: Sat, 15 May 2010 01:46:18 -0400 Message-ID: <201005150546.o4F5kIPa015591@svn01.web.mwc.hst.phx2.redhat.com> --===============0933462178520172256== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-15 01:46:18 -0400 (Sat, 15 May 2010) New Revision: 22096 Modified: branches/modular_build/build/build.xml Log: rename any leftover site.zip files when collecting results Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-15 04:10:56 UTC (rev 220= 95) +++ branches/modular_build/build/build.xml 2010-05-15 05:46:18 UTC (rev 220= 96) @@ -65,14 +65,13 @@ or, to (re-)run tests w/o (re-)building first: ant -DMAVEN_FLAGS=3D"osgi-test:test -B -fn" = -or, to build specific module(s): = +or, to build, test, and install 1 or more specific module(s): = ant -DCOMPONENTS=3Dtests,common,flow,jbpm = -or, to re-build a single component's update site w/o first building, testi= ng, and installing it into the m2 repo: - ant -DCOMPONENT=3Djmx create.update.site; \ - ant -DCOMPONENT=3Djbpm create.update.site +or, to re-build a single component's update site w/o building, testing, an= d installing it into the m2 repo: + ant -DCOMPONENT=3Djmx create.update.site = -or, to re-build the overall update site w/o building first: +or, to re-build the overall update site w/o building first (no applicable = when COMPONENTS=3D.): ant create.overall.update.site -Dbuild.if.sources.unchanged=3Dtrue = To have hudson manage sources (rather than having this script checkout/upd= ate them) use: = @@ -536,6 +535,12 @@ + + + + + + @@ -629,11 +634,16 @@ = - + - - - + + + + + + + + @@ -853,9 +863,14 @@ - - - + + + + + + + + @@ -863,8 +878,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + @@ -985,8 +1038,18 @@ /> + + + + + + + + + + @@ -1067,7 +1130,7 @@ = - + --===============0933462178520172256==-- From jbosstools-commits at lists.jboss.org Sat May 15 02:15:14 2010 Content-Type: multipart/mixed; boundary="===============7675102656411070870==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22097 - branches/modular_build/build. Date: Sat, 15 May 2010 02:15:14 -0400 Message-ID: <201005150615.o4F6FEbA025093@svn01.web.mwc.hst.phx2.redhat.com> --===============7675102656411070870== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-15 02:15:14 -0400 (Sat, 15 May 2010) New Revision: 22097 Modified: branches/modular_build/build/build.xml Log: remove svn revert before update so that local source changes in workspace w= on't be overwritten Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-15 05:46:18 UTC (rev 220= 96) +++ branches/modular_build/build/build.xml 2010-05-15 06:15:14 UTC (rev 220= 97) @@ -325,9 +325,11 @@ /> + --===============7675102656411070870==-- From jbosstools-commits at lists.jboss.org Sat May 15 02:43:45 2010 Content-Type: multipart/mixed; boundary="===============5332532494694806850==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22098 - branches/modular_build/build. Date: Sat, 15 May 2010 02:43:45 -0400 Message-ID: <201005150643.o4F6hjBt028305@svn01.web.mwc.hst.phx2.redhat.com> --===============5332532494694806850== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-15 02:43:44 -0400 (Sat, 15 May 2010) New Revision: 22098 Modified: branches/modular_build/build/build.xml Log: debug why maven keeps dying Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-15 06:15:14 UTC (rev 220= 97) +++ branches/modular_build/build/build.xml 2010-05-15 06:43:44 UTC (rev 220= 98) @@ -688,6 +688,7 @@ + ${mvnExe} ${MAVEN_FLAGS} ${maven.repo.local} - + = --===============5332532494694806850==-- From jbosstools-commits at lists.jboss.org Sat May 15 07:50:38 2010 Content-Type: multipart/mixed; boundary="===============3050884711171126513==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22099 - trunk/jmx/docs/reference/en-US/images. Date: Sat, 15 May 2010 07:50:38 -0400 Message-ID: <201005151150.o4FBoch4030356@svn01.web.mwc.hst.phx2.redhat.com> --===============3050884711171126513== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-15 07:50:38 -0400 (Sat, 15 May 2010) New Revision: 22099 Added: trunk/jmx/docs/reference/en-US/images/equinox.png trunk/jmx/docs/reference/en-US/images/invokemethod.png trunk/jmx/docs/reference/en-US/images/mbeans.png Log: https://jira.jboss.org/jira/browse/TOOLSDOC-49 added images Added: trunk/jmx/docs/reference/en-US/images/equinox.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jmx/docs/reference/en-US/images/equinox.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jmx/docs/reference/en-US/images/invokemethod.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jmx/docs/reference/en-US/images/invokemethod.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jmx/docs/reference/en-US/images/mbeans.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jmx/docs/reference/en-US/images/mbeans.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============3050884711171126513==-- From jbosstools-commits at lists.jboss.org Sat May 15 07:51:21 2010 Content-Type: multipart/mixed; boundary="===============6742508326494462033==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22100 - trunk/jmx/docs/reference/en-US. Date: Sat, 15 May 2010 07:51:21 -0400 Message-ID: <201005151151.o4FBpLZQ030384@svn01.web.mwc.hst.phx2.redhat.com> --===============6742508326494462033== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-15 07:51:21 -0400 (Sat, 15 May 2010) New Revision: 22100 Modified: trunk/jmx/docs/reference/en-US/tasks.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-49 added imageshttps://jira.jboss.org/jira/browse/TOOLSDOC-49 Managing Application is updated Modified: trunk/jmx/docs/reference/en-US/tasks.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/docs/reference/en-US/tasks.xml 2010-05-15 11:50:38 UTC (rev 2= 2099) +++ trunk/jmx/docs/reference/en-US/tasks.xml 2010-05-15 11:51:21 UTC (rev 2= 2100) @@ -37,9 +37,13 @@ = = = -Like it's said earlier in the guide the JMX technology allows to mon= itor and manage Java applications. In this section we will show you how to = get connected to = +As it's been said earlier in the guide the JMX technology allows to = monitor and manage Java applications. In this section we will show you how = to get connected to = a sample Java application and run the sayHello() meth= od remotely from inside of the MBean Explorer. + +http://java.sun.com/docs/books/tutorial/jmx/examples/jmx_examples.zip + +Save the bundle of JMX API sample classes, jmx_e= xamples.zip, to your working directory Unzip the bundle of sample classes. Compile the example Java classes from within where you un= packed the files directory. = @@ -86,6 +90,14 @@ service:jmx:rmi:///jndi/rmi://:9999/jmxrmi ]]> = = +
+ JMX Connection + + + + + +
= Press Finish to esteblish the conne= ction with the application. @@ -97,6 +109,15 @@ = In the MBean Editor go to the Operation Details section and hit the sayHello()= button. You will get the "Operation inoked success= fully" message. = + = +
+ Ivoking Method via JMX + + + + + +
= The final step is to make sure the application worked a= s it was expected. Open the terminal where you launched the application in = step 3. Now you see the "hello, world" message on the screen. = --===============6742508326494462033==-- From jbosstools-commits at lists.jboss.org Sat May 15 08:46:53 2010 Content-Type: multipart/mixed; boundary="===============2292778554070844690==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22101 - trunk/esb/docs/esb_ref_guide/en-US/images/esb_project. Date: Sat, 15 May 2010 08:46:53 -0400 Message-ID: <201005151246.o4FCkrxK010724@svn01.web.mwc.hst.phx2.redhat.com> --===============2292778554070844690== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-15 08:46:52 -0400 (Sat, 15 May 2010) New Revision: 22101 Added: trunk/esb/docs/esb_ref_guide/en-US/images/esb_project/05a_esb_project_ex= ample.png Log: https://jira.jboss.org/jira/browse/TOOLSDOC-11 - Updated the doc according = to ESB for SOA-P 5.0 examples added. Added: trunk/esb/docs/esb_ref_guide/en-US/images/esb_project/05a_esb_projec= t_example.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/esb/docs/esb_ref_guide/en-US/images/esb_project/= 05a_esb_project_example.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============2292778554070844690==-- From jbosstools-commits at lists.jboss.org Sat May 15 08:49:34 2010 Content-Type: multipart/mixed; boundary="===============2626315109105651321==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22102 - trunk/documentation/guides/GettingStartedGuide/en-US. Date: Sat, 15 May 2010 08:49:34 -0400 Message-ID: <201005151249.o4FCnYs3010750@svn01.web.mwc.hst.phx2.redhat.com> --===============2626315109105651321== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-15 08:49:33 -0400 (Sat, 15 May 2010) New Revision: 22102 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/project_examples.xml Log: https://jira.jboss.org/browse/TOOLSDOC-11 - Updated the doc according to ne= w functionality added to Project Examples. Modified: trunk/documentation/guides/GettingStartedGuide/en-US/project_exam= ples.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/GettingStartedGuide/en-US/project_examples.x= ml 2010-05-15 12:46:52 UTC (rev 22101) +++ trunk/documentation/guides/GettingStartedGuide/en-US/project_examples.x= ml 2010-05-15 12:49:33 UTC (rev 22102) @@ -119,6 +119,31 @@ = + = + Some project examples have dependencies which could not be a= utomatically configured. + In such cases you will receive the message prompted about dete= cted requirements (see the figure below). + = +
+ Prompt about Project Example Requirements + + + + + +
+ = + You should click Details to see the list of requirements = + and make fixes. + = +
+ Requirements Details Dialog + + + + + +
+ = If you have previously specified user sites (see the User Sites chapter) they also will be displaye= d in the list of project examples in the category that was defined in the = xml file with user sites settings.
User Site --===============2626315109105651321==-- From jbosstools-commits at lists.jboss.org Sat May 15 08:50:13 2010 Content-Type: multipart/mixed; boundary="===============2638226760653023065==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22103 - trunk/documentation/guides/GettingStartedGuide/en-US/images/project_examples. Date: Sat, 15 May 2010 08:50:13 -0400 Message-ID: <201005151250.o4FCoD0V011127@svn01.web.mwc.hst.phx2.redhat.com> --===============2638226760653023065== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-15 08:50:13 -0400 (Sat, 15 May 2010) New Revision: 22103 Added: trunk/documentation/guides/GettingStartedGuide/en-US/images/project_exam= ples/pr_example_2a.png trunk/documentation/guides/GettingStartedGuide/en-US/images/project_exam= ples/pr_example_2b.png Log: https://jira.jboss.org/browse/TOOLSDOC-11 - Updated the doc according to ne= w functionality added to Project Examples. Added new images. Added: trunk/documentation/guides/GettingStartedGuide/en-US/images/project_= examples/pr_example_2a.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/guides/GettingStartedGuide/en-US/i= mages/project_examples/pr_example_2a.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/documentation/guides/GettingStartedGuide/en-US/images/project_= examples/pr_example_2b.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/guides/GettingStartedGuide/en-US/i= mages/project_examples/pr_example_2b.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============2638226760653023065==-- From jbosstools-commits at lists.jboss.org Sat May 15 10:51:12 2010 Content-Type: multipart/mixed; boundary="===============2742883992052708086==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22104 - trunk/bpel/docs/reference/en-US/modules. Date: Sat, 15 May 2010 10:51:12 -0400 Message-ID: <201005151451.o4FEpCgt005086@svn01.web.mwc.hst.phx2.redhat.com> --===============2742883992052708086== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-15 10:51:11 -0400 (Sat, 15 May 2010) New Revision: 22104 Modified: trunk/bpel/docs/reference/en-US/modules/install.xml Log:

https://jira.jboss.org/browse/TOOLSDOC-48 - Updated "Installation J= Boss BPEL Runtime" section and added the info about the prerequisites.=

Modified: trunk/bpel/docs/reference/en-US/modules/install.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/docs/reference/en-US/modules/install.xml 2010-05-15 12:50:13= UTC (rev 22103) +++ trunk/bpel/docs/reference/en-US/modules/install.xml 2010-05-15 14:51:11= UTC (rev 22104) @@ -12,11 +12,35 @@ Please, note, that only JBoss Tools 3.1 or higher version incl= udes JBoss BPEL editor. +
+ Prerequisites + For installation and configuring BPEL engine into a JBossAS = environment + you will need the following: + + JBossAS (version 5.1.0.GA or higher), = + available from + http://www.jboss.org/jbossas. + RiftSaw (version 2.0 or higher), available= from http://www.jboss.org/rift= saw. + Ant, available from here. + + = +
Installation JBoss BPEL Runtime - If you want to deploy a BPEL project to JBoss server, = - you should download JBoss BPEL Runtime by yourself. The JBoss = BPEL Runtime - is named RiftSaw. You can get it from JBoss RiftSaw page . - + + Unpack the JBossAS installation archive into t= he required location.Then in the = + ${RiftSaw}/install folder run the com= mand: + ant deploy -Ddatabase=3Dhsql -Dws.stack=3Dnative= -Dws.version=3D3.2.2.GA = + It will help you to download the web service stack, and th= en upgrade it for JBoss AS. = + + Unpack the RiftSaw distribution into the locat= ion alongside the JBossAS installation. + * Edit the install/deployment.properties file to update the JBossAS location settings. + * From the install folder, run: ant deploy -Ddatabase=3Dhsql + to deploy RiftSaw to JBossAS. + + + = + = + =
\ No newline at end of file --===============2742883992052708086==-- From jbosstools-commits at lists.jboss.org Sun May 16 17:37:40 2010 Content-Type: multipart/mixed; boundary="===============6475160662547310355==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22105 - in trunk/maven/plugins/org.jboss.tools.maven.core: poms and 1 other directory. Date: Sun, 16 May 2010 17:37:40 -0400 Message-ID: <201005162137.o4GLbear015244@svn01.web.mwc.hst.phx2.redhat.com> --===============6475160662547310355== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-16 17:37:40 -0400 (Sun, 16 May 2010) New Revision: 22105 Added: trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-templa= te200final.xml trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-templa= te200finaldep.xml Modified: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml Log: https://jira.jboss.org/browse/JBIDE-6293 Add Maven Portletbridge 2.0.0 FINA= L library provider Modified: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties 2010-0= 5-15 14:51:11 UTC (rev 22104) +++ trunk/maven/plugins/org.jboss.tools.maven.core/plugin.properties 2010-0= 5-16 21:37:40 UTC (rev 22105) @@ -10,4 +10,6 @@ Maven_Portlet_1_0_Libraries=3DMaven Portlet 1.0 Libraries Maven_Portlet_2_0_Libraries=3DMaven Portlet 2.0 Libraries Maven_Portletbridge_2_0_0_ALPHA_Libraries=3DMaven Portletbridge 2.0.0 ALPH= A Libraries -Maven_Portletbridge_2_0_0_ALPHA_Libraries_with_Dependencies=3DMaven Portle= tbridge 2.0.0 ALPHA Libraries with Dependencies \ No newline at end of file +Maven_Portletbridge_2_0_0_ALPHA_Libraries_with_Dependencies=3DMaven Portle= tbridge 2.0.0 ALPHA Libraries with Dependencies +Maven_Portletbridge_2_0_0_FINAL_Libraries=3DMaven Portletbridge 2.0.0 FINA= L Libraries +Maven_Portletbridge_2_0_0_FINAL_Libraries_with_Dependencies=3DMaven Portle= tbridge 2.0.0 FINAL Libraries with Dependencies \ No newline at end of file Modified: trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2010-05-15 14= :51:11 UTC (rev 22104) +++ trunk/maven/plugins/org.jboss.tools.maven.core/plugin.xml 2010-05-16 21= :37:40 UTC (rev 22105) @@ -185,4 +185,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-te= mplate200final.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-templ= ate200final.xml (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-templ= ate200final.xml 2010-05-16 21:37:40 UTC (rev 22105) @@ -0,0 +1,52 @@ + + + 4.0.0 + template + template + pom + 0.0.1-SNAPSHOT + = + + + org.jboss.portletbridge + portletbridge-api + 2.0.0.FINAL + + + javax.faces + jsf-api + + + javax.faces + jsf-impl + + + commons-collections + commons-collections + + + + + org.jboss.portletbridge + portletbridge-impl + 2.0.0.FINAL + + + javax.faces + jsf-api + + + javax.faces + jsf-impl + + = + + commons-collections + commons-collections + + + + = + + \ No newline at end of file Added: trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-te= mplate200finaldep.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-templ= ate200finaldep.xml (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/portletbridge-templ= ate200finaldep.xml 2010-05-16 21:37:40 UTC (rev 22105) @@ -0,0 +1,117 @@ + + + 4.0.0 + template + template + pom + 0.0.1-SNAPSHOT + = + + = + + javax.portlet + portlet-api + 2.0 + provided + + = + = + + org.jboss.portletbridge + portletbridge-api + 2.0.0.FINAL + + + javax.faces + jsf-api + + + javax.faces + jsf-impl + + + commons-collections + commons-collections + + + + + org.jboss.portletbridge + portletbridge-impl + 2.0.0.FINAL + + + javax.faces + jsf-api + + + javax.faces + jsf-impl + + = + + commons-collections + commons-collections + + + + + org.richfaces.ui + richfaces-ui + 3.3.3.Final + + + org.richfaces.framework + richfaces-api + 3.3.3.Final + + + commons-logging + commons-logging + + + commons-beanutils + commons-beanutils + + + commons-collections + commons-collections + + + + + org.richfaces.framework + richfaces-impl + 3.3.3.Final + + + commons-logging + commons-logging + + + junit + junit + + + javax.faces + jsf-api + + + + javax.servlet + servlet-api + + + javax.faces + jsf-impl + + + + + com.sun.facelets + jsf-facelets + 1.1.15.B1 + + + \ No newline at end of file --===============6475160662547310355==-- From jbosstools-commits at lists.jboss.org Sun May 16 17:41:04 2010 Content-Type: multipart/mixed; boundary="===============0267083465908854180==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22106 - in branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core: poms and 1 other directory. Date: Sun, 16 May 2010 17:41:04 -0400 Message-ID: <201005162141.o4GLf46F015700@svn01.web.mwc.hst.phx2.redhat.com> --===============0267083465908854180== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-16 17:41:03 -0400 (Sun, 16 May 2010) New Revision: 22106 Added: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/= portletbridge-template200final.xml branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/= portletbridge-template200finaldep.xml Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plugi= n.properties branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plugi= n.xml Log: https://jira.jboss.org/browse/JBIDE-6293 Add Maven Portletbridge 2.0.0 FINA= L library provider Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.cor= e/plugin.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plug= in.properties 2010-05-16 21:37:40 UTC (rev 22105) +++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plug= in.properties 2010-05-16 21:41:03 UTC (rev 22106) @@ -10,4 +10,6 @@ Maven_Portlet_1_0_Libraries=3DMaven Portlet 1.0 Libraries Maven_Portlet_2_0_Libraries=3DMaven Portlet 2.0 Libraries Maven_Portletbridge_2_0_0_ALPHA_Libraries=3DMaven Portletbridge 2.0.0 ALPH= A Libraries -Maven_Portletbridge_2_0_0_ALPHA_Libraries_with_Dependencies=3DMaven Portle= tbridge 2.0.0 ALPHA Libraries with Dependencies \ No newline at end of file +Maven_Portletbridge_2_0_0_ALPHA_Libraries_with_Dependencies=3DMaven Portle= tbridge 2.0.0 ALPHA Libraries with Dependencies +Maven_Portletbridge_2_0_0_FINAL_Libraries=3DMaven Portletbridge 2.0.0 FINA= L Libraries +Maven_Portletbridge_2_0_0_FINAL_Libraries_with_Dependencies=3DMaven Portle= tbridge 2.0.0 FINAL Libraries with Dependencies \ No newline at end of file Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.cor= e/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plug= in.xml 2010-05-16 21:37:40 UTC (rev 22105) +++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/plug= in.xml 2010-05-16 21:41:03 UTC (rev 22106) @@ -185,4 +185,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/p= oms/portletbridge-template200final.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms= /portletbridge-template200final.xml (rev 0) +++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms= /portletbridge-template200final.xml 2010-05-16 21:41:03 UTC (rev 22106) @@ -0,0 +1,52 @@ + + + 4.0.0 + template + template + pom + 0.0.1-SNAPSHOT + = + + + org.jboss.portletbridge + portletbridge-api + 2.0.0.FINAL + + + javax.faces + jsf-api + + + javax.faces + jsf-impl + + + commons-collections + commons-collections + + + + + org.jboss.portletbridge + portletbridge-impl + 2.0.0.FINAL + + + javax.faces + jsf-api + + + javax.faces + jsf-impl + + = + + commons-collections + commons-collections + + + + = + + \ No newline at end of file Added: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/p= oms/portletbridge-template200finaldep.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms= /portletbridge-template200finaldep.xml (rev 0) +++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms= /portletbridge-template200finaldep.xml 2010-05-16 21:41:03 UTC (rev 22106) @@ -0,0 +1,117 @@ + + + 4.0.0 + template + template + pom + 0.0.1-SNAPSHOT + = + + = + + javax.portlet + portlet-api + 2.0 + provided + + = + = + + org.jboss.portletbridge + portletbridge-api + 2.0.0.FINAL + + + javax.faces + jsf-api + + + javax.faces + jsf-impl + + + commons-collections + commons-collections + + + + + org.jboss.portletbridge + portletbridge-impl + 2.0.0.FINAL + + + javax.faces + jsf-api + + + javax.faces + jsf-impl + + = + + commons-collections + commons-collections + + + + + org.richfaces.ui + richfaces-ui + 3.3.3.Final + + + org.richfaces.framework + richfaces-api + 3.3.3.Final + + + commons-logging + commons-logging + + + commons-beanutils + commons-beanutils + + + commons-collections + commons-collections + + + + + org.richfaces.framework + richfaces-impl + 3.3.3.Final + + + commons-logging + commons-logging + + + junit + junit + + + javax.faces + jsf-api + + + + javax.servlet + servlet-api + + + javax.faces + jsf-impl + + + + + com.sun.facelets + jsf-facelets + 1.1.15.B1 + + + \ No newline at end of file --===============0267083465908854180==-- From jbosstools-commits at lists.jboss.org Sun May 16 18:09:23 2010 Content-Type: multipart/mixed; boundary="===============1592145743695994693==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22107 - in trunk/maven/plugins: org.jboss.tools.maven.seam/poms and 1 other directory. Date: Sun, 16 May 2010 18:09:22 -0400 Message-ID: <201005162209.o4GM9MHE024720@svn01.web.mwc.hst.phx2.redhat.com> --===============1592145743695994693== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-16 18:09:22 -0400 (Sun, 16 May 2010) New Revision: 22107 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-templat= e.xml trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml Log: https://jira.jboss.org/browse/JBIDE-6294 Add JBoss Public Maven Repository = Group when creating JBoss Maven Integration facet Modified: trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-= template.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-templa= te.xml 2010-05-16 21:41:03 UTC (rev 22106) +++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-templa= te.xml 2010-05-16 22:09:22 UTC (rev 22107) @@ -8,6 +8,20 @@ 0.0.1-SNAPSHOT = + + jboss-public-repository-group + JBoss Public Maven Repository Group + https://repository.jboss.org/nexus/content/groups/public/ + default + + true + never + + + true + never + + repository.jboss.org JBoss Repository Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2010= -05-16 21:41:03 UTC (rev 22106) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2010= -05-16 22:09:22 UTC (rev 22107) @@ -37,28 +37,24 @@ 2.0.9 = - - - jboss - JBoss Repository - http://repository.jboss.org/maven2 - - false - - - - jboss-snapshots - JBoss Snapshot Repository - http://snapshots.jboss.org/maven2 - - false - - + = + + + + jboss-public-repository-group + JBoss Public Maven Repository Group + https://repository.jboss.org/nexus/content/groups/public/ + default + true - - = - - + never + + + true + never + + + @@ -460,6 +456,42 @@ = + + + jboss-public-repository-group + JBoss Public Maven Repository Group + https://repository.jboss.org/nexus/content/groups/public/ + default + + true + never + + + true + never + + + + jboss + JBoss Repository + http://repository.jboss.org/maven2 + + false + + + + jboss-snapshots + JBoss Snapshot Repository + http://snapshots.jboss.org/maven2 + + false + + + true + + = + + = --===============1592145743695994693==-- From jbosstools-commits at lists.jboss.org Sun May 16 18:12:37 2010 Content-Type: multipart/mixed; boundary="===============4024622501698202790==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22108 - in branches/jbosstools-3.1.x/maven/plugins: org.jboss.tools.maven.seam/poms and 1 other directory. Date: Sun, 16 May 2010 18:12:37 -0400 Message-ID: <201005162212.o4GMCb5s025176@svn01.web.mwc.hst.phx2.redhat.com> --===============4024622501698202790== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-16 18:12:36 -0400 (Sun, 16 May 2010) New Revision: 22108 Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/= hibernate332-template.xml branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.seam/poms/= parent-pom.xml Log: https://jira.jboss.org/browse/JBIDE-6294 Add JBoss Public Maven Repository = Group when creating JBoss Maven Integration facet Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.cor= e/poms/hibernate332-template.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms= /hibernate332-template.xml 2010-05-16 22:09:22 UTC (rev 22107) +++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms= /hibernate332-template.xml 2010-05-16 22:12:36 UTC (rev 22108) @@ -8,6 +8,20 @@ 0.0.1-SNAPSHOT = + + jboss-public-repository-group + JBoss Public Maven Repository Group + https://repository.jboss.org/nexus/content/groups/public/ + default + + true + never + + + true + never + + repository.jboss.org JBoss Repository Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.sea= m/poms/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.seam/poms= /parent-pom.xml 2010-05-16 22:09:22 UTC (rev 22107) +++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.seam/poms= /parent-pom.xml 2010-05-16 22:12:36 UTC (rev 22108) @@ -37,28 +37,24 @@ 2.0.9 = - - - jboss - JBoss Repository - http://repository.jboss.org/maven2 - - false - - - - jboss-snapshots - JBoss Snapshot Repository - http://snapshots.jboss.org/maven2 - - false - - + = + + + + jboss-public-repository-group + JBoss Public Maven Repository Group + https://repository.jboss.org/nexus/content/groups/public/ + default + true - - = - - + never + + + true + never + + + @@ -460,6 +456,42 @@ = + + + jboss-public-repository-group + JBoss Public Maven Repository Group + https://repository.jboss.org/nexus/content/groups/public/ + default + + true + never + + + true + never + + + + jboss + JBoss Repository + http://repository.jboss.org/maven2 + + false + + + + jboss-snapshots + JBoss Snapshot Repository + http://snapshots.jboss.org/maven2 + + false + + + true + + = + + = --===============4024622501698202790==-- From jbosstools-commits at lists.jboss.org Sun May 16 21:14:13 2010 Content-Type: multipart/mixed; boundary="===============6287182445699707578==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22109 - trunk/documentation/guides/JBDS_Release_Notes/en-US. Date: Sun, 16 May 2010 21:14:13 -0400 Message-ID: <201005170114.o4H1EDUZ031664@svn01.web.mwc.hst.phx2.redhat.com> --===============6287182445699707578== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: irooskov(a)redhat.com Date: 2010-05-16 21:14:13 -0400 (Sun, 16 May 2010) New Revision: 22109 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml Log: updated release notes Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-16 22:12:36 UTC (rev 22108) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-17 01:14:13 UTC (rev 22109) @@ -162,6 +162,11 @@ + JBDS-1220= : Within the JBoss Developer Studio, the browse button that allowed= a user to select the location of the JBoss Application Server would not de= fault to the location where the JBoss Enterprise Application Platform was i= nstalled. The consequence of this was that a user would have to search for = the installed location of the JBoss Enterprise Application Platform. Though= installation of the JBoss Enterprise Application Platform is optional, if = it is installed it can be assumed that this will be the Application Server = a user will wish to use. In order to improve the user experience, when the = JBoss Enterprise Application Platform is installed, the server location bro= wse button will default to that directory. + + + + JBDS-1215= : The installer was unable to locate the Seam runtimes within the J= Boss Enterprise Application Platform 4.3. This occurred because the Seam ru= ntime locations bundled within the JBoss Enterprise Application Platform 4.= 3 had recently changed from jboss-eap-4.3/seam and jboss-eap-4.3/seamfp to being jboss-eap-4.3/sea= m1 and jboss-eap-4.3/seam2. This version of= the JBoss Developer Studio includes an updated installer that contains the= new Seam runtime locations. The installer is now able to find the Seam run= times for the latest versions of the JBoss Enterprise Application Platform = 4.3. @@ -195,6 +200,11 @@ JBDS-1088= : When installing the JBoss Developer Studio, if a previous install= ation was detected a dialog box would ask if you wished to overwrite the ex= isting directory. If a user continued with installation they would then hav= e a mixture of the old and new product versions. To better assist users a n= ew warning is displayed in this situation, which indicates that you cannot = upgrade by installing a new version over an old version. This new dialog bo= x ensures that a user is informed of what will happen. + + + JBDS-1047= : When installing the JBoss Developer Studio a user would not be wa= rned if they were installing it as the root user on a Linux distribution. T= he consequence of this was that if a user uninstalled the software certain = files would be left behind (such as menu items). In order to ensure a user = is aware they are installing the JBoss Developer Studio as root, a warning = is displayed informing them. The JBoss Developer Studio does not stop you f= rom installing the software as the root user, rather it ensures this is wha= t the user has intended to do. + + --===============6287182445699707578==-- From jbosstools-commits at lists.jboss.org Mon May 17 00:15:29 2010 Content-Type: multipart/mixed; boundary="===============0478381265130963790==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22110 - in trunk/bpel/plugins/org.eclipse.bpel.ui: src/org/eclipse/bpel/ui/wizards and 2 other directories. Date: Mon, 17 May 2010 00:15:29 -0400 Message-ID: <201005170415.o4H4FTYf006276@svn01.web.mwc.hst.phx2.redhat.com> --===============0478381265130963790== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Grid.Qian Date: 2010-05-17 00:15:28 -0400 (Mon, 17 May 2010) New Revision: 22110 Added: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/W= SDLCustomPage.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/W= SDLServiceDetail.java Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Templates= .java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/M= essages.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/N= ewFileWizard.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/N= ewFileWizardPage1.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/N= ewFileWizardPage2.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/m= essages.properties trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.wsdl trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.bpel trunk/bpel/plugins/org.eclipse.bpel.ui/templates/sync/sample.wsdl Log: JBIDE-6154: to trunk Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Te= mplates.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Template= s.java 2010-05-17 01:14:13 UTC (rev 22109) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/Template= s.java 2010-05-17 04:15:28 UTC (rev 22110) @@ -10,7 +10,6 @@ * Oracle Corporation *************************************************************************= ******/ = - package org.eclipse.bpel.ui; = import java.io.IOException; @@ -28,332 +27,330 @@ import java.util.TreeMap; import java.util.TreeSet; = +import org.eclipse.bpel.ui.wizards.WSDLServiceDetail; import org.osgi.framework.Bundle; = /** - * You can think of BPEL templates as a 1 dimensional list of stencils tha= t are used - * to create an initial BPEL process. + * You can think of BPEL templates as a 1 dimensional list of stencils tha= t are + * used to create an initial BPEL process. *

- * Each template for a process may contain just 1 resource - just the temp= late for - * the BPEL process itself. But it may also contain other resources which = are useful - * in creating that particular process from that particular template. = - * Simply put, a template may have 1-N template resources that need to be = created - * as a result of creating what appears to be a single process file. - * = + * Each template for a process may contain just 1 resource - just the temp= late + * for the BPEL process itself. But it may also contain other resources wh= ich + * are useful in creating that particular process from that particular tem= plate. + * Simply put, a template may have 1-N template resources that need to be + * created as a result of creating what appears to be a single process fil= e. + * = * @author Michal Chmielewski (michal.chmielewski(a)oracle.com) */ = public class Templates { = /** this file defines the properties for a particular template */ - static final String TEMPLATE_PROPERTIES =3D "template.properties"; //$NO= N-NLS-1$ - = - /** location within the bundle where we look for templates */ = - static final String TEMPLATE_LOCATION =3D "/templates/"; //$NON-NLS-1$ - = + static final String TEMPLATE_PROPERTIES =3D "template.properties"; //$NON= -NLS-1$ + + /** location within the bundle where we look for templates */ + static final String TEMPLATE_LOCATION =3D "/templates/"; //$NON-NLS-1$ + /** default template file encoding, for a given set of template resources= */ - static final String DEFAULT_ENCODING =3D "UTF-8"; //$NON-NLS-1$ - = + static final String DEFAULT_ENCODING =3D "UTF-8"; //$NON-NLS-1$ + /** the main bpel file has this extension */ - @Deprecated // use content type instead of bpel file extensions - static final String BPEL_FILE_EXTENSION =3D ".bpel"; //$NON-NLS-1$ - = + @Deprecated + // use content type instead of bpel file extensions + static final String BPEL_FILE_EXTENSION =3D ".bpel"; //$NON-NLS-1$ + /** Entries which are directories of the bundle */ static final String BUNDLE_DIRECTORY =3D "/"; //$NON-NLS-1$ - = + /** Key or property under which the name of the template is present */ - static final String PROPERTY_NAME =3D "name"; //$NON-NLS-1$ - = + static final String PROPERTY_NAME =3D "name"; //$NON-NLS-1$ + /** The key name of the template */ static final String PROPERTY_KEY =3D "key"; //$NON-NLS-1$ - = - /** Key or property under which the encoding information for the template= resources is present */ + + /** + * Key or property under which the encoding information for the template + * resources is present + */ static final String PROPERTY_ENCODING =3D "encoding"; //$NON-NLS-1$ = /** Key or property under which the description of the template is presen= t */ static final String PROPERTY_DESCRIPTION =3D "description"; //$NON-NLS-1$ - = + /** avoid empty string */ static final String EMPTY =3D ""; //$NON-NLS-1$ - = + static final String[] EMPTY_NAMES =3D {}; - = + /** Templates contribute namespaces to the new file wizard */ Set mNamespaceNames =3D new TreeSet(); - = - /** Templates indexed by name, sorted by name, according to the natural o= rdering */ - Map mTemplateByName =3D new TreeMap(); = + /** + * Templates indexed by name, sorted by name, according to the natural + * ordering + */ + Map mTemplateByName =3D new TreeMap(); + /** Templates indexed by id, sorted by name */ - Map mTemplateByKey =3D new HashMap(); + Map mTemplateByKey =3D new HashMap(); = - = /** - * Initialize the template information from the bundle passed. - * This is typically the bundle of the plugin. - * - * @author Michal Chmielewski (michal.chmielewski(a)oracle.com) = - * @param bundle the bundle where the template information ought to be lo= oked for + * Initialize the template information from the bundle passed. This is + * typically the bundle of the plugin. + * = + * @author Michal Chmielewski (michal.chmielewski(a)oracle.com) + * @param bundle + * the bundle where the template information ought to be looked + * for */ - = + @SuppressWarnings("nls") - public void initializeFrom ( Bundle bundle ) - { + public void initializeFrom(Bundle bundle) { initializeFrom(bundle, TEMPLATE_LOCATION); } - = + /** * @param templateLocation */ - = - public void initializeFrom ( String templateLocation ) { + + public void initializeFrom(String templateLocation) { initializeFrom(BPELUIPlugin.INSTANCE.getBundle(), templateLocation); } - = + /** * @param bundle * @param templateLocation */ - = - @SuppressWarnings({ "nls", "boxing" }) - public void initializeFrom (Bundle bundle, String templateLocation ) { - = - Enumeration list =3D bundle.getEntryPaths( templateLocation ); + + @SuppressWarnings( { "nls", "boxing", "unchecked" }) + public void initializeFrom(Bundle bundle, String templateLocation) { + + Enumeration list =3D bundle.getEntryPaths(templateLocation); if (list =3D=3D null) { - return ; + return; } // got some elements, look for "template.properties" - = + int count =3D 0; - = + while (list.hasMoreElements()) { String nextRoot =3D list.nextElement(); - if ( nextRoot.endsWith(BUNDLE_DIRECTORY) =3D=3D false ) { + if (nextRoot.endsWith(BUNDLE_DIRECTORY) =3D=3D false) { continue; } - = + String nextEntry =3D nextRoot + TEMPLATE_PROPERTIES; // found another template - = + URL nextURL =3D bundle.getEntry(nextEntry); if (nextURL =3D=3D null) { // no such thing continue; } - = + // looks like we have properties count +=3D 1; - = - Properties props =3D new Properties (); + + Properties props =3D new Properties(); InputStream is =3D null; - = + try { is =3D nextURL.openStream(); - props.load( is ); + props.load(is); } catch (IOException e) { BPELUIPlugin.log(e); - = - = + // skip to the next entry continue; - = + } finally { - try { is.close() ; } catch (Throwable t) {} = + try { + is.close(); + } catch (Throwable t) { + } } - = - = + String name =3D props.getProperty(PROPERTY_NAME); - = + // No name, no game. if (name =3D=3D null) { - continue ; + continue; } - = - = - String enc =3D props.getProperty(PROPERTY_ENCODING,DEFAULT_ENCODING); - String desc =3D props.getProperty(PROPERTY_DESCRIPTION,EMPTY); - = - = + + String enc =3D props.getProperty(PROPERTY_ENCODING, DEFAULT_ENCODING); + String desc =3D props.getProperty(PROPERTY_DESCRIPTION, EMPTY); + // add any namespaces we are supplying ... - mNamespaceNames.addAll( findProperties (props,"namespace.{0}") ); - = + mNamespaceNames.addAll(findProperties(props, "namespace.{0}")); + Template template =3D new Template(); template.mName =3D name; template.mDescription =3D desc; template.mProperties =3D (Map) props; - = - mTemplateByName.put ( name, template ); - String id =3D props.getProperty(PROPERTY_KEY); + + mTemplateByName.put(name, template); + String id =3D props.getProperty(PROPERTY_KEY); if (id !=3D null) { - mTemplateByKey.put ( id, template ); + mTemplateByKey.put(id, template); } - = - = + int hole =3D 3; - for(int i=3D0; hole >=3D 0; i++) { = - String key =3D MessageFormat.format("resource.{0}",i); = + for (int i =3D 0; hole >=3D 0; i++) { + String key =3D MessageFormat.format("resource.{0}", i); String resourceName =3D props.getProperty(key); if (resourceName =3D=3D null) { hole--; continue; } hole =3D 3; - = + key =3D MessageFormat.format("resource.{0}.name", i); String nameTemplate =3D props.getProperty(key); - = + String entryLoc =3D nextRoot + resourceName; - = - TemplateResource resource =3D new TemplateResource() ; + + TemplateResource resource =3D new TemplateResource(); resource.mName =3D resourceName; - resource.mContent =3D slurpContent ( bundle.getEntry(entryLoc), enc ); - resource.mNameTemplate =3D nameTemplate ; = - = - // add the resource which makes up this "template" = - template.add ( resource ); - = + resource.mContent =3D slurpContent(bundle.getEntry(entryLoc), enc); + resource.mNameTemplate =3D nameTemplate; + + // add the resource which makes up this "template" + template.add(resource); + } - = + } - = + } - = - = + /** * Slurp the resource into memory and return as a String. If an exception * occurs, it is logged, and the return value is empty string. * = - * @param loc the location from which we should slurp ... - * @param enc the encoding to use - * @return the text = + * @param loc + * the location from which we should slurp ... + * @param enc + * the encoding to use + * @return the text */ - = - String slurpContent ( URL loc, String enc) { - = + + String slurpContent(URL loc, String enc) { + if (loc =3D=3D null) { return null; } - = - StringBuilder sb =3D new StringBuilder ( 2 * 1048 ); - char[] buf =3D new char[ 256 ]; = + + StringBuilder sb =3D new StringBuilder(2 * 1048); + char[] buf =3D new char[256]; InputStreamReader isr =3D null; - = + try { - isr =3D new InputStreamReader ( loc.openStream(), enc); - = + isr =3D new InputStreamReader(loc.openStream(), enc); + do { int cnt =3D isr.read(buf); if (cnt < 0) { break; } - sb.append( buf, 0, cnt ); + sb.append(buf, 0, cnt); } while (true); - = + } catch (Exception ex) { BPELUIPlugin.log(ex); } finally { - try {isr.close(); } catch (Throwable t) {} + try { + isr.close(); + } catch (Throwable t) { + } } - = - = - return sb.toString(); = + + return sb.toString(); } - = - = - = - = - List findProperties ( Properties props, String pattern ) { - = + + List findProperties(Properties props, String pattern) { + List list =3D new ArrayList(); int hole =3D 3; - = - for(int i=3D0; hole >=3D 0; i++) { - = - String key =3D MessageFormat.format(pattern, new Object[] { new Integer= (i) } ); - String val =3D props.getProperty(key,null); + + for (int i =3D 0; hole >=3D 0; i++) { + + String key =3D MessageFormat.format(pattern, + new Object[] { new Integer(i) }); + String val =3D props.getProperty(key, null); if (val !=3D null) { - list.add ( val ); + list.add(val); hole =3D 3; } else { hole--; } } - = + return list; } - = + /** * @param key * @return the template whose key is key */ - = - public Template getTemplateByKey ( String key ) { + + public Template getTemplateByKey(String key) { return mTemplateByKey.get(key); } - = - = - /** = - * Return the template definition (which includes other resources that - * may be present) to the caller. = + + /** + * Return the template definition (which includes other resources that may + * be present) to the caller. * = - * @param name name of the template + * @param name + * name of the template * @return the template definition, including template resources */ - = - public Template getTemplateByName ( String name ) - { + + public Template getTemplateByName(String name) { return mTemplateByName.get(name); } - = - = - /** = - * - * @return Return the namespaces contributed by the templates. = + + /** + * = + * @return Return the namespaces contributed by the templates. */ - = - public String[] getNamespaceNames () - { = - return mNamespaceNames.toArray( EMPTY_NAMES ); = + + public String[] getNamespaceNames() { + return mNamespaceNames.toArray(EMPTY_NAMES); } - = - = - = + /** * Return the template names that have been discovered. * = * @return Return the template names. */ - = - public String [] getTemplateNames () - { = - return mTemplateByName.keySet().toArray( EMPTY_NAMES ); = + + public String[] getTemplateNames() { + return mTemplateByName.keySet().toArray(EMPTY_NAMES); } - = - = - = + /** - * A given "BPEL Process" Template has a name, description, and - * a list of resources (file templates) that will be used to create the i= nitial + * A given "BPEL Process" Template has a name, description, and a list of + * resources (file templates) that will be used to create the initial * process source file. * = - * @author Michal Chmielewski (michal.chmielewski(a)oracle.com) = - * + * @author Michal Chmielewski (michal.chmielewski(a)oracle.com) + * = */ - = + public class Template { - = + /** Name of the process template */ String mName; - = + /** Description of this process template */ - String mDescription ; - = - Map mProperties ; - = - /** list of resources that this template has (1-N) */ = + String mDescription; + + Map mProperties; + + /** list of resources that this template has (1-N) */ List mResources =3D new ArrayList(); = - /** * @return the name */ @@ -361,12 +358,11 @@ return mName; } = - - void add ( TemplateResource resource ) { + void add(TemplateResource resource) { mResources.add(resource); resource.mTemplate =3D this; } - = + /** * @return the template resources */ @@ -379,20 +375,20 @@ */ public String getDescription() { return mDescription; - } = - = + } + /** * Return the property under the key or null if not found. + * = * @param key * @return the property under the key, or null. */ - = - public String getProperty ( String key ) { + + public String getProperty(String key) { return mProperties.get(key); } = - = - TemplateResource lookupResource ( String name ) { + TemplateResource lookupResource(String name) { String name2 =3D mProperties.get(name); for (TemplateResource resource : mResources) { if (name.equals(resource.mName)) { @@ -404,104 +400,125 @@ } return null; } - = + } - = + /** - * A template resource is the actual file which will be used to create = - * the source file or other auxiliary files for the BPEL process source. + * A template resource is the actual file which will be used to create the + * source file or other auxiliary files for the BPEL process source. * = * @author Michal Chmielewski, (michal.chmielewski(a)oracle.com) * = */ - = + public class TemplateResource { - = + /** The template I belong to */ Template mTemplate =3D null; - = + /** Name of the resource (from the bundle) */ - String mName ; - = + String mName; + /** The content of the resource (slurped from the bundle) */ String mContent; = - /** The name template, that is, the file name template if depended on pr= ocess name */ + /** + * The name template, that is, the file name template if depended on + * process name + */ String mNameTemplate; - = + /** * @return the content */ public String getContent() { return mContent; } - = + /** * @return the name */ public String getName() { return mName; } - = - = + /** * Process the content of the template and replace anything within * ${...} by the corresponding key prent in the map passed. * = - * @param args the keys that will be replaced in the content = + * @param args + * the keys that will be replaced in the content * @return the replaced content */ - = - public String process ( Map args ) { - = - return process ( mContent, args ); + + public String process(Map args) { + + return process(mContent, args); } - = - = + /** * Process the content of the template and replace anything within * ${...} by the corresponding key present in the map passed. * = - * @param args the keys that will be replaced in the content = + * @param args + * the keys that will be replaced in the content * @return the replaced content */ - = + @SuppressWarnings("nls") - String process (String src, Map args ) - { + String process(String src, Map args) { // empty content, empty result if (src =3D=3D null) { return ""; } - StringBuilder sb =3D new StringBuilder ( src.length() ); - int cursor =3D 0; = + + // add the service and binding content + int start =3D src.indexOf(""); + if (start > 0) { + StringBuffer ss =3D new StringBuffer(src.substring(0, start)); + if ("Asynchronous BPEL Process".equals(args.get("type"))) { + if ("soap".equals(args.get("protocol"))) { + ss.append(WSDLServiceDetail.Async_SOAPDetail); + } else { + ss.append(WSDLServiceDetail.Async_HTTPDetail); + } + } else if ("Synchronous BPEL Process".equals(args.get("type"))) { + if ("soap".equals(args.get("protocol"))) { + ss.append(WSDLServiceDetail.Sync_SOAPDetail); + } else { + ss.append(WSDLServiceDetail.Sync_HTTPDetail); + } + } + ss.append(""); + src =3D ss.toString(); + } + StringBuilder sb =3D new StringBuilder(src.length()); + int cursor =3D 0; do { - int openReplace =3D src.indexOf("${", cursor); + int openReplace =3D src.indexOf("${", cursor); if (openReplace < 0) { break; } - sb.append( src.substring(cursor,openReplace)); + sb.append(src.substring(cursor, openReplace)); cursor =3D openReplace + 2; - int closeReplace =3D src.indexOf("}",cursor); - if (closeReplace < 0) { = + int closeReplace =3D src.indexOf("}", cursor); + if (closeReplace < 0) { return sb.toString(); } - = - String expr =3D src.substring(cursor, closeReplace).trim() ; - sb.append( lookup(expr,args) ); - = + + String expr =3D src.substring(cursor, closeReplace).trim(); + sb.append(lookup(expr, args)); + cursor =3D closeReplace + 1; } while (true); - = + // the last segment - sb.append( src.substring(cursor) ); = + sb.append(src.substring(cursor)); return sb.toString(); } = - = @SuppressWarnings("nls") - = - Object lookup ( String key, Map args) { + Object lookup(String key, Map args) { Object value =3D null; TemplateResource r =3D null; if (key.startsWith(":include:")) { @@ -512,46 +529,45 @@ } } else if (key.startsWith(":parse:")) { key =3D key.substring(7); - r =3D mTemplate.lookupResource (key); + r =3D mTemplate.lookupResource(key); /** Avoid recursion at this point */ if (r !=3D null && r !=3D this) { - value =3D r.process( args ); + value =3D r.process(args); } - } else { = + } else { value =3D args.get(key); if (value =3D=3D null) { value =3D mTemplate.mProperties.get(key); - } = + } } return value; } - = + /** - * Return the name of the resource = + * Return the name of the resource * = - * @param args map of arguments that are used in replacing + * @param args + * map of arguments that are used in replacing * @return the name of the resource, after token replacement. */ - = - public String getName (Map args) { - = + + public String getName(Map args) { + if (mNameTemplate =3D=3D null) { return mName; - } = - return process (mNameTemplate, args); = + } + return process(mNameTemplate, args); } - = - = + /** - * Ask if this TemplateResource is specifically a BPEL source file. = + * Ask if this TemplateResource is specifically a BPEL source file. * = - * @return Answer true if the extension is .bpel = + * @return Answer true if the extension is .bpel */ - = - public boolean isProcess() = - { - return mName.endsWith( BPEL_FILE_EXTENSION ); - } = + + public boolean isProcess() { + return mName.endsWith(BPEL_FILE_EXTENSION); + } } - = + } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wi= zards/Messages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= Messages.java 2010-05-17 01:14:13 UTC (rev 22109) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= Messages.java 2010-05-17 04:15:28 UTC (rev 22110) @@ -53,4 +53,19 @@ public static String NewFileWizardPage2_0; public static String NewFileWizardPage2_1; public static String NewFileWizardPage2_2; + public static String NewFileWizardPage2_3; + public static String NewFileWizardPage1_Name; + public static String NewFileWizardPage2_Name; + public static String NewFileWizard_WSDLCustomPage_Name; + public static String NewFileWizard_WSDLCustomPage_Title; + public static String NewFileWizard_WSDLCustomPage_Description; + public static String NewFileWizard_WSDLCustomPage_ServiceLable; + public static String NewFileWizard_WSDLCustomPage_PortLabel; + public static String NewFileWizard_WSDLCustomPage_AddressLabel; + public static String NewFileWizard_WSDLCustomPage_WSDLGroup; + public static String NewFileWizard_WSDLCustomPage_BindingLabel; + = + public static String Error_NewFileWizard_WSDLCustomPage_Name_Empty; + public static String Error_NewFileWizard_WSDLCustomPage_Name_Space; + public static String Error_NewFileWizard_WSDLCustomPage_Protocol; } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wi= zards/NewFileWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= NewFileWizard.java 2010-05-17 01:14:13 UTC (rev 22109) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= NewFileWizard.java 2010-05-17 04:15:28 UTC (rev 22110) @@ -10,10 +10,10 @@ * Oracle Corporation *************************************************************************= ******/ = - package org.eclipse.bpel.ui.wizards; = import java.lang.reflect.InvocationTargetException; +import java.util.Map; = import org.eclipse.bpel.ui.BPELUIPlugin; import org.eclipse.core.resources.IContainer; @@ -31,41 +31,43 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard; = - /** - * Wizard for the new process template. = - * = - * @author Michal Chmielewski (michal.chmielewski(a)oracle.com) = - * + * Wizard for the new process template. + * = + * @author Michal Chmielewski (michal.chmielewski(a)oracle.com) + * = */ = public class NewFileWizard extends Wizard implements INewWizard { = /** The id of our BPEL editor */ static protected final String BPEL_EDITOR_ID =3D "org.eclipse.bpel.ui.bpe= leditor"; //$NON-NLS-1$ - = + /** The container where the file(s) will be created */ - private IContainer mContainer ; - = + private IContainer mContainer; + private IWorkbench fWorkbench; - = + /** The 1st page of the wizard */ private NewFileWizardPage1 fMainPage; = /** The 2nd page of the wizard */ private NewFileWizardPage2 fContainerPage; = - = + /** The 3nd page of the wizard */ + private WSDLCustomPage wsdlPage; + /** * Create a brand new shining Create Project Wizard for BPEL. */ = public NewFileWizard() { - = + setNeedsProgressMonitor(true); - setDialogSettings(BPELUIPlugin.INSTANCE.getDialogSettingsFor(this)); = + setDialogSettings(BPELUIPlugin.INSTANCE.getDialogSettingsFor(this)); setHelpAvailable(false); - = + this.setWindowTitle(Messages.NewFileWizard_1); + } = /** @@ -83,15 +85,14 @@ = public void init(IWorkbench workbench, IStructuredSelection currentSelect= ion) { fWorkbench =3D workbench; - mContainer =3D getBPELContainer( currentSelection.getFirstElement() ); = = + mContainer =3D getBPELContainer(currentSelection.getFirstElement()); } = - = protected void selectAndReveal(IResource newResource) { - BasicNewResourceWizard.selectAndReveal(newResource, fWorkbench.getActive= WorkbenchWindow()); + BasicNewResourceWizard.selectAndReveal(newResource, fWorkbench + .getActiveWorkbenchWindow()); } = - = protected void openResource(final IFile resource) { if (resource.getType() !=3D IResource.FILE) { return; @@ -107,9 +108,10 @@ final Display display =3D getShell().getDisplay(); display.asyncExec(new Runnable() { public void run() { - try { = - IDE.openEditor(activePage, resource, BPEL_EDITOR_ID, true); - // IDE.openEditor(activePage, resource, true); + try { + IDE.openEditor(activePage, resource, BPEL_EDITOR_ID, + true); + // IDE.openEditor(activePage, resource, true); } catch (PartInitException e) { BPELUIPlugin.log(e); } @@ -120,7 +122,6 @@ } } = - = /** * Perform cancel. Close the wizard and don't do anything else. * = @@ -138,14 +139,18 @@ = @Override public void addPages() { - = - fMainPage =3D new NewFileWizardPage1(Messages.NewFileWizard_1); - fContainerPage =3D new NewFileWizardPage2(Messages.NewFileWizard_1); - = + + fMainPage =3D new NewFileWizardPage1(Messages.NewFileWizardPage1_Name); + fContainerPage =3D new NewFileWizardPage2( + Messages.NewFileWizardPage2_Name); + wsdlPage =3D new WSDLCustomPage( + Messages.NewFileWizard_WSDLCustomPage_Name); + addPage(fMainPage); + addPage(wsdlPage); addPage(fContainerPage); - = - fContainerPage.setPreviousPage( fMainPage ); = + wsdlPage.setPreviousPage(fMainPage); + fContainerPage.setPreviousPage(wsdlPage); } = /** @@ -160,21 +165,24 @@ public boolean performFinish() { = BPELCreateOperation runnable =3D new BPELCreateOperation(); - = + // The container either comes from the 2nd page, explicitely defined // or it comes as the context in the current selection. - = + IContainer container =3D fContainerPage.getResourceContainer(); if (container =3D=3D null) { container =3D mContainer; } + + runnable.setContainer(container); + runnable.setTemplate(fMainPage.getSelectedTemplate()); = - runnable.setContainer( container ); - runnable.setTemplate( fMainPage.getSelectedTemplate () ); - runnable.setArgs( fMainPage.getArgs () ) ; - = + Map map =3D fMainPage.getArgs(); + map.putAll(wsdlPage.getMap()); + runnable.setArgs(map); + try { - getContainer().run(false, true, runnable); = + getContainer().run(false, true, runnable); } catch (InvocationTargetException e) { BPELUIPlugin.log(e); return false; @@ -184,22 +192,21 @@ } = IFile res =3D (IFile) runnable.getElementToOpen(); - if (res !=3D null) { + if (res !=3D null && res.exists()) { openResource(res); } return true; } = - = /** - * Return the BPEL files container in which we can generate = - * process from the template. = + * Return the BPEL files container in which we can generate process from = the + * template. * = * @return the BPEL files IContainer */ - = - IContainer getBPELContainer ( Object obj ) { - = + + IContainer getBPELContainer(Object obj) { + if (obj =3D=3D null) { return null; } @@ -209,7 +216,7 @@ project =3D file.getProject(); } if (obj instanceof IContainer) { - IContainer container =3D (IContainer)obj; = + IContainer container =3D (IContainer) obj; project =3D container.getProject(); } if (project !=3D null) { @@ -218,19 +225,18 @@ return bpelContent; } } - return null; = + return null; } = - = /** - * = + * = * Final condition for the wizard to finish */ - = + @Override public boolean canFinish() { - return (fMainPage.isPageComplete() && mContainer !=3D null) || super.can= Finish(); + return (fMainPage.isPageComplete() && wsdlPage.isPageComplete() && mCont= ainer !=3D null) + || super.canFinish(); } - = - = + } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wi= zards/NewFileWizardPage1.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= NewFileWizardPage1.java 2010-05-17 01:14:13 UTC (rev 22109) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= NewFileWizardPage1.java 2010-05-17 04:15:28 UTC (rev 22110) @@ -10,12 +10,11 @@ * Oracle Corporation *************************************************************************= ******/ = - package org.eclipse.bpel.ui.wizards; = +import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.ArrayList; import java.util.List; import java.util.Map; = @@ -27,8 +26,11 @@ import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.IDialogSettings; +import org.eclipse.jface.wizard.IWizardPage; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; @@ -39,419 +41,437 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; - import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin; = /** * = - * @author Michal Chmielewski (michal.chmielewski(a)oracle.com) = - * + * @author Michal Chmielewski (michal.chmielewski(a)oracle.com) + * = */ = -public class NewFileWizardPage1 extends WizardPage = -{ +(a)SuppressWarnings("restriction") +public class NewFileWizardPage1 extends WizardPage { = static final String EMPTY =3D ""; //$NON-NLS-1$ - = + /** last namespace used in creating a project, saved in dialog settings */ static final String LAST_NAMESPACE_KEY =3D "last.namespace.used"; //$NON-= NLS-1$ = /** Process name field */ - private Text processNameField; + private Text processNameField; = - /** which namespace to use to create the process */ - Combo processNamespaceField; + /** which namespace to use to create the process */ + Combo processNamespaceField; = - /** which template to use to create a process */ - Combo processTemplateField; - = - /** Template description, in summary */ - Text templateDescription; + /** which template to use to create a process */ + Combo processTemplateField; = - /** option for creating an abstract process */ - Button processAbstractOptionButton; - = - private Map mArgs =3D new HashMap (3); - = - private String[] lastNS; - private List temNS; - = - = - = - private Listener validateListner =3D new Listener() { = + /** Template description, in summary */ + Text templateDescription; + + /** option for creating an abstract process */ + Button processAbstractOptionButton; + + private Map mArgs =3D new HashMap(3); + + private String[] lastNS; + private List temNS; + + private Listener validateListner =3D new Listener() { public void handleEvent(Event event) { - setPageComplete(validatePage()); = + setPageComplete(validatePage()); } - }; - = - = - // constants - private static final int SIZING_TEXT_FIELD_WIDTH =3D 250; + }; = - /** - * Creates a new project creation wizard page. - * - * @param pageName the name of this page - */ - public NewFileWizardPage1(String pageName) = - { - super(pageName); - setPageComplete(false); - = + // constants + private static final int SIZING_TEXT_FIELD_WIDTH =3D 250; + + /** + * Creates a new project creation wizard page. + * = + * @param pageName + * the name of this page + */ + public NewFileWizardPage1(String pageName) { + super(pageName); + setPageComplete(false); + setTitle(Messages.NewFileWizardPage1_2); setDescription(Messages.NewFileWizardPage1_3); - = - setImageDescriptor( BPELUIPlugin.INSTANCE.getImageDescriptor( IBPE= LUIConstants.ICON_WIZARD_BANNER )); - } - = - /** = - * Method declared on IDialogPage. - * @param parent the parent composite that we must attach ourselves to - */ - = - public void createControl (Composite parent) = - { = - Composite composite =3D new Composite(parent, SWT.NULL); - composite.setFont(parent.getFont()); = - initializeDialogUnits(parent); + setImageDescriptor(BPELUIPlugin.INSTANCE + .getImageDescriptor(IBPELUIConstants.ICON_WIZARD_BANNER)); + } = - composite.setLayout(new GridLayout()); - composite.setLayoutData(new GridData(GridData.FILL_BOTH)); + /** + * Method declared on IDialogPage. + * = + * @param parent + * the parent composite that we must attach ourselves to + */ = - createProjectGroup(composite); - = - setPageComplete( validatePage() ); - = - // no errors on opening up the wizard - setErrorMessage(null); - setMessage(null); - setControl(composite); = - = - // figure out the what needs to go = - } - = - /** - * Creates the project name specification controls. - * - * @param parent the parent composite - */ - private final void createProjectGroup(Composite parent) = - { = - Group projectGroup =3D new Group(parent, SWT.NONE); - projectGroup.setText(Messages.NewFileWizardPage1_4); - projectGroup.setLayout(new GridLayout()); - projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - = - = - Composite fields =3D new Composite ( projectGroup, SWT.NONE ); - GridLayout layout =3D new GridLayout(); - layout.numColumns =3D 2; - fields.setLayout(layout); - fields.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + public void createControl(Composite parent) { + Composite composite =3D new Composite(parent, SWT.NULL); + composite.setFont(parent.getFont()); = - // new project label - Label projectLabel =3D new Label(fields, SWT.NONE); - projectLabel.setText( Messages.NewFileWizardPage1_5); = - projectLabel.setFont( parent.getFont() ); + initializeDialogUnits(parent); = - // new project name entry field - processNameField =3D new Text(fields, SWT.BORDER); - GridData data =3D new GridData(GridData.FILL_HORIZONTAL); - data.widthHint =3D SIZING_TEXT_FIELD_WIDTH; - processNameField.setLayoutData(data); - processNameField.setFont(parent.getFont()); + composite.setLayout(new GridLayout()); + composite.setLayoutData(new GridData(GridData.FILL_BOTH)); = - processNameField.addListener(SWT.Modify, validateListner); + createProjectGroup(composite); = - // new project label - Label namespaceLabel =3D new Label(fields, SWT.NONE); - namespaceLabel.setText( Messages.NewFileWizardPage1_6); - namespaceLabel.setFont(parent.getFont()); - = - // new project name entry field - processNamespaceField =3D new Combo( fields, SWT.DROP_DOWN | SWT.S= IMPLE ); = - data =3D new GridData(GridData.FILL_HORIZONTAL); - data.widthHint =3D SIZING_TEXT_FIELD_WIDTH; - processNamespaceField.setLayoutData(data); - processNamespaceField.setFont(parent.getFont()); - = - // add the namespace values - processNamespaceField.setItems( getProcessNameSpaces() ); - processNamespaceField.addListener(SWT.Modify, validateListner); - = - String lastNamespace =3D null; - if(lastNS !=3D null){ - if(lastNS.length > 0){ - lastNamespace =3D lastNS[0]; - } - } - if (lastNamespace !=3D null) { - processNamespaceField.setText( lastNamespace ); - } + setPageComplete(validatePage()); = - // new project type - Label typeLabel =3D new Label(fields, SWT.NONE); - typeLabel.setText( Messages.NewFileWizardPage1_7); = - typeLabel.setFont( parent.getFont() ); + // no errors on opening up the wizard + setErrorMessage(null); + setMessage(null); + setControl(composite); = - // new project type selector - processTemplateField =3D new Combo( fields, SWT.DROP_DOWN | SWT.SI= MPLE | SWT.READ_ONLY ); - data =3D new GridData(GridData.FILL_HORIZONTAL); - data.widthHint =3D SIZING_TEXT_FIELD_WIDTH; - processTemplateField.setLayoutData( data ); - = - processTemplateField.addListener(SWT.Modify, new Listener () { + // figure out the what needs to go + } = + /** + * Creates the project name specification controls. + * = + * @param parent + * the parent composite + */ + private final void createProjectGroup(Composite parent) { + Group projectGroup =3D new Group(parent, SWT.NONE); + projectGroup.setText(Messages.NewFileWizardPage1_4); + projectGroup.setLayout(new GridLayout()); + projectGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + Composite fields =3D new Composite(projectGroup, SWT.NONE); + GridLayout layout =3D new GridLayout(); + layout.numColumns =3D 2; + fields.setLayout(layout); + fields.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + // new project label + Label projectLabel =3D new Label(fields, SWT.NONE); + projectLabel.setText(Messages.NewFileWizardPage1_5); + projectLabel.setFont(parent.getFont()); + + // new project name entry field + processNameField =3D new Text(fields, SWT.BORDER); + GridData data =3D new GridData(GridData.FILL_HORIZONTAL); + data.widthHint =3D SIZING_TEXT_FIELD_WIDTH; + processNameField.setLayoutData(data); + processNameField.setFont(parent.getFont()); + + processNameField.addListener(SWT.Modify, validateListner); + + // new project label + Label namespaceLabel =3D new Label(fields, SWT.NONE); + namespaceLabel.setText(Messages.NewFileWizardPage1_6); + namespaceLabel.setFont(parent.getFont()); + + // new project name entry field + processNamespaceField =3D new Combo(fields, SWT.DROP_DOWN | SWT.SIMPLE); + data =3D new GridData(GridData.FILL_HORIZONTAL); + data.widthHint =3D SIZING_TEXT_FIELD_WIDTH; + processNamespaceField.setLayoutData(data); + processNamespaceField.setFont(parent.getFont()); + + // add the namespace values + processNamespaceField.setItems(getProcessNameSpaces()); + processNamespaceField.addListener(SWT.Modify, validateListner); + + String lastNamespace =3D null; + if (lastNS !=3D null) { + if (lastNS.length > 0) { + lastNamespace =3D lastNS[0]; + } + } + if (lastNamespace !=3D null) { + processNamespaceField.setText(lastNamespace); + } + + // new project type + Label typeLabel =3D new Label(fields, SWT.NONE); + typeLabel.setText(Messages.NewFileWizardPage1_7); + typeLabel.setFont(parent.getFont()); + + // new project type selector + processTemplateField =3D new Combo(fields, SWT.DROP_DOWN | SWT.SIMPLE + | SWT.READ_ONLY); + data =3D new GridData(GridData.FILL_HORIZONTAL); + data.widthHint =3D SIZING_TEXT_FIELD_WIDTH; + processTemplateField.setLayoutData(data); + + processTemplateField.addListener(SWT.Modify, new Listener() { + public void handleEvent(Event event) { String val =3D processTemplateField.getText().trim(); - Template template =3D BPELUIPlugin.INSTANCE.getTemplates().getTemplate= ByName( val ); + mArgs.put("type", val); + Template template =3D BPELUIPlugin.INSTANCE.getTemplates() + .getTemplateByName(val); if (template !=3D null) { String txt =3D template.getDescription(); - templateDescription.setText ( txt =3D=3D null ? EMPTY : txt); + templateDescription.setText(txt =3D=3D null ? EMPTY : txt); } - = - } = - }); - = - = - = - templateDescription =3D new Text(projectGroup,SWT.READ_ONLY | SWT.= WRAP | SWT.SCROLL_LINE ); - data =3D new GridData(GridData.FILL_HORIZONTAL); - data.widthHint =3D SIZING_TEXT_FIELD_WIDTH; - data.heightHint =3D 60; - templateDescription.setLayoutData(data); - templateDescription.setFont(parent.getFont()); - = - // Scan directories in the "templates" folder - // and built up a list - = - String templates[] =3D BPELUIPlugin.INSTANCE.getTemplates().getTem= plateNames(); - processTemplateField.setItems(templates); - = - // Select the top one. - if (templates.length > 0) { - processTemplateField.select(0); - } - = - //add checkbox for abstract process option - processAbstractOptionButton =3D new Button(projectGroup, SWT.CHECK ); - processAbstractOptionButton.setText(Messages.NewFileWizardPage1_9); = - processAbstractOptionButton.setFont(parent.getFont() ); - processAbstractOptionButton.addSelectionListener(new SelectionAdapte= r(){ - public void widgetSelected(SelectionEvent event) { - setPageComplete(validatePage()); = - } - }); = - } - = = - private String[] getProcessNameSpaces() { - // project specification group - IDialogSettings settings =3D getWizard().getDialogSettings(); - String ns =3D settings.get( LAST_NAMESPACE_KEY ); - ArrayList list =3D new ArrayList(); - if(ns !=3D null && !"".equals(ns)) { - lastNS =3D ns.split(";"); - for(String str : lastNS){ - list.add(str); - } - } - temNS =3D new ArrayList(); - for(String str : BPELUIPlugin.INSTANCE.getTemplates().getNamespaceNam= es()){ - temNS.add(str); - } - list.addAll(temNS); - String[] a =3D new String[(lastNS =3D=3D null ? 0 : lastNS.length) + = temNS.size()]; + } + }); + + templateDescription =3D new Text(projectGroup, SWT.READ_ONLY | SWT.WRAP + | SWT.SCROLL_LINE); + data =3D new GridData(GridData.FILL_HORIZONTAL); + data.widthHint =3D SIZING_TEXT_FIELD_WIDTH; + data.heightHint =3D 60; + templateDescription.setLayoutData(data); + templateDescription.setFont(parent.getFont()); + + // Scan directories in the "templates" folder + // and built up a list + + String templates[] =3D BPELUIPlugin.INSTANCE.getTemplates() + .getTemplateNames(); + processTemplateField.setItems(templates); + + // Select the top one. + if (templates.length > 0) { + processTemplateField.select(0); + } + + // add checkbox for abstract process option + processAbstractOptionButton =3D new Button(projectGroup, SWT.CHECK); + processAbstractOptionButton.setText(Messages.NewFileWizardPage1_9); + processAbstractOptionButton.setFont(parent.getFont()); + processAbstractOptionButton + .addSelectionListener(new SelectionAdapter() { + public void widgetSelected(SelectionEvent event) { + setPageComplete(validatePage()); + } + }); + } + + private String[] getProcessNameSpaces() { + // project specification group + IDialogSettings settings =3D getWizard().getDialogSettings(); + String ns =3D settings.get(LAST_NAMESPACE_KEY); + ArrayList list =3D new ArrayList(); + if (ns !=3D null && !"".equals(ns)) { + lastNS =3D ns.split(";"); + for (String str : lastNS) { + list.add(str); + } + } + temNS =3D new ArrayList(); + for (String str : BPELUIPlugin.INSTANCE.getTemplates() + .getNamespaceNames()) { + temNS.add(str); + } + list.addAll(temNS); + String[] a =3D new String[(lastNS =3D=3D null ? 0 : lastNS.length) + + temNS.size()]; return list.toArray(a); } = /** - * Returns the current project name as entered by the user, or its ant= icipated - * initial value. - * - * @return the project name, its anticipated initial value, or n= ull - * if no project name is known - */ - public String getProjectName() { - return getProjectNameFieldValue(); - } - = - /** - * Returns the value of the project name field - * with leading and trailing spaces removed. - * = - * @return the project name in the field - */ - private String getProjectNameFieldValue() { - = - if (processNameField =3D=3D null) { - return EMPTY; = - } - return processNameField.getText().trim(); - } - = + * Returns the current project name as entered by the user, or its + * anticipated initial value. + * = + * @return the project name, its anticipated initial value, or + * null if no project name is known + */ + public String getProjectName() { + return getProjectNameFieldValue(); + } = - = - /** - * Returns the current project name as entered by the user, or its ant= icipated - * initial value. - * - * @return the project name, its anticipated initial value, or n= ull - * if no project name is known - */ - public String getProjectNamespace() { - = - return getProjectNamespaceFieldValue(); - } - /** - * Returns the value of the project name field - * with leading and trailing spaces removed. - * = - * @return the project name in the field - */ - private String getProjectNamespaceFieldValue() { - if (processNameField =3D=3D null) { - return EMPTY; = - } - return processNamespaceField.getText().trim(); - } + /** + * Returns the value of the project name field with leading and trailing + * spaces removed. + * = + * @return the project name in the field + */ + private String getProjectNameFieldValue() { = - = - /** - * Returns whether this page's controls currently all contain valid = - * values. - * - * @return true if all controls are valid, and - * false if at least one is invalid - */ - protected boolean validatePage() { - = - IWorkspace workspace =3D IDEWorkbenchPlugin.getPluginWorkspace(); + if (processNameField =3D=3D null) { + return EMPTY; + } + return processNameField.getText().trim(); + } = - IDialogSettings settings =3D getWizard().getDialogSettings(); - = - String processName =3D processNameField.getText(); = - = - if (processName.equals(EMPTY)) { = - setErrorMessage(null); - setMessage( Messages.NewFileWizardPage1_8); = - return false; - } + /** + * Returns the current project name as entered by the user, or its + * anticipated initial value. + * = + * @return the project name, its anticipated initial value, or + * null if no project name is known + */ + public String getProjectNamespace() { = - IStatus nameStatus =3D - workspace.validateName(processName, IResource.FILE); - = - if (!nameStatus.isOK()) { - setErrorMessage(nameStatus.getMessage()); - return false; - } - = - // Make sure that there are no spaces in the name - if( processName.indexOf( " " ) > -1 ) //$NON-NLS-1$ - { - setErrorMessage(Messages.NewFileWizardPage1_10); - return false; - } = - = - setErrorMessage(null); - setMessage(null); - = - String namespace =3D processNamespaceField.getText().trim(); = - if (namespace.length() < 1) { - setErrorMessage(Messages.NewFileWizardPage1_11); - return false; - } - = - String bpelNamespace =3D (isAbstractOptionButtonChecked())? - BPELConstants.NAMESPACE_ABSTRACT_2007: BPELConstants.NAMESPACE; - = - // settings for next time the dialog is used. - settings.put( LAST_NAMESPACE_KEY , addNSToDefault(namespace)) ; - = - // Template arguments - mArgs.put("processName", processName ); //$NON-NLS-1$ - mArgs.put("namespace", namespace ); //$NON-NLS-1$ - mArgs.put("bpelNamespace", bpelNamespace ); //$NON-NLS-1$ - mArgs.put("date", new Date() ); //$NON-NLS-1$ + return getProjectNamespaceFieldValue(); + } = - = - return true; - } + /** + * Returns the value of the project name field with leading and trailing + * spaces removed. + * = + * @return the project name in the field + */ + private String getProjectNamespaceFieldValue() { + if (processNameField =3D=3D null) { + return EMPTY; + } + return processNamespaceField.getText().trim(); + } = - /** - * add the last namespace to the default namespace array - * = - * @param namespace - * @return - */ - private String addNSToDefault(String namespace) { - StringBuffer ns =3D new StringBuffer(); - if(!"".equals(namespace)&& !temNS.contains(namespace)){ - ns.append(namespace).append(";");; - if(lastNS !=3D null){ - for(int i =3D 0 ; i 8){ - break; - } - } = - } - } - } else { - if(lastNS !=3D null){ - for(String str : lastNS){ - ns.append(str).append(";"); - } - } - } = + /** + * Returns whether this page's controls currently all contain valid value= s. + * = + * @return true if all controls are valid, and + * false if at least one is invalid + */ + protected boolean validatePage() { + + IWorkspace workspace =3D IDEWorkbenchPlugin.getPluginWorkspace(); + + IDialogSettings settings =3D getWizard().getDialogSettings(); + + String processName =3D processNameField.getText(); + + if (processName.equals(EMPTY)) { + setErrorMessage(null); + setMessage(Messages.NewFileWizardPage1_8); + return false; + } + + IStatus nameStatus =3D workspace + .validateName(processName, IResource.FILE); + + if (!nameStatus.isOK()) { + setErrorMessage(nameStatus.getMessage()); + return false; + } + + // Make sure that there are no spaces in the name + if (processName.indexOf(" ") > -1) //$NON-NLS-1$ + { + setErrorMessage(Messages.NewFileWizardPage1_10); + return false; + } + + setErrorMessage(null); + setMessage(null); + + String namespace =3D processNamespaceField.getText().trim(); + if (namespace.length() < 1) { + setErrorMessage(Messages.NewFileWizardPage1_11); + return false; + } + + String bpelNamespace =3D (isAbstractOptionButtonChecked()) ? BPELConstan= ts.NAMESPACE_ABSTRACT_2007 + : BPELConstants.NAMESPACE; + + // settings for next time the dialog is used. + settings.put(LAST_NAMESPACE_KEY, addNSToDefault(namespace)); + + // Template arguments + mArgs.put("processName", processName); //$NON-NLS-1$ + mArgs.put("namespace", namespace); //$NON-NLS-1$ + mArgs.put("bpelNamespace", bpelNamespace); //$NON-NLS-1$ + mArgs.put("date", new Date()); //$NON-NLS-1$ + + // set the default value of the wsdlpage + setValuesForWSDLPage(processName); + + return true; + } + + private void setValuesForWSDLPage(String processName) { + WSDLCustomPage page =3D (WSDLCustomPage) this.getWizard().getPage( + Messages.NewFileWizard_WSDLCustomPage_Name); + if (page !=3D null) { + page.getServiceNameField().setText(processName); + page.getPortNameField().setText(processName + "Port"); + page.getAddressField().setText( + "http://localhost:8080/" + processName); + } + } + + public IWizardPage getNextPage() { + if (processAbstractOptionButton.getSelection()) { + return this.getWizard().getPage(Messages.NewFileWizardPage2_Name); + } + return super.getNextPage(); + } + + /** + * add the last namespace to the default namespace array + * = + * @param namespace + * @return + */ + private String addNSToDefault(String namespace) { + StringBuffer ns =3D new StringBuffer(); + if (!"".equals(namespace) && !temNS.contains(namespace)) { + ns.append(namespace).append(";"); + ; + if (lastNS !=3D null) { + for (int i =3D 0; i < lastNS.length; i++) { + if (namespace.equals(lastNS[i])) { + continue; + } else { + ns.append(lastNS[i]).append(";"); + if (i > 8) { + break; + } + } + } + } + } else { + if (lastNS !=3D null) { + for (String str : lastNS) { + ns.append(str).append(";"); + } + } + } return ns.toString(); } = /** - * @return true if Option for abstract process is checked - */ - private boolean isAbstractOptionButtonChecked() { - return processAbstractOptionButton.getSelection(); - } - = - /** - * see @DialogPage.setVisible(boolean) - * @param visible whether should be visible or not - * = - */ - = - @Override - public void setVisible (boolean visible) { - super.setVisible(visible); - if (visible) { - processNameField.setFocus(); - } - } + * @return true if Option for abstract process is checked + */ + private boolean isAbstractOptionButtonChecked() { + return processAbstractOptionButton.getSelection(); + } = /** + * see @DialogPage.setVisible(boolean) + * = + * @param visible + * whether should be visible or not + * = + */ + + @Override + public void setVisible(boolean visible) { + super.setVisible(visible); + if (visible) { + processNameField.setFocus(); + } + } + + /** * @return the actual selected template. */ - = + public Template getSelectedTemplate() { String txt =3D processTemplateField.getText().trim(); - return BPELUIPlugin.INSTANCE.getTemplates().getTemplateByName( txt ); + return BPELUIPlugin.INSTANCE.getTemplates().getTemplateByName(txt); } = /** * @return the arguments that need to be supplied to the template mechani= sm. */ - = - public Map getArgs() { - = + + public Map getArgs() { + return mArgs; } = - = - = } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wi= zards/NewFileWizardPage2.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= NewFileWizardPage2.java 2010-05-17 01:14:13 UTC (rev 22109) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= NewFileWizardPage2.java 2010-05-17 04:15:28 UTC (rev 22110) @@ -43,7 +43,7 @@ super(pageName); setPageComplete(false); = - setTitle(Messages.NewFileWizardPage1_2); + setTitle(Messages.NewFileWizardPage2_3); setDescription(Messages.NewFileWizardPage2_0); = setImageDescriptor( BPELUIPlugin.INSTANCE.getImageDescriptor( IBPE= LUIConstants.ICON_WIZARD_BANNER )); Added: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizar= ds/WSDLCustomPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= WSDLCustomPage.java (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= WSDLCustomPage.java 2010-05-17 04:15:28 UTC (rev 22110) @@ -0,0 +1,210 @@ +package org.eclipse.bpel.ui.wizards; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.bpel.ui.BPELUIPlugin; +import org.eclipse.bpel.ui.IBPELUIConstants; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Event; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Listener; +import org.eclipse.swt.widgets.Text; + +public class WSDLCustomPage extends WizardPage { + + /** Service name field */ + private Text serviceNameField; + + /** Port name field */ + private Text portNameField; + + /** Address name field */ + private Text addressField; + + /** binding protocol */ + Combo bindingField; + + private Map mArgs =3D new HashMap(); + + static final String EMPTY =3D ""; + static final String SOAP_NAMESPACE=3D"http://schemas.xmlsoap.org/wsdl/soa= p/"; + static final String HTTP_NAMESPACE=3D"http://schemas.xmlsoap.org/wsdl/htt= p/"; + + private static final int SIZING_TEXT_FIELD_WIDTH =3D 250; + = + private Listener validateListner =3D new Listener() { + public void handleEvent(Event event) { + setPageComplete(validatePage()); + } + }; + + /** + * New File Wizard,wsdl page that custom the generated wsdl file + * = + * @param pageName + */ + protected WSDLCustomPage(String pageName) { + super(pageName); + setTitle(Messages.NewFileWizard_WSDLCustomPage_Title); + setDescription(Messages.NewFileWizard_WSDLCustomPage_Description); + setImageDescriptor(BPELUIPlugin.INSTANCE + .getImageDescriptor(IBPELUIConstants.ICON_WIZARD_BANNER)); + } + + public void createControl(Composite parent) { + Composite composite =3D new Composite(parent, SWT.NULL); + composite.setFont(parent.getFont()); + initializeDialogUnits(parent); + composite.setLayout(new GridLayout()); + composite.setLayoutData(new GridData(GridData.FILL_BOTH)); + createWSDLGroup(composite); + setErrorMessage(null); + setMessage(null); + setControl(composite); + } + + private final void createWSDLGroup(Composite parent) { + Group wsdlGroup =3D new Group(parent, SWT.NONE); + wsdlGroup.setText(Messages.NewFileWizard_WSDLCustomPage_WSDLGroup); + wsdlGroup.setLayout(new GridLayout()); + wsdlGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + Composite fields =3D new Composite(wsdlGroup, SWT.NONE); + GridLayout layout =3D new GridLayout(); + layout.numColumns =3D 2; + fields.setLayout(layout); + fields.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + + // new service label + Label serviceLabel =3D new Label(fields, SWT.NONE); + serviceLabel + .setText(Messages.NewFileWizard_WSDLCustomPage_ServiceLable); + serviceLabel.setFont(parent.getFont()); + + // new service name entry field + serviceNameField =3D new Text(fields, SWT.BORDER); + GridData data =3D new GridData(GridData.FILL_HORIZONTAL); + data.widthHint =3D SIZING_TEXT_FIELD_WIDTH; + serviceNameField.setLayoutData(data); + serviceNameField.setFont(parent.getFont()); + serviceNameField.addListener(SWT.Modify, validateListner); + + // new port label + Label portLabel =3D new Label(fields, SWT.NONE); + portLabel.setText(Messages.NewFileWizard_WSDLCustomPage_PortLabel); + portLabel.setFont(parent.getFont()); + + // new port name entry field + portNameField =3D new Text(fields, SWT.BORDER); + data =3D new GridData(GridData.FILL_HORIZONTAL); + data.widthHint =3D SIZING_TEXT_FIELD_WIDTH; + portNameField.setLayoutData(data); + portNameField.setFont(parent.getFont()); + portNameField.addListener(SWT.Modify, validateListner); + + // new address label + Label addressLabel =3D new Label(fields, SWT.NONE); + addressLabel + .setText(Messages.NewFileWizard_WSDLCustomPage_AddressLabel); + addressLabel.setFont(parent.getFont()); + + // new address name entry field + addressField =3D new Text(fields, SWT.BORDER); + data =3D new GridData(GridData.FILL_HORIZONTAL); + data.widthHint =3D SIZING_TEXT_FIELD_WIDTH; + addressField.setLayoutData(data); + addressField.setFont(parent.getFont()); + addressField.addListener(SWT.Modify, validateListner); + + Label bindingLabel =3D new Label(fields, SWT.NONE); + bindingLabel + .setText(Messages.NewFileWizard_WSDLCustomPage_BindingLabel); + bindingLabel.setFont(parent.getFont()); + // new binding protocol entry field + bindingField =3D new Combo(fields, SWT.DROP_DOWN | SWT.SIMPLE); + data =3D new GridData(GridData.FILL_HORIZONTAL); + data.widthHint =3D SIZING_TEXT_FIELD_WIDTH; + bindingField.setLayoutData(data); + bindingField.setFont(parent.getFont()); + + // add the binding protocol values + bindingField.setItems(new String[] { "SOAP", "HTTP" }); + bindingField.setText("SOAP"); + bindingField.addListener(SWT.Modify, validateListner); + } + + protected boolean validatePage() { + String serviceName =3D serviceNameField.getText().trim(); + if (isEmptyOrSpace(serviceName, "Service Name")) { + return false; + } + String portName =3D portNameField.getText().trim(); + if (isEmptyOrSpace(portName, "Port Name")) { + return false; + } + String addressName =3D addressField.getText().trim(); + if (isEmptyOrSpace(addressName, "Service Address")) { + return false; + } + String protocol =3D bindingField.getText().trim(); + if (!("SOAP".equals(protocol) || "HTTP".equals(protocol))) { + setErrorMessage(Messages.Error_NewFileWizard_WSDLCustomPage_Protocol); + return false; + } + setErrorMessage(null); + + // Template arguments + mArgs.put("serviceName", serviceName); //$NON-NLS-1$ + mArgs.put("portName", portName); //$NON-NLS-1$ + mArgs.put("address", addressName); //$NON-NLS-1$ + mArgs.put("protocol", protocol.toLowerCase()); //$NON-NLS-1$ + if("SOAP".equals(protocol)){ + mArgs.put("protocolNamespace", SOAP_NAMESPACE); + } else { + mArgs.put("protocolNamespace", HTTP_NAMESPACE); + } + return true; + } + + private boolean isEmptyOrSpace(String name, String element) { + if (name.equals(EMPTY)) { + setErrorMessage(NLS.bind( + Messages.Error_NewFileWizard_WSDLCustomPage_Name_Empty, + element)); + return true; + } + + if (name.indexOf(" ") > -1) { + setErrorMessage(NLS.bind( + Messages.Error_NewFileWizard_WSDLCustomPage_Name_Space, + element)); + return true; + } + return false; + } + + public Text getServiceNameField() { + return serviceNameField; + } + + public Text getPortNameField() { + return portNameField; + } + + public Text getAddressField() { + return addressField; + } + + public Map getMap() { + return mArgs; + } + +} Property changes on: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse= /bpel/ui/wizards/WSDLCustomPage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizar= ds/WSDLServiceDetail.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= WSDLServiceDetail.java (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= WSDLServiceDetail.java 2010-05-17 04:15:28 UTC (rev 22110) @@ -0,0 +1,11 @@ +package org.eclipse.bpel.ui.wizards; + +public class WSDLServiceDetail { + + public static final String Sync_SOAPDetail =3D "\n\n \n \n = \n \n = \n \n \n = \n \n \n \n \n\n\n \n \n \n \n \n"; + public static final String Sync_HTTPDetail =3D "\n\n \n \n \n \n \n \n \n \n \n \n \n \n\n\n \n \n = \n \n \n"; + public static final String Async_SOAPDetail =3D "\n\n \n \n \n \n \n \n \n \n \n\n \n \n = \n \n \n = \n \n \n \n\n\n \n \n \n \n = \n\n \n <= port name=3D\"${portName}CallbackPort\" binding=3D\"tns:${processName}Callb= ackBinding\">\n \n = \n \n"; + public static final String Async_HTTPDetail =3D "\n\n \n \n \n = \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n = \n\n\n \n = \n \n \n \n\n \n \n \n = \n \n"; + = + = +} Property changes on: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse= /bpel/ui/wizards/WSDLServiceDetail.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wi= zards/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= messages.properties 2010-05-17 01:14:13 UTC (rev 22109) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/wizards/= messages.properties 2010-05-17 04:15:28 UTC (rev 22110) @@ -1,4 +1,5 @@ NewFileWizard_1=3DNew BPEL Process +NewFileWizardPage1_Name=3DProcessPage NewFileWizardPage1_2=3DCreate a BPEL Process File NewFileWizardPage1_3=3DCreate a 2.0 BPEL file. NewFileWizardPage1_4=3DProcess Details @@ -7,11 +8,24 @@ NewFileWizardPage1_7=3DTemplate: NewFileWizardPage1_8=3DSpecify the name of this BPEL file. NewFileWizardPage1_9=3DAbstract Process -NewFileWizardPage2_0=3DSelect location for the BPEL source file. -NewFileWizardPage2_1=3DSelect Project or Folder for the BPEL file. +NewFileWizardPage2_Name=3DLocationPage +NewFileWizardPage2_0=3DSelect location for the BPEL source files. +NewFileWizardPage2_1=3DSelect Project or Folder for the BPEL files. NewFileWizardPage2_2=3D +NewFileWizardPage2_3=3DSelect Files Location NewFileWizardPage1_10=3DName must not include a space. NewFileWizardPage1_11=3DNamespace of the process cannot be empty. +NewFileWizard_WSDLCustomPage_Name=3DWSDLPage +NewFileWizard_WSDLCustomPage_Title=3DCreate a WSDL File +NewFileWizard_WSDLCustomPage_Description=3DCreate a WSDL File for the BPEL= Process +NewFileWizard_WSDLCustomPage_WSDLGroup=3DWSDL Details +NewFileWizard_WSDLCustomPage_ServiceLable=3DService Name +NewFileWizard_WSDLCustomPage_PortLabel=3DPort Name +NewFileWizard_WSDLCustomPage_AddressLabel=3DService Address +NewFileWizard_WSDLCustomPage_BindingLabel=3DBinding Protocol +Error_NewFileWizard_WSDLCustomPage_Name_Empty=3DSpecify a {0} for the BPEL= process in the WSDL file. +Error_NewFileWizard_WSDLCustomPage_Name_Space=3D{0} must not include a spa= ce. +Error_NewFileWizard_WSDLCustomPage_Protocol=3DThe Binding Protocol must be= 'SOAP' or 'HTTP'. BPELCreateOperation_0=3DCreating process from template ... CreatePartnerLinkWizard_0=3DCreate Partner Link Type CreatePartnerLinkWizard_2=3DCreate new Partner Link Type Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel 2010= -05-17 01:14:13 UTC (rev 22109) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/templates/async/sample.bpel 2010= -05-17 04:15:28 UTC (rev 22110) @@ -58,7 +58,7 @@ portType=3D"tns:${processName}" operation=3D"initiate" variable=3D"input" createInstance=3D"yes"/> - = + = = --===============0478381265130963790==-- From jbosstools-commits at lists.jboss.org Mon May 17 04:29:53 2010 Content-Type: multipart/mixed; boundary="===============3816768271339793784==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22111 - in workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe: icefaces/utill and 1 other directories. Date: Mon, 17 May 2010 04:29:53 -0400 Message-ID: <201005170829.o4H8Trn5027175@svn01.web.mwc.hst.phx2.redhat.com> --===============3816768271339793784== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-17 04:29:53 -0400 (Mon, 17 May 2010) New Revision: 22111 Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/template/mock/impl/VpeHtmlInputText.java Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceInputTextTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/utill/VpeRendererUtil.java Log: https://jira.jboss.org/browse/JBIDE-4710, processing for ice input text ren= dering has been added Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-17 04:15:28 U= TC (rev 22110) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-17 08:29:53 U= TC (rev 22111) @@ -15,8 +15,7 @@ import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; -import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUICommand; -import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlInputText; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeCreationData; @@ -39,7 +38,7 @@ try { VpeFacesContext.getInstance().setResponseWriter(null); Renderer render =3D new com.icesoft.faces.component.ext.renderkit.Input= TextRenderer(); - VpeUICommand uiComponent =3D new VpeUICommand( + VpeHtmlInputText uiComponent =3D new VpeHtmlInputText( (Element) sourceNode); Node result =3D VpeRendererUtil.processRenderer(render, uiComponent); nsIDOMNode resultVisualNode =3D VpeRendererUtil.createVisualNode( Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-17 04:15:28 UTC (rev = 22110) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-17 08:29:53 UTC (rev = 22111) @@ -42,7 +42,7 @@ IceFacesActivator.getDefault().logError(e); } DOMContext domContext =3D DOMContext.getDOMContext(VpeFacesContext.getIn= stance(), uiComponent); - return domContext.getRootNode(); + return domContext.getRootNode()!=3Dnull?domContext.getRootNode():domCont= ext.getCursorParent().getFirstChild(); } = public static final nsIDOMNode createVisualNode(Node srcNode,nsIDOMDocume= nt visualDocument){ Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/t= ools/jsf/vpe/template/mock/impl/VpeHtmlInputText.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeHtmlInputText.java = (rev 0) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeHtmlInputText.java 2010-05-17 08:29:53 UTC = (rev 22111) @@ -0,0 +1,134 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jsf.vpe.template.mock.impl; + +import java.util.HashMap; +import java.util.Map; + +import javax.el.ELContext; +import javax.el.ELException; +import javax.el.PropertyNotFoundException; +import javax.el.PropertyNotWritableException; +import javax.el.ValueExpression; + +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +import com.icesoft.faces.component.ext.HtmlInputText; + +/** + * @author mareshkau + * + */ +public class VpeHtmlInputText extends HtmlInputText { + private Map attributesMap; + = + public VpeHtmlInputText(Element sourceElement) { + attributesMap =3D new HashMap(); + NamedNodeMap attributes =3D sourceElement.getAttributes(); + for(int i=3D0;i getExpectedType() { + // TODO Auto-generated method stub + return String.class; + } + + @Override + public Class getType(ELContext arg0) + throws NullPointerException, PropertyNotFoundException, + ELException { + // TODO Auto-generated method stub + return String.class; + } + + @Override + public Object getValue(ELContext arg0) throws NullPointerException, + PropertyNotFoundException, ELException { + return getAttributes().get(name); + } + + @Override + public boolean isReadOnly(ELContext arg0) + throws NullPointerException, PropertyNotFoundException, + ELException { + // TODO Auto-generated method stub + return false; + } + + @Override + public void setValue(ELContext arg0, Object arg1) + throws NullPointerException, PropertyNotFoundException, + PropertyNotWritableException, ELException { + // TODO Auto-generated method stub + = + } + + @Override + public boolean equals(Object arg0) { + // TODO Auto-generated method stub + return false; + } + + @Override + public String getExpressionString() { + // TODO Auto-generated method stub + return (String) getAttributes().get(name); + } + + @Override + public int hashCode() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public boolean isLiteralText() { + // TODO Auto-generated method stub + return false; + } + = + }; + } +} --===============3816768271339793784==-- From jbosstools-commits at lists.jboss.org Mon May 17 04:53:43 2010 Content-Type: multipart/mixed; boundary="===============0835975872606917635==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22112 - trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/refactoring. Date: Mon, 17 May 2010 04:53:43 -0400 Message-ID: <201005170853.o4H8rhra030219@svn01.web.mwc.hst.phx2.redhat.com> --===============0835975872606917635== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-17 04:53:42 -0400 (Mon, 17 May 2010) New Revision: 22112 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam= /core/test/refactoring/SeamComponentRefactoringTest.java Log: https://jira.jboss.org/browse/JBIDE-5833 Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/too= ls/seam/core/test/refactoring/SeamComponentRefactoringTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/refactoring/SeamComponentRefactoringTest.java 2010-05-17 08:29:= 53 UTC (rev 22111) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/refactoring/SeamComponentRefactoringTest.java 2010-05-17 08:53:= 42 UTC (rev 22112) @@ -78,22 +78,22 @@ structure.addTextChange(change); list.add(structure); = - renameComponent(seamEjbProject, "test", "best", list, false); + renameComponent(seamEjbProject, "test", "best", list, 0); } = -// public void testRemaningMailSessionDeclarationInComponentsXml_JBIDE4447= () throws CoreException { -// ArrayList list =3D new ArrayList(); -// -// TestChangeStructure structure =3D new TestChangeStructure(warProject, = "/WebContent/WEB-INF/components.xml"); -// TestTextChange change =3D new TestTextChange(2345, 41, "name=3D\"org.j= boss.seam.mail.newMailSession\""); -// structure.addTextChange(change); -// = -// list.add(structure); -// -// renameComponent(seamWarProject, "org.jboss.seam.mail.mailSession", "or= g.jboss.seam.mail.newMailSession", list, true); -// } + public void testRemaningMailSessionDeclarationInComponentsXml_JBIDE4447()= throws CoreException { + ArrayList list =3D new ArrayList(); = - private void renameComponent(ISeamProject seamProject, String componentNa= me, String newName, List changeList, boolean fromJar) = throws CoreException{ + TestChangeStructure structure =3D new TestChangeStructure(warProject, "/= WebContent/WEB-INF/components.xml"); + TestTextChange change =3D new TestTextChange(2345, 41, "name=3D\"org.jbo= ss.seam.mail.newMailSession\""); + structure.addTextChange(change); + = + list.add(structure); + + renameComponent(seamWarProject, "org.jboss.seam.mail.mailSession", "org.= jboss.seam.mail.newMailSession", list, 8000); + } + + private void renameComponent(ISeamProject seamProject, String componentNa= me, String newName, List changeList, long delay) throw= s CoreException{ JobUtils.waitForIdle(); = // Test before renaming @@ -123,10 +123,13 @@ } = rootChange.perform(new NullProgressMonitor()); - JobUtils.waitForIdle(); + = + if(delay > 0) + JobUtils.waitForIdle(delay); + else + JobUtils.waitForIdle(); + = // Test results - //if(!fromJar) - //assertNull("There is unexpected component in seam project: " + compon= entName, seamProject.getComponent(componentName)); assertNotNull("Can't load component " + newName, seamProject.getComponen= t(newName)); for(TestChangeStructure changeStructure : changeList){ IFile file =3D changeStructure.getProject().getFile(changeStructure.get= FileName()); --===============0835975872606917635==-- From jbosstools-commits at lists.jboss.org Mon May 17 05:29:52 2010 Content-Type: multipart/mixed; boundary="===============2045710912738672847==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22113 - in workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools/jsf/vpe/icefaces: utill and 1 other directory. Date: Mon, 17 May 2010 05:29:51 -0400 Message-ID: <201005170929.o4H9Tpgk007812@svn01.web.mwc.hst.phx2.redhat.com> --===============2045710912738672847== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-17 05:29:51 -0400 (Mon, 17 May 2010) New Revision: 22113 Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceCommandButtonTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceInputTextTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/utill/VpeRendererUtil.java Log: Code has been refactored,https://jira.jboss.org/browse/JBIDE-4710 Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-17 08:53:= 42 UTC (rev 22112) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-17 09:29:= 51 UTC (rev 22113) @@ -12,18 +12,13 @@ = import javax.faces.render.Renderer; = -import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUICommand; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.jboss.tools.vpe.editor.template.VpeTemplateManager; -import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; -import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Element; import org.w3c.dom.Node; = @@ -35,26 +30,11 @@ = public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - try { VpeFacesContext.getInstance().setResponseWriter(null); Renderer render =3D new com.icesoft.faces.component.ext.renderkit.Butto= nRenderer(); VpeUICommand uiComponent =3D new VpeUICommand( (Element) sourceNode); - Node result =3D VpeRendererUtil.processRenderer(render, uiComponent); - nsIDOMNode resultVisualNode =3D VpeRendererUtil.createVisualNode( - result, visualDocument); - if (resultVisualNode.getNodeType() =3D=3D Node.TEXT_NODE) { - nsIDOMElement domElement =3D VisualDomUtil - .createBorderlessContainer(visualDocument); - domElement.appendChild(resultVisualNode); - resultVisualNode =3D domElement; - } - return new VpeCreationData(resultVisualNode); - } catch (Throwable th) { - IceFacesActivator.getDefault().logError(th); - } - return VpeTemplateManager.getInstance().getDefTemplate().create( - pageContext, sourceNode, visualDocument); + return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, v= isualDocument, render, uiComponent); } = } Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-17 08:5= 3:42 UTC (rev 22112) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-17 09:2= 9:51 UTC (rev 22113) @@ -12,18 +12,13 @@ = import javax.faces.render.Renderer; = -import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.jboss.tools.vpe.editor.template.VpeTemplateManager; -import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; -import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Element; import org.w3c.dom.Node; = @@ -36,26 +31,11 @@ = public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - try { VpeFacesContext.getInstance().setResponseWriter(null); Renderer render =3D new com.icesoft.faces.renderkit.dom_html_basic.Text= Renderer(); VpeUIComponent uiComponent =3D new VpeUIComponent( (Element) sourceNode); - Node result =3D VpeRendererUtil.processRenderer(render, uiComponent); - nsIDOMNode resultVisualNode =3D VpeRendererUtil.createVisualNode( - result, visualDocument); - if (resultVisualNode.getNodeType() =3D=3D Node.TEXT_NODE) { - nsIDOMElement domElement =3D VisualDomUtil - .createBorderlessContainer(visualDocument); - domElement.appendChild(resultVisualNode); - resultVisualNode =3D domElement; - } - return new VpeCreationData(resultVisualNode); - } catch (Throwable th) { - IceFacesActivator.getDefault().logError(th); - } - return VpeTemplateManager.getInstance().getDefTemplate().create( - pageContext, sourceNode, visualDocument); + return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, v= isualDocument, render, uiComponent); } = } Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010= -05-17 08:53:42 UTC (rev 22112) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010= -05-17 09:29:51 UTC (rev 22113) @@ -12,18 +12,13 @@ = import javax.faces.render.Renderer; = -import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeUIComponent; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.jboss.tools.vpe.editor.template.VpeTemplateManager; -import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; -import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Element; import org.w3c.dom.Node; = @@ -35,26 +30,11 @@ = public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - try { VpeFacesContext.getInstance().setResponseWriter(null); Renderer render =3D new com.icesoft.faces.renderkit.dom_html_basic.Chec= kboxRenderer(); VpeUIComponent uiComponent =3D new VpeUIComponent( (Element) sourceNode); - Node result =3D VpeRendererUtil.processRenderer(render, uiComponent); - nsIDOMNode resultVisualNode =3D VpeRendererUtil.createVisualNode( - result, visualDocument); - if (resultVisualNode.getNodeType() =3D=3D Node.TEXT_NODE) { - nsIDOMElement domElement =3D VisualDomUtil - .createBorderlessContainer(visualDocument); - domElement.appendChild(resultVisualNode); - resultVisualNode =3D domElement; - } - return new VpeCreationData(resultVisualNode); - } catch (Throwable th) { - IceFacesActivator.getDefault().logError(th); - } - return VpeTemplateManager.getInstance().getDefTemplate().create( - pageContext, sourceNode, visualDocument); + return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, v= isualDocument, render, uiComponent); } = } Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-17 08:53:42 U= TC (rev 22112) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-17 09:29:51 U= TC (rev 22113) @@ -12,18 +12,13 @@ = import javax.faces.render.Renderer; = -import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlInputText; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeCreationData; -import org.jboss.tools.vpe.editor.template.VpeTemplateManager; -import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; -import org.mozilla.interfaces.nsIDOMElement; -import org.mozilla.interfaces.nsIDOMNode; import org.w3c.dom.Element; import org.w3c.dom.Node; = @@ -35,26 +30,11 @@ = public VpeCreationData create(VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument) { - try { VpeFacesContext.getInstance().setResponseWriter(null); Renderer render =3D new com.icesoft.faces.component.ext.renderkit.Input= TextRenderer(); VpeHtmlInputText uiComponent =3D new VpeHtmlInputText( (Element) sourceNode); - Node result =3D VpeRendererUtil.processRenderer(render, uiComponent); - nsIDOMNode resultVisualNode =3D VpeRendererUtil.createVisualNode( - result, visualDocument); - if (resultVisualNode.getNodeType() =3D=3D Node.TEXT_NODE) { - nsIDOMElement domElement =3D VisualDomUtil - .createBorderlessContainer(visualDocument); - domElement.appendChild(resultVisualNode); - resultVisualNode =3D domElement; - } - return new VpeCreationData(resultVisualNode); - } catch (Throwable th) { - IceFacesActivator.getDefault().logError(th); - } - return VpeTemplateManager.getInstance().getDefTemplate().create( - pageContext, sourceNode, visualDocument); + return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, v= isualDocument, render, uiComponent); } = } Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-17 08:53:42 UTC (rev = 22112) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-17 09:29:51 UTC (rev = 22113) @@ -12,8 +12,13 @@ = import javax.faces.component.UIComponent; import javax.faces.render.Renderer; + import org.jboss.tools.jsf.vpe.icefaces.IceFacesActivator; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.jboss.tools.vpe.editor.template.VpeTemplateManager; +import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMNode; @@ -21,45 +26,77 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; + import com.icesoft.faces.context.DOMContext; = /** * Util class for calling real renderers and obtain information from them * = * @author mareshkau - * + * = */ public class VpeRendererUtil { - = - = - public static Node processRenderer(final Renderer render, final UICompone= nt uiComponent){ - = - = + + public static final VpeCreationData createVisualEditorDate( + VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument, final Renderer render, + final UIComponent uiComponent) { try { + // VpeFacesContext.getInstance().setResponseWriter(null); + // Renderer render =3D new + // com.icesoft.faces.renderkit.dom_html_basic.TextRenderer(); + // VpeUIComponent uiComponent =3D new VpeUIComponent( + // (Element) sourceNode); + Node result =3D VpeRendererUtil.processRenderer(render, uiComponent); + nsIDOMNode resultVisualNode =3D VpeRendererUtil.createVisualNode( + result, visualDocument); + if (resultVisualNode.getNodeType() =3D=3D Node.TEXT_NODE) { + nsIDOMElement domElement =3D VisualDomUtil + .createBorderlessContainer(visualDocument); + domElement.appendChild(resultVisualNode); + resultVisualNode =3D domElement; + } + return new VpeCreationData(resultVisualNode); + } catch (Throwable th) { + IceFacesActivator.getDefault().logError(th); + } + return VpeTemplateManager.getInstance().getDefTemplate().create( + pageContext, sourceNode, visualDocument); + } + + private static Node processRenderer(final Renderer render, + final UIComponent uiComponent) { + + try { render.encodeBegin(VpeFacesContext.getInstance(), uiComponent); render.encodeEnd(VpeFacesContext.getInstance(), uiComponent); } catch (Throwable e) { IceFacesActivator.getDefault().logError(e); } - DOMContext domContext =3D DOMContext.getDOMContext(VpeFacesContext.getIn= stance(), uiComponent); - return domContext.getRootNode()!=3Dnull?domContext.getRootNode():domCont= ext.getCursorParent().getFirstChild(); + DOMContext domContext =3D DOMContext.getDOMContext(VpeFacesContext + .getInstance(), uiComponent); + return domContext.getRootNode() !=3D null ? domContext.getRootNode() + : domContext.getCursorParent().getFirstChild(); } - = - public static final nsIDOMNode createVisualNode(Node srcNode,nsIDOMDocume= nt visualDocument){ - = + + private static final nsIDOMNode createVisualNode(Node srcNode, + nsIDOMDocument visualDocument) { + nsIDOMNode resultNode =3D null; - switch(srcNode.getNodeType()) { - case Node.TEXT_NODE:{ + switch (srcNode.getNodeType()) { + case Node.TEXT_NODE: { resultNode =3D visualDocument.createTextNode(srcNode.getNodeValue()); break; } - case Node.ELEMENT_NODE:{ + case Node.ELEMENT_NODE: { resultNode =3D visualDocument.createElement(srcNode.getNodeName()); - copyAttributes((Element)srcNode, (nsIDOMElement)resultNode.queryInterfa= ce(nsIDOMElement.NS_IDOMELEMENT_IID)); + copyAttributes((Element) srcNode, (nsIDOMElement) resultNode + .queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID)); NodeList chieldNodes =3D srcNode.getChildNodes(); - for(int i=3D0;i --===============7906212474618241156== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-17 06:20:56 -0400 (Mon, 17 May 2010) New Revision: 22114 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/meta/constraint/impl/XAttributeConstraintImpl.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/meta/constraint/impl/XAttributeConstraintJavaName.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/meta/impl/XAttributeImpl.java Log: https://jira.jboss.org/browse/JBIDE-6295 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/meta/constraint/impl/XAttributeConstraintImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/meta/constraint/impl/XAttributeConstraintImpl.java 2010-05-17 09:29:5= 1 UTC (rev 22113) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/meta/constraint/impl/XAttributeConstraintImpl.java 2010-05-17 10:20:5= 6 UTC (rev 22114) @@ -11,13 +11,23 @@ package org.jboss.tools.common.meta.constraint.impl; = import org.w3c.dom.*; +import org.jboss.tools.common.meta.XAttribute; import org.jboss.tools.common.meta.constraint.*; import org.jboss.tools.common.meta.impl.*; = public class XAttributeConstraintImpl extends XMetaElementImpl implements = XAttributeConstraint { + /** + * It happens that some data useful for constraint, e.g. that attribute i= s required, + * is contained at the attribute object. + */ + protected XAttribute attribute; = public XAttributeConstraintImpl() {} = + public void setAttribute(XAttribute attribute) { + this.attribute =3D attribute; + } + public boolean accepts(String value){ return true; } Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/meta/constraint/impl/XAttributeConstraintJavaName.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/meta/constraint/impl/XAttributeConstraintJavaName.java 2010-05-17 09:= 29:51 UTC (rev 22113) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/meta/constraint/impl/XAttributeConstraintJavaName.java 2010-05-17 10:= 20:56 UTC (rev 22114) @@ -65,7 +65,7 @@ } = public String getError(String value) { - return (value.length() =3D=3D 0) ? ModelMessages.CONSTRAINT_NONEMP= TY : + return (value.length() =3D=3D 0) ? (isRequired() ? ModelMessages.C= ONSTRAINT_NONEMPTY : null) : accepts(value) ? null : (keytable.contains(value)) ? ModelMessages.CONSTRAINT_NO_JA= VA_KEYWORD : (!allowPrimitiveTypes && primitiveSet.contains(value)) ? Mo= delMessages.CONSTRAINT_NO_JAVA_KEYWORD : @@ -73,6 +73,10 @@ ModelMessages.CONSTRAINT_JAVA_NAME; } = + boolean isRequired() { + return attribute !=3D null && "always".equals(attribute.getProperty("= save")); //$NON-NLS-1$ //$NON-NLS-2$ + } + public String getCorrectedValue(String value) { if(value =3D=3D null || value.length() =3D=3D 0) return null; if(XModelObjectConstants.TRUE.equals(getProperties().getProperty("= acceptIncorrect"))) return value; //$NON-NLS-1$ Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/meta/impl/XAttributeImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/meta/impl/XAttributeImpl.java 2010-05-17 09:29:51 UTC (rev 22113) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/meta/impl/XAttributeImpl.java 2010-05-17 10:20:56 UTC (rev 22114) @@ -23,7 +23,7 @@ protected XAttributeEditor m_Editor; protected String m_DefValue; protected boolean m_Visible; - protected ConstraintHolder constraint =3D new ConstraintHolder(); + protected ConstraintHolder constraint =3D new ConstraintHolder(this); protected boolean m_Required; protected boolean m_Editable; protected boolean trimmable; @@ -256,11 +256,14 @@ } = class ConstraintHolder { + XAttributeImpl attribute; private XAttributeConstraint constraint; private String loader; private Element element; = - public ConstraintHolder() {} + public ConstraintHolder(XAttributeImpl attribute) { + this.attribute =3D attribute; + } = public void init(String loader, Element element) { this.loader =3D loader; @@ -291,6 +294,9 @@ } if(constraint =3D=3D null) constraint =3D new XAttributeConstraintImpl(); = + if(constraint instanceof XAttributeConstraintImpl) { + ((XAttributeConstraintImpl)constraint).setAttribute(attribute); + } if(element !=3D null) = ((XAttributeConstraintImpl)constraint).load(element); loader =3D null; --===============7906212474618241156==-- From jbosstools-commits at lists.jboss.org Mon May 17 06:23:53 2010 Content-Type: multipart/mixed; boundary="===============1683206802900416543==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22115 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/4710. Date: Mon, 17 May 2010 06:23:53 -0400 Message-ID: <201005171023.o4HANrQd019892@svn01.web.mwc.hst.phx2.redhat.com> --===============1683206802900416543== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-17 06:23:52 -0400 (Mon, 17 May 2010) New Revision: 22115 Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4710/iceInputSecret.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4710/iceInputSecret.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4710/iceInputText.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4710/iceInputText.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4710/iceOutputText.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4710/iceOutputText.xhtml.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4710/iceSelectBooleanCheckbox.xhtml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4710/iceSelectBooleanCheckbox.xhtml.xml Removed: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebCo= ntent/pages/JBIDE/4710/index.xhtml Log: https://jira.jboss.org/browse/JBIDE-4710 junit test Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/4710/iceInputSecret.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceInputSecret.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceInputSecret.xhtml 2010-05-17 10:23:52 UTC (rev 2= 2115) @@ -0,0 +1,8 @@ + + + + \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/4710/iceInputSecret.xhtml.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceInputSecret.xhtml.xml (r= ev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceInputSecret.xhtml.xml 2010-05-17 10:23:52 UTC (r= ev 22115) @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/4710/iceInputText.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceInputText.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceInputText.xhtml 2010-05-17 10:23:52 UTC (rev 221= 15) @@ -0,0 +1,8 @@ + + + + \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/4710/iceInputText.xhtml.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceInputText.xhtml.xml (rev= 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceInputText.xhtml.xml 2010-05-17 10:23:52 UTC (rev= 22115) @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file Copied: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/= WebContent/pages/JBIDE/4710/iceOutputText.xhtml (from rev 22031, trunk/jsf/= tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/J= BIDE/4710/index.xhtml) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceOutputText.xhtml (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceOutputText.xhtml 2010-05-17 10:23:52 UTC (rev 22= 115) @@ -0,0 +1,8 @@ + + = + + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/4710/iceOutputText.xhtml.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceOutputText.xhtml.xml (re= v 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceOutputText.xhtml.xml 2010-05-17 10:23:52 UTC (re= v 22115) @@ -0,0 +1,7 @@ + + + +Ice Test Output Text
+ + + \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/4710/iceSelectBooleanCheckbox.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceSelectBooleanCheckbox.xhtml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceSelectBooleanCheckbox.xhtml 2010-05-17 10:23:52 = UTC (rev 22115) @@ -0,0 +1,8 @@ + + = + + \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/W= ebContent/pages/JBIDE/4710/iceSelectBooleanCheckbox.xhtml.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceSelectBooleanCheckbox.xhtml.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/iceSelectBooleanCheckbox.xhtml.xml 2010-05-17 10:23= :52 UTC (rev 22115) @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest= /WebContent/pages/JBIDE/4710/index.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/index.xhtml 2010-05-17 10:20:56 UTC (rev 22114) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebC= ontent/pages/JBIDE/4710/index.xhtml 2010-05-17 10:23:52 UTC (rev 22115) @@ -1,8 +0,0 @@ - - = - = - --===============1683206802900416543==-- From jbosstools-commits at lists.jboss.org Mon May 17 06:26:09 2010 Content-Type: multipart/mixed; boundary="===============2635728231290117086==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22116 - in workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces: src/org/jboss/tools/jsf/vpe/template/mock/impl and 1 other directories. Date: Mon, 17 May 2010 06:26:09 -0400 Message-ID: <201005171026.o4HAQ9SX020341@svn01.web.mwc.hst.phx2.redhat.com> --===============2635728231290117086== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-17 06:26:09 -0400 (Mon, 17 May 2010) New Revision: 22116 Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceInputSecretTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/template/mock/impl/VpeHtmlInputSecret.java Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/template/mock/impl/VpeExternalContext.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templ= ates-icefaces.xml Log: https://jira.jboss.org/browse/JBIDE-4710 ice input secree has been added Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/t= ools/jsf/vpe/icefaces/template/IceInputSecretTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceInputSecretTemplate.java = (rev 0) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceInputSecretTemplate.java 2010-05-17 10:26:09= UTC (rev 22116) @@ -0,0 +1,41 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jsf.vpe.icefaces.template; + +import javax.faces.render.Renderer; + +import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlInputSecret; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlInputText; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.mozilla.interfaces.nsIDOMDocument; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * @author mareshkau + * + */ +public class IceInputSecretTemplate extends VpeAbstractTemplate{ + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + VpeFacesContext.getInstance().setResponseWriter(null); + Renderer render =3D new com.icesoft.faces.component.ext.renderkit.Secret= Renderer(); + VpeHtmlInputSecret uiComponent =3D new VpeHtmlInputSecret( + (Element) sourceNode); + return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, v= isualDocument, render, uiComponent); + } + +} Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/template/mock/impl/VpeExternalContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeExternalContext.java 2010-05-17 10:23:52 UT= C (rev 22115) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeExternalContext.java 2010-05-17 10:26:09 UT= C (rev 22116) @@ -10,6 +10,7 @@ *************************************************************************= *****/ package org.jboss.tools.jsf.vpe.template.mock.impl; = +import java.util.Collections; import java.util.HashMap; import java.util.Map; import org.jboss.tools.jsf.vpe.template.mock.abstr.VpeAbstractExternalCont= ext; @@ -37,7 +38,12 @@ */ @Override public Map getRequestMap() { - // TODO Auto-generated method stub + //this map used to add js support return new HashMap(); } + @Override + public Map getRequestParameterMap() { + return Collections.EMPTY_MAP; + } + = } Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/t= ools/jsf/vpe/template/mock/impl/VpeHtmlInputSecret.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeHtmlInputSecret.java = (rev 0) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeHtmlInputSecret.java 2010-05-17 10:26:09 UT= C (rev 22116) @@ -0,0 +1,134 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jsf.vpe.template.mock.impl; + +import java.util.HashMap; +import java.util.Map; + +import javax.el.ELContext; +import javax.el.ELException; +import javax.el.PropertyNotFoundException; +import javax.el.PropertyNotWritableException; +import javax.el.ValueExpression; + +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +import com.icesoft.faces.component.ext.HtmlInputSecret; + +/** + * @author mareshkau + * + */ +public class VpeHtmlInputSecret extends HtmlInputSecret { + private Map attributesMap; + = + public VpeHtmlInputSecret(Element sourceElement) { + attributesMap =3D new HashMap(); + NamedNodeMap attributes =3D sourceElement.getAttributes(); + for(int i=3D0;i getExpectedType() { + // TODO Auto-generated method stub + return String.class; + } + + @Override + public Class getType(ELContext arg0) + throws NullPointerException, PropertyNotFoundException, + ELException { + // TODO Auto-generated method stub + return String.class; + } + + @Override + public Object getValue(ELContext arg0) throws NullPointerException, + PropertyNotFoundException, ELException { + return getAttributes().get(name); + } + + @Override + public boolean isReadOnly(ELContext arg0) + throws NullPointerException, PropertyNotFoundException, + ELException { + // TODO Auto-generated method stub + return false; + } + + @Override + public void setValue(ELContext arg0, Object arg1) + throws NullPointerException, PropertyNotFoundException, + PropertyNotWritableException, ELException { + // TODO Auto-generated method stub + = + } + + @Override + public boolean equals(Object arg0) { + // TODO Auto-generated method stub + return false; + } + + @Override + public String getExpressionString() { + // TODO Auto-generated method stub + return (String) getAttributes().get(name); + } + + @Override + public int hashCode() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public boolean isLiteralText() { + // TODO Auto-generated method stub + return false; + } + = + }; + } +} Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vp= e-templates-icefaces.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-temp= lates-icefaces.xml 2010-05-17 10:23:52 UTC (rev 22115) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-temp= lates-icefaces.xml 2010-05-17 10:26:09 UTC (rev 22116) @@ -57,4 +57,17 @@ + + + + + + + + + + + + --===============2635728231290117086==-- From jbosstools-commits at lists.jboss.org Mon May 17 09:07:47 2010 Content-Type: multipart/mixed; boundary="===============2407258043465989538==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22117 - in branches/jbosstools-3.1.x/maven/plugins: org.jboss.tools.maven.seam/poms and 1 other directory. Date: Mon, 17 May 2010 09:07:47 -0400 Message-ID: <201005171307.o4HD7l0q024785@svn01.web.mwc.hst.phx2.redhat.com> --===============2407258043465989538== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-17 09:07:46 -0400 (Mon, 17 May 2010) New Revision: 22117 Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms/= hibernate332-template.xml branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.seam/poms/= parent-pom.xml Log: https://jira.jboss.org/browse/JBIDE-6294 Add JBoss Community Public Maven R= epository when creating JBoss Maven Integration facet Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.cor= e/poms/hibernate332-template.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms= /hibernate332-template.xml 2010-05-17 10:26:09 UTC (rev 22116) +++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.core/poms= /hibernate332-template.xml 2010-05-17 13:07:46 UTC (rev 22117) @@ -10,7 +10,7 @@ jboss-public-repository-group - JBoss Public Maven Repository Group + JBoss Community Public Maven Repository https://repository.jboss.org/nexus/content/groups/public/ default Modified: branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.sea= m/poms/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.seam/poms= /parent-pom.xml 2010-05-17 10:26:09 UTC (rev 22116) +++ branches/jbosstools-3.1.x/maven/plugins/org.jboss.tools.maven.seam/poms= /parent-pom.xml 2010-05-17 13:07:46 UTC (rev 22117) @@ -42,7 +42,7 @@ jboss-public-repository-group - JBoss Public Maven Repository Group + JBoss Community Public Maven Repository https://repository.jboss.org/nexus/content/groups/public/ default @@ -459,7 +459,7 @@ jboss-public-repository-group - JBoss Public Maven Repository Group + JBoss Community Public Maven Repository https://repository.jboss.org/nexus/content/groups/public/ default --===============2407258043465989538==-- From jbosstools-commits at lists.jboss.org Mon May 17 09:10:53 2010 Content-Type: multipart/mixed; boundary="===============6144297044358680590==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22118 - in trunk/maven/plugins: org.jboss.tools.maven.seam/poms and 1 other directory. Date: Mon, 17 May 2010 09:10:53 -0400 Message-ID: <201005171310.o4HDAra8025250@svn01.web.mwc.hst.phx2.redhat.com> --===============6144297044358680590== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-17 09:10:52 -0400 (Mon, 17 May 2010) New Revision: 22118 Modified: trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-templat= e.xml trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml Log: https://jira.jboss.org/browse/JBIDE-6294 Add JBoss Community Public Maven R= epository when creating JBoss Maven Integration facet Modified: trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-= template.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-templa= te.xml 2010-05-17 13:07:46 UTC (rev 22117) +++ trunk/maven/plugins/org.jboss.tools.maven.core/poms/hibernate332-templa= te.xml 2010-05-17 13:10:52 UTC (rev 22118) @@ -10,7 +10,7 @@ jboss-public-repository-group - JBoss Public Maven Repository Group + JBoss Community Public Maven Repository https://repository.jboss.org/nexus/content/groups/public/ default Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2010= -05-17 13:07:46 UTC (rev 22117) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/poms/parent-pom.xml 2010= -05-17 13:10:52 UTC (rev 22118) @@ -42,7 +42,7 @@ jboss-public-repository-group - JBoss Public Maven Repository Group + JBoss Community Public Maven Repository https://repository.jboss.org/nexus/content/groups/public/ default @@ -459,7 +459,7 @@ jboss-public-repository-group - JBoss Public Maven Repository Group + JBoss Community Public Maven Repository https://repository.jboss.org/nexus/content/groups/public/ default --===============6144297044358680590==-- From jbosstools-commits at lists.jboss.org Mon May 17 09:51:22 2010 Content-Type: multipart/mixed; boundary="===============9147971990372802579==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22119 - in trunk/vpe: plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages and 1 other directories. Date: Mon, 17 May 2010 09:51:22 -0400 Message-ID: <201005171351.o4HDpMa8029837@svn01.web.mwc.hst.phx2.redhat.com> --===============9147971990372802579== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2010-05-17 09:51:21 -0400 (Mon, 17 May 2010) New Revision: 22119 Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wiz= ards/VpeImportExportWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wiz= ards/VpeImportExportWizardsUtils.java Removed: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/t= est/wizard/ Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wiz= ards/ExportUnknownTagsTemplatesWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wiz= ards/ImportUnknownTagsTemplatesWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/V= peUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/m= essages.properties trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/t= est/VpeUiTests.java Log: Removing duplicate code from import/export wizards. JUnits were corrected. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/wizards/ExportUnknownTagsTemplatesWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wi= zards/ExportUnknownTagsTemplatesWizardPage.java 2010-05-17 13:10:52 UTC (re= v 22118) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wi= zards/ExportUnknownTagsTemplatesWizardPage.java 2010-05-17 13:51:21 UTC (re= v 22119) @@ -15,19 +15,11 @@ = import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; -import org.eclipse.jface.viewers.CellEditor; -import org.eclipse.jface.viewers.CheckboxCellEditor; import org.eclipse.jface.viewers.ColumnLayoutData; import org.eclipse.jface.viewers.ColumnWeightData; -import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TableLayout; -import org.eclipse.jface.viewers.TableViewer; -import org.eclipse.jface.viewers.TextCellEditor; -import org.eclipse.jface.viewers.Viewer; import org.eclipse.swt.SWT; -import org.eclipse.swt.SWTException; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; @@ -40,9 +32,7 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.WizardExportResourcesPage; import org.jboss.tools.vpe.editor.template.VpeAnyData; @@ -56,17 +46,9 @@ * = * @author dmaliarevich */ -public class ExportUnknownTagsTemplatesWizardPage extends WizardExportReso= urcesPage { +public class ExportUnknownTagsTemplatesWizardPage extends + WizardExportResourcesPage implements VpeImportExportWizardPage { = - private static final String[] COLUMNS_NAMES =3D new String[] { - VpeUIMessages.TemplatesTableProvider_TagName, = - VpeUIMessages.TemplatesTableProvider_TagForDisplay, - VpeUIMessages.TemplatesTableProvider_URI, - VpeUIMessages.TemplatesTableProvider_Children}; - private static final int[] COLUMNS_WIDTHS =3D new int[] { - 50, 50, 90, 40 - }; - = private String pathString; private Table tagsTable; private List tagsList; @@ -123,7 +105,7 @@ /* * Fill the table with stored tags */ - updateTagsTable(true); + VpeImportExportWizardsUtils.updateTagsTable(tagsTable, tagsList, true); = /* * Add path output and browse button = @@ -173,113 +155,6 @@ */ } = - /** - * Updates visual table with tags templates. - * = - * @param clearTagsTable clears current tags table - */ - private void updateTagsTable(boolean clearTagsTable) { - /* - * Return when visual table hasn't been initialized. - */ - if(tagsTable =3D=3D null || tagsTable.isDisposed()) { - return; - } - /* - * Clear current visual table. - */ - if (clearTagsTable) { - tagsTable.clearAll(); - } - /* - * Return when tags templates list hasn't been initialized. - */ - if (tagsList =3D=3D null) { - return; - } - /* - * Remember current selection index = - * and restore it at the end. - */ - int selectionIndex =3D tagsTable.getSelectionIndex(); - TableItem tableItem =3D null; - for (int i =3D 0; i < tagsList.size(); i++) { - if(tagsTable.getItemCount() > i) { - /* - * Use existed items - */ - tableItem =3D tagsTable.getItem(i); - } else { - /* - * Add necessary item - */ - tableItem =3D new TableItem(tagsTable, SWT.BORDER, i); - } - /* - * Fill in columns. - */ - String[] itemColumnsData =3D new String[tagsTable.getColumnCount()]; - for (int j =3D 0; j < itemColumnsData.length; j++) { - /* - * Getting values from tagList - */ - itemColumnsData[j] =3D toVisualValue(getValueAt(i, j)); - } - /* - * Set cells text - */ - tableItem.setText(itemColumnsData); - - } - = - /* - * Restoring selection index - */ - if (selectionIndex > 0 ) { - try { - tagsTable.setSelection(selectionIndex); - } catch (SWTException e) { - /* - * Do nothing - */ - } - } - } - = - public String getValueAt(int row, int column) { - String result =3D "List is empty"; //$NON-NLS-1$ - if ((null !=3D tagsList) && ((row >=3D 0) && (tagsList.size() > 0) && (r= ow < tagsList.size()))) { - VpeAnyData tagItem =3D (VpeAnyData)tagsList.get(row); - switch(column){ - case 0: - result =3D tagItem.getName(); - break; - case 1: - result =3D tagItem.getTagForDisplay(); - break; - case 2: - result =3D tagItem.getUri(); - break; - case 3: - if(tagItem.isChildren()) { - result =3D VpeUIMessages.TemplatesTableProvider_Yes; - } else { - result =3D VpeUIMessages.TemplatesTableProvider_No; - } - break; - } - } - return result; - } - = - private String toVisualValue(String v) { - if(v =3D=3D null) return ""; //$NON-NLS-1$ - if(v.indexOf('\n') >=3D 0) v =3D v.replace('\n', ' '); - if(v.indexOf('\t') >=3D 0) v =3D v.replace('\t', ' '); - if(v.indexOf('\r') >=3D 0) v =3D v.replace('\r', ' '); - return v; - } - = public void handleEvent(Event event) { /* * Do nothing Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/wizards/ImportUnknownTagsTemplatesWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wi= zards/ImportUnknownTagsTemplatesWizardPage.java 2010-05-17 13:10:52 UTC (re= v 22118) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wi= zards/ImportUnknownTagsTemplatesWizardPage.java 2010-05-17 13:51:21 UTC (re= v 22119) @@ -22,7 +22,6 @@ import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.TableLayout; import org.eclipse.swt.SWT; -import org.eclipse.swt.SWTException; import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.SelectionAdapter; @@ -31,13 +30,10 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; -import org.eclipse.swt.widgets.TableItem; import org.eclipse.swt.widgets.Text; -import org.eclipse.swt.widgets.Widget; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.WizardResourceImportPage; import org.jboss.tools.vpe.VpePlugin; @@ -47,29 +43,18 @@ import org.jboss.tools.vpe.messages.VpeUIMessages; import org.jboss.tools.vpe.resref.core.ReferenceWizardPage; = - /** * Page for importing unknown tags templates. * = * @author dmaliarevich */ public class ImportUnknownTagsTemplatesWizardPage extends - WizardResourceImportPage { - - private static final String[] COLUMNS_NAMES =3D new String[] { - VpeUIMessages.TemplatesTableProvider_TagName, = - VpeUIMessages.TemplatesTableProvider_TagForDisplay, - VpeUIMessages.TemplatesTableProvider_URI, - VpeUIMessages.TemplatesTableProvider_Children}; - private static final int[] COLUMNS_WIDTHS =3D new int[] { - 50, 50, 90, 40 - }; + WizardResourceImportPage implements VpeImportExportWizardPage { = private String pathString; private Table tagsTable; private List tagsList; = - = /** * Constructor * = @@ -127,7 +112,7 @@ /* * Update table tags list based on the loaded file. */ - updateTagsTable(true); + VpeImportExportWizardsUtils.updateTagsTable(tagsTable, tagsList, true); /* * Check if the page is complete. */ @@ -182,111 +167,7 @@ setControl(composite); = } - - /** - * Updates visual table with tags templates. - * = - * @param clearTagsTable clears current tags table - */ - private void updateTagsTable(boolean clearTagsTable) { - /* - * Return when visual table hasn't been initialized. - */ - if(tagsTable =3D=3D null || tagsTable.isDisposed()) { - return; - } - /* - * Clear current visual table. - */ - if (clearTagsTable) { - tagsTable.clearAll(); - } - /* - * Return when tags templates list hasn't been initialized. - */ - if (tagsList =3D=3D null) { - return; - } - /* - * Remember current selection index = - * and restore it at the end. - */ - int selectionIndex =3D tagsTable.getSelectionIndex(); - TableItem tableItem =3D null; - for (int i =3D 0; i < tagsList.size(); i++) { - if(tagsTable.getItemCount() > i) { - /* - * Use existed items - */ - tableItem =3D tagsTable.getItem(i); - } else { - /* - * Add new item - */ - tableItem =3D new TableItem(tagsTable, SWT.BORDER, i); - } - /* - * Fill in columns. - */ - String[] itemColumnsData =3D new String[tagsTable.getColumnCount()]; - for (int j =3D 0; j < itemColumnsData.length; j++) { - /* - * Getting values from tagList - */ - itemColumnsData[j] =3D toVisualValue(getValueAt(i, j)); - } - /* - * Set cells text - */ - tableItem.setText(itemColumnsData); - } - /* - * Restoring selection index - */ - if (selectionIndex > 0 ) { - try { - tagsTable.setSelection(selectionIndex); - } catch (SWTException e) { - VpePlugin.getDefault().logError( - VpeUIMessages.COULD_NOT_SET_TABLE_SELECTION, e); - } - } - } = - public String getValueAt(int row, int column) { - String result =3D "List is empty"; //$NON-NLS-1$ - if ((null !=3D tagsList) && ((row >=3D 0) && (tagsList.size() > 0) && (r= ow < tagsList.size()))) { - VpeAnyData tagItem =3D (VpeAnyData)tagsList.get(row); - switch(column){ - case 0: - result =3D tagItem.getName(); - break; - case 1: - result =3D tagItem.getTagForDisplay(); - break; - case 2: - result =3D tagItem.getUri(); - break; - case 3: - if(tagItem.isChildren()) { - result =3D VpeUIMessages.TemplatesTableProvider_Yes; - } else { - result =3D VpeUIMessages.TemplatesTableProvider_No; - } - break; - } - } - return result; - } - = - private String toVisualValue(String v) { - if(v =3D=3D null) return ""; //$NON-NLS-1$ - if(v.indexOf('\n') >=3D 0) v =3D v.replace('\n', ' '); - if(v.indexOf('\t') >=3D 0) v =3D v.replace('\t', ' '); - if(v.indexOf('\r') >=3D 0) v =3D v.replace('\r', ' '); - return v; - } - = @Override public boolean isPageComplete() { boolean isPageComplete =3D false; Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor= /wizards/VpeImportExportWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wi= zards/VpeImportExportWizardPage.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wi= zards/VpeImportExportWizardPage.java 2010-05-17 13:51:21 UTC (rev 22119) @@ -0,0 +1,26 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2010 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.vpe.editor.wizards; + +import org.jboss.tools.vpe.messages.VpeUIMessages; + +public interface VpeImportExportWizardPage { + = + String[] COLUMNS_NAMES =3D new String[] { + VpeUIMessages.TemplatesTableProvider_TagName, = + VpeUIMessages.TemplatesTableProvider_TagForDisplay, + VpeUIMessages.TemplatesTableProvider_URI, + VpeUIMessages.TemplatesTableProvider_Children}; + = + int[] COLUMNS_WIDTHS =3D new int[] { + 50, 50, 90, 40 + }; +} Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor= /wizards/VpeImportExportWizardsUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wi= zards/VpeImportExportWizardsUtils.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wi= zards/VpeImportExportWizardsUtils.java 2010-05-17 13:51:21 UTC (rev 22119) @@ -0,0 +1,132 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2010 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.vpe.editor.wizards; + +import java.util.List; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.SWTException; +import org.eclipse.swt.widgets.Table; +import org.eclipse.swt.widgets.TableItem; +import org.jboss.tools.vpe.VpePlugin; +import org.jboss.tools.vpe.editor.template.VpeAnyData; +import org.jboss.tools.vpe.messages.VpeUIMessages; + +public class VpeImportExportWizardsUtils { + + /** + * Updates visual table with tags templates. + * = + * @param tagsTable updated tags list + * @param tagsList current tags list + * @param clearTagsTable clears current tags table + */ + public static void updateTagsTable(Table tagsTable, List tags= List, boolean clearTagsTable) { + /* + * Return when visual table hasn't been initialized. + */ + if(tagsTable =3D=3D null || tagsTable.isDisposed()) { + return; + } + /* + * Clear current visual table. + */ + if (clearTagsTable) { + tagsTable.clearAll(); + } + /* + * Return when tags templates list hasn't been initialized. + */ + if (tagsList =3D=3D null) { + return; + } + /* + * Remember current selection index = + * and restore it at the end. + */ + int selectionIndex =3D tagsTable.getSelectionIndex(); + TableItem tableItem =3D null; + for (int i =3D 0; i < tagsList.size(); i++) { + if(tagsTable.getItemCount() > i) { + /* + * Use existed items + */ + tableItem =3D tagsTable.getItem(i); + } else { + /* + * Add new item + */ + tableItem =3D new TableItem(tagsTable, SWT.BORDER, i); + } + /* + * Fill in columns. + */ + String[] itemColumnsData =3D new String[tagsTable.getColumnCount()]; + for (int j =3D 0; j < itemColumnsData.length; j++) { + /* + * Getting values from tagList + */ + itemColumnsData[j] =3D toVisualValue(getValueAt(tagsList, i, j)); + } + /* + * Set cells text + */ + tableItem.setText(itemColumnsData); + } + = + /* + * Restoring selection index + */ + if (selectionIndex > 0 ) { + try { + tagsTable.setSelection(selectionIndex); + } catch (SWTException e) { + VpePlugin.getDefault().logError( + VpeUIMessages.COULD_NOT_SET_TABLE_SELECTION, e); + } + } + } + = + private static String getValueAt(List tagsList, int row, int = column) { + String result =3D VpeUIMessages.LIST_IS_EMPTY; + if ((null !=3D tagsList) && ((row >=3D 0) && (tagsList.size() > 0) && (r= ow < tagsList.size()))) { + VpeAnyData tagItem =3D (VpeAnyData)tagsList.get(row); + switch(column){ + case 0: + result =3D tagItem.getName(); + break; + case 1: + result =3D tagItem.getTagForDisplay(); + break; + case 2: + result =3D tagItem.getUri(); + break; + case 3: + if(tagItem.isChildren()) { + result =3D VpeUIMessages.TemplatesTableProvider_Yes; + } else { + result =3D VpeUIMessages.TemplatesTableProvider_No; + } + break; + } + } + return result; + } + = + private static String toVisualValue(String v) { + if(v =3D=3D null) return ""; //$NON-NLS-1$ + if(v.indexOf('\n') >=3D 0) v =3D v.replace('\n', ' '); + if(v.indexOf('\t') >=3D 0) v =3D v.replace('\t', ' '); + if(v.indexOf('\r') >=3D 0) v =3D v.replace('\r', ' '); + return v; + } + = +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/VpeUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= VpeUIMessages.java 2010-05-17 13:10:52 UTC (rev 22118) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= VpeUIMessages.java 2010-05-17 13:51:21 UTC (rev 22119) @@ -155,5 +155,6 @@ public static String NONE_TEMPLATES_WERE_ADDED; public static String COULD_NOT_SET_TABLE_SELECTION; public static String CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT; + public static String LIST_IS_EMPTY; = } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-17 13:10:52 UTC (rev 22118) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-17 13:51:21 UTC (rev 22119) @@ -141,6 +141,7 @@ IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=3DImport unknown tags templates from = external file NONE_TEMPLATES_WERE_ADDED=3DNone of the templates were added. COULD_NOT_SET_TABLE_SELECTION=3DCould not set table selection. +LIST_IS_EMPTY=3DList is empty = # Other messages CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT=3DCannot load taglibs from PageConte= xt! \ No newline at end of file Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/v= pe/ui/test/VpeUiTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/= test/VpeUiTests.java 2010-05-17 13:10:52 UTC (rev 22118) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/= test/VpeUiTests.java 2010-05-17 13:51:21 UTC (rev 22119) @@ -18,7 +18,6 @@ import org.jboss.tools.vpe.ui.test.dialog.VpeResourcesDialogTest; import org.jboss.tools.vpe.ui.test.editor.CustomSashFormTest; import org.jboss.tools.vpe.ui.test.preferences.VpeEditorPreferencesPageTes= t; -import org.jboss.tools.vpe.ui.test.wizard.VpeImportExportUnknownTagsWizard= sTest; = /** * @author mareshkau @@ -33,7 +32,6 @@ suite.addTestSuite(CustomSashFormTest.class); suite.addTestSuite(VpePopupMenuTest.class); suite.addTestSuite(VpeEditAnyDialogTest.class); - suite.addTestSuite(VpeImportExportUnknownTagsWizardsTest.class); = return new VpeTestSetup(suite); } --===============9147971990372802579==-- From jbosstools-commits at lists.jboss.org Mon May 17 10:45:18 2010 Content-Type: multipart/mixed; boundary="===============4491886759728476651==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22120 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd. Date: Mon, 17 May 2010 10:45:18 -0400 Message-ID: <201005171445.o4HEjIKn010004@svn01.web.mwc.hst.phx2.redhat.com> --===============4491886759728476651== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-17 10:45:18 -0400 (Mon, 17 May 2010) New Revision: 22120 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/jboss-ds_5_0.xsd trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/jboss-web_5_1.xsd trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/jboss_5_1.xsd Log: https://jira.jboss.org/browse/JBIDE-5694 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/jboss-ds_5_0.x= sd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/jboss-ds_5_0.xsd 201= 0-05-17 13:51:21 UTC (rev 22119) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/jboss-ds_5_0.xsd 201= 0-05-17 14:45:18 UTC (rev 22120) @@ -11,7 +11,7 @@ elementFormDefault=3D"qualified" = attributeFormDefault=3D"unqualified" version=3D"5.0"> - + = Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/jboss-web_5_1.= xsd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/jboss-web_5_1.xsd 20= 10-05-17 13:51:21 UTC (rev 22119) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/jboss-web_5_1.xsd 20= 10-05-17 14:45:18 UTC (rev 22120) @@ -64,7 +64,7 @@ consistency with the Servlet API. = - + = Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/jboss_5_1.xsd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/jboss_5_1.xsd 2010-0= 5-17 13:51:21 UTC (rev 22119) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/dtd/jboss_5_1.xsd 2010-0= 5-17 14:45:18 UTC (rev 22120) @@ -65,7 +65,7 @@ = = - + = = --===============4491886759728476651==-- From jbosstools-commits at lists.jboss.org Mon May 17 10:58:10 2010 Content-Type: multipart/mixed; boundary="===============8895823718809458932==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22121 - branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/dtd. Date: Mon, 17 May 2010 10:58:10 -0400 Message-ID: <201005171458.o4HEwAFB011122@svn01.web.mwc.hst.phx2.redhat.com> --===============8895823718809458932== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-17 10:58:10 -0400 (Mon, 17 May 2010) New Revision: 22121 Modified: branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/dtd/j= boss-ds_5_0.xsd branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/dtd/j= boss-web_5_1.xsd branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/dtd/j= boss_5_1.xsd Log: https://jira.jboss.org/browse/JBIDE-5694 Modified: branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.cor= e/dtd/jboss-ds_5_0.xsd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/dtd/= jboss-ds_5_0.xsd 2010-05-17 14:45:18 UTC (rev 22120) +++ branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/dtd/= jboss-ds_5_0.xsd 2010-05-17 14:58:10 UTC (rev 22121) @@ -11,7 +11,7 @@ elementFormDefault=3D"qualified" = attributeFormDefault=3D"unqualified" version=3D"5.0"> - + = Modified: branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.cor= e/dtd/jboss-web_5_1.xsd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/dtd/= jboss-web_5_1.xsd 2010-05-17 14:45:18 UTC (rev 22120) +++ branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/dtd/= jboss-web_5_1.xsd 2010-05-17 14:58:10 UTC (rev 22121) @@ -64,7 +64,7 @@ consistency with the Servlet API. = - + = Modified: branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.cor= e/dtd/jboss_5_1.xsd =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/dtd/= jboss_5_1.xsd 2010-05-17 14:45:18 UTC (rev 22120) +++ branches/jbosstools-3.1.x/as/plugins/org.jboss.ide.eclipse.as.core/dtd/= jboss_5_1.xsd 2010-05-17 14:58:10 UTC (rev 22121) @@ -65,7 +65,7 @@ = = - + = = --===============8895823718809458932==-- From jbosstools-commits at lists.jboss.org Mon May 17 11:06:13 2010 Content-Type: multipart/mixed; boundary="===============4298734954842998098==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22122 - branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/resources/help. Date: Mon, 17 May 2010 11:06:13 -0400 Message-ID: <201005171506.o4HF6Dca018210@svn01.web.mwc.hst.phx2.redhat.com> --===============4298734954842998098== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-17 11:06:12 -0400 (Mon, 17 May 2010) New Revision: 22122 Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/resources/help= /keys-jsf-menu.properties Log: https://jira.jboss.org/jira/browse/JBIDE-6269 Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/resourc= es/help/keys-jsf-menu.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/resources/hel= p/keys-jsf-menu.properties 2010-05-17 14:58:10 UTC (rev 22121) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf/resources/hel= p/keys-jsf-menu.properties 2010-05-17 15:06:12 UTC (rev 22122) @@ -1,5 +1,6 @@ JSF.SetApplication.menu=3DEdit Application Settings... JSF.SetFactory.menu=3DEdit Factory Settings... +JSFProcess.AddRule.menu=3DNew View... JSF.AddRule.menu=3DRule... JSF.AddComponent.menu=3DComponent... JSF.AddConverter.menu=3DConverter --===============4298734954842998098==-- From jbosstools-commits at lists.jboss.org Mon May 17 11:18:29 2010 Content-Type: multipart/mixed; boundary="===============0427901468607378697==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22123 - trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console. Date: Mon, 17 May 2010 11:18:29 -0400 Message-ID: <201005171518.o4HFITrk019803@svn01.web.mwc.hst.phx2.redhat.com> --===============0427901468607378697== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-17 11:18:28 -0400 (Mon, 17 May 2010) New Revision: 22123 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/con= sole/ConsoleConfiguration.java Log: https://jira.jboss.org/browse/JBIDE-5997 - more simple fix Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibern= ate/console/ConsoleConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/co= nsole/ConsoleConfiguration.java 2010-05-17 15:06:12 UTC (rev 22122) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/co= nsole/ConsoleConfiguration.java 2010-05-17 15:18:28 UTC (rev 22123) @@ -185,13 +185,6 @@ throw new HibernateConsoleRuntimeException(out); } = - method =3D clazz.getMethod("getProperties", new Class[] {}); //$NON-NLS= -1$ - Properties props =3D (Properties)method.invoke(ejb3cfg, new Object[] {}= ); - if (props.getProperty("hibernate.search.autoregister_listeners") =3D=3D= null) { //$NON-NLS-1$ - method =3D clazz.getMethod("setProperty", new Class[] { String.class, = String.class }); //$NON-NLS-1$ - method.invoke(ejb3cfg, new Object[] { "hibernate.search.autoregister_l= isteners", "false" } ); //$NON-NLS-1$ //$NON-NLS-2$ - } - method =3D clazz.getMethod("getHibernateConfiguration", new Class[0]);/= /$NON-NLS-1$ Configuration invoke =3D (Configuration) method.invoke(ejb3cfg, (Object= [])null); invoke =3D configureConnectionProfile(invoke); @@ -332,11 +325,6 @@ Properties properties =3D prefs.getProperties(); = if(properties!=3Dnull) { - // to fix: JBIDE-5839 - setup this property: false is default value = - // to make hibernate tools diff hibernate versions compatible - if (properties.getProperty("hibernate.search.autoregister_listeners"= ) =3D=3D null) { //$NON-NLS-1$ - properties.setProperty("hibernate.search.autoregister_listeners", "= false"); //$NON-NLS-1$ //$NON-NLS-2$ - } // in case the transaction manager is empty then we need to inject a= faketm since hibernate will still try and instantiate it. String str =3D properties.getProperty( "hibernate.transaction.manage= r_lookup_class" ); //$NON-NLS-1$ if(str !=3D null && StringHelper.isEmpty( str )) { @@ -372,6 +360,12 @@ // TODO: HBX- localCfg.setProperty( "hibernate.temp.use_jdbc_metadata_defaults", "f= alse" ); //$NON-NLS-1$//$NON-NLS-2$ localCfg.setProperty( Environment.HBM2DDL_AUTO, "false" ); //$NON-NLS= -1$ + // to fix: JBIDE-5839 & JBIDE-5997 - setup this property: false is de= fault value = + // to make hibernate tools diff hibernate versions compatible: + // if the property not set get NoSuchMethodError with FullTextIndexEv= entListener + if (localCfg.getProperty("hibernate.search.autoregister_listeners") = =3D=3D null) { //$NON-NLS-1$ + localCfg.setProperty("hibernate.search.autoregister_listeners", "fal= se"); //$NON-NLS-1$ //$NON-NLS-2$ + } = return localCfg; } @@ -753,10 +747,6 @@ private Configuration configureStandardConfiguration(final boolean includ= eMappings, Configuration localCfg, Properties properties) { if(properties!=3Dnull) { localCfg =3D localCfg.setProperties(properties); - } else { - if (localCfg.getProperty("hibernate.search.autoregister_listeners") =3D= =3D null) { //$NON-NLS-1$ - localCfg.setProperty("hibernate.search.autoregister_listeners", "false= "); //$NON-NLS-1$ //$NON-NLS-2$ - } } EntityResolver entityResolver =3D XMLHelper.DEFAULT_DTD_RESOLVER; if(StringHelper.isNotEmpty(prefs.getEntityResolverName())) { --===============0427901468607378697==-- From jbosstools-commits at lists.jboss.org Mon May 17 11:29:00 2010 Content-Type: multipart/mixed; boundary="===============4487991402943670878==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22124 - in trunk: jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext and 1 other directories. Date: Mon, 17 May 2010 11:29:00 -0400 Message-ID: <201005171529.o4HFT0ci020734@svn01.web.mwc.hst.phx2.redhat.com> --===============4487991402943670878== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vpakan(a)redhat.com Date: 2010-05-17 11:28:59 -0400 (Mon, 17 May 2010) New Revision: 22124 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/OpenDroolsPerspective.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/SWTEclipseExt.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/IDELabel.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/types/ViewType.java Log: Extends Guvnor Tests. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2010-05-17 15:18:28= UTC (rev 22123) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/GuvnorRepositoriesTest.java 2010-05-17 15:28:59= UTC (rev 22124) @@ -11,21 +11,31 @@ = package org.jboss.tools.drools.ui.bot.test.smoke; = +import static org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable.syncE= xec; + import java.awt.event.KeyEvent; +import java.util.List; = import org.apache.log4j.Logger; +import org.eclipse.swt.custom.StyledText; import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.matchers.WidgetMatcherFactory; +import org.eclipse.swtbot.swt.finder.results.StringResult; import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu; import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; +import org.hamcrest.Matcher; import org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests; import org.jboss.tools.ui.bot.ext.config.requirement.PrepareViews; import org.jboss.tools.ui.bot.ext.config.requirement.RequirementNotFulfill= edException; import org.jboss.tools.ui.bot.ext.config.requirement.StartServer; import org.jboss.tools.ui.bot.ext.config.requirement.StopServer; +import org.jboss.tools.ui.bot.ext.gen.ActionItem.View.GuvnorGuvnorResource= History; import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper; import org.jboss.tools.ui.bot.ext.helper.DragAndDropHelper; import org.jboss.tools.ui.bot.ext.helper.KeyboardHelper; @@ -50,6 +60,7 @@ private static final Logger log =3D Logger.getLogger(GuvnorRepositoriesT= est.class); private static final String GUVNOR_TEST_FILE =3D "Dummy rule.drl"; private static final String GUVNOR_REPOSITORY_IMPORT_TEST_FILE =3D "Unde= rage.brl"; + private static final String GUVNOR_REPOSITORY_HISTORY_TEST_FILE =3D "Mor= tgageModel.model.drl"; private GuvnorRepositories guvnorRepositories =3D new GuvnorRepositories= (); = /** * Tests Guvnor Repositories @@ -61,10 +72,12 @@ deleteGuvnorRepository(); addGuvnorRepository(); openGuvnorConsole(); + drillIntoFunctionalityCheck(); browseGuvnorRepository(GuvnorRepositoriesTest.GUVNOR_TEST_FILE); - importFileFromGuvnorRepository(GuvnorRepositoriesTest.GUVNOR_TEST_FILE, + guvnorFunctionalityCheck(GuvnorRepositoriesTest.GUVNOR_TEST_FILE, DroolsAllBotTests.SAMPLE_DROOLS_RULE_NAME, GuvnorRepositoriesTest.GUVNOR_REPOSITORY_IMPORT_TEST_FILE); + repositoryHistoryCheck(GuvnorRepositoriesTest.GUVNOR_REPOSITORY_HISTOR= Y_TEST_FILE); stopGuvnor(); } = @@ -163,12 +176,12 @@ } = } /** - * Imports file with fileName to Drools project + * Imports file with fileName to Drools project and check update and com= mit Guvnor functionality * @param fileName * @param sampleFileName * @param importFileName */ - private void importFileFromGuvnorRepository(String fileName, String samp= leFileName, String importFileName){ + private void guvnorFunctionalityCheck(String fileName, String sampleFile= Name, String importFileName){ eclipse.openPerspective(PerspectiveType.JAVA); guvnorRepositories.show().bot(); SWTBotTreeItem tiGuvnorFile =3D guvnorRepositories.selectTreeItem(Timi= ng.time3S(),fileName, @@ -328,4 +341,168 @@ assertTrue("File " + importFileName + " was not disconnected from Guvn= or Repository.", tiImportRuleFile.getText().trim().equals(importFileName)); = } + private void drillIntoFunctionalityCheck(){ + SWTBotView guvnorReposioryView =3D guvnorRepositories.show(); + guvnorRepositories.selectTreeItem(Timing.time2S(), IDELabel.GuvnorRepo= sitories.PACKAGES_TREE_ITEM, = + new String[]{IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_TREE= _ITEM}); + SWTUtilExt.getViewToolbarButtonWithTooltip(guvnorReposioryView, + IDELabel.GuvnorRepositories.GO_INTO_GUVNOR_REPOSITORY_TOOLTIP) + .click(); + SWTBot guvnorRepositoryBot =3D guvnorReposioryView.bot(); + SWTBotTree guvnorRepositoryTree =3D guvnorRepositoryBot.tree(); + guvnorRepositoryBot.sleep(Timing.time3S()); + assertTrue("Guvnor repository Go Into functionality doesn't work prope= rly.\n" + + "Expected First Tree Item in Guvnor Repository is " + IDELabel.Guvno= rRepositories.DEFAULT_PACKAGE_TREE_ITEM + + "\nBut it was " + guvnorRepositoryTree.getAllItems()[0].getText(), + IDELabel.GuvnorRepositories.DEFAULT_PACKAGE_TREE_ITEM.equals(guvnorR= epositoryTree.getAllItems()[0].getText())); + = + guvnorRepositories.selectTreeItem(Timing.time2S(), IDELabel.GuvnorRepo= sitories.MORTGAGE_TREE_ITEM, = + null); + SWTUtilExt.getViewToolbarButtonWithTooltip(guvnorReposioryView, + IDELabel.GuvnorRepositories.GO_INTO_GUVNOR_REPOSITORY_TOOLTIP) + .click(); + guvnorRepositoryBot.sleep(Timing.time3S()); + assertTrue("Guvnor repository Go Into functionality doesn't work prope= rly.\n" + + "Expected First Tree Item in Guvnor Repository is " + IDELabel.Guvno= rRepositories.APPLICANTDSL_DSL_TREE_ITEM + + "\nBut it was " + guvnorRepositoryTree.getAllItems()[0].getText(), + IDELabel.GuvnorRepositories.APPLICANTDSL_DSL_TREE_ITEM.equals(guvnor= RepositoryTree.getAllItems()[0].getText())); + + SWTUtilExt.getViewToolbarButtonWithTooltip(guvnorReposioryView, + IDELabel.GuvnorRepositories.BACK_GUVNOR_REPOSITORY_TOOLTIP) + .click(); + guvnorRepositoryBot.sleep(Timing.time3S()); + assertTrue("Guvnor repository Back functionality doesn't work properly= .\n" + + "Expected First Tree Item in Guvnor Repository is " + IDELabel.Guvno= rRepositories.DEFAULT_PACKAGE_TREE_ITEM + + "\nBut it was " + guvnorRepositoryTree.getAllItems()[0].getText(), + IDELabel.GuvnorRepositories.DEFAULT_PACKAGE_TREE_ITEM.equals(guvnorR= epositoryTree.getAllItems()[0].getText())); + + SWTUtilExt.getViewToolbarButtonWithTooltip(guvnorReposioryView, + IDELabel.GuvnorRepositories.HOME_GUVNOR_REPOSITORY_TOOLTIP) + .click(); + guvnorRepositoryBot.sleep(Timing.time3S()); + assertTrue("Guvnor repository Home functionality doesn't work properly= .\n" + + "Expected First Tree Item in Guvnor Repository is " + IDELabel.Guvno= rRepositories.GUVNOR_REPOSITORY_ROOT_TREE_ITEM + + "\nBut it was " + guvnorRepositoryTree.getAllItems()[0].getText(), + IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_TREE_ITEM.equals(= guvnorRepositoryTree.getAllItems()[0].getText())); = + } + /** + * Check Repository History Functionality + * @param testFileName + */ + private void repositoryHistoryCheck (String testFileName){ + // Import File From Repository + eclipse.createNew(EntityType.RESOURCES_FROM_GUVNOR); + bot.button(IDELabel.Button.NEXT).click(); + SWTEclipseExt.getTreeItemOnPath( + bot, + bot.tree(), + Timing.time3S(), + testFileName, + new String[] { + IDELabel.GuvnorRepositories.GUVNOR_REPOSITORY_ROOT_TREE_ITEM, + IDELabel.GuvnorRepositories.PACKAGES_TREE_ITEM, + IDELabel.GuvnorRepositories.MORTGAGE_TREE_ITEM }).select(); + bot.button(IDELabel.Button.NEXT).click(); + SWTEclipseExt.getTreeItemOnPath(bot, + bot.tree(), + Timing.time1S(), + "rules", + new String[] {DroolsAllBotTests.DROOLS_PROJECT_NAME,"src","main"}).s= elect(); + bot.button(IDELabel.Button.FINISH).click(); + util.waitForJobs(Timing.time5S(),JobName.BUILDING_WS); + bot.sleep(Timing.time1S()); + SWTBot packageExplorerBot =3D packageExplorer.show().bot(); + SWTBotTree packageExplorerTree =3D packageExplorerBot.tree(); + // File is renamed because there is appended Guvnor info to Tree Item = Label + // So we need to get real label of Tree Item and use it later + SWTBotTreeItem tiTestRuleFile =3D SWTEclipseExt.getTreeItemOnPathStart= sWith(packageExplorerBot, = + packageExplorerTree, = + Timing.time1S(), + testFileName, = + new String[]{DroolsAllBotTests.DROOLS_PROJECT_NAME, + DroolsAllBotTests.SRC_MAIN_RULES_TREE_NODE}); + SWTBotEditor editor =3D packageExplorer.openFile(DroolsAllBotTests.DRO= OLS_PROJECT_NAME, = + DroolsAllBotTests.SRC_MAIN_RULES_TREE_NODE, + tiTestRuleFile.getText()); + // change test file + String addedChange =3D "SWTBOT Change!@#$asdfghjkl)(*&^"; + editor.toTextEditor().insertText(0,0,addedChange); + editor.save(); + bot.sleep(Timing.time1S()); + // commit changes + ContextMenuHelper.prepareTreeItemForContextMenu(packageExplorerTree, t= iTestRuleFile); + ContextMenuHelper.clickContextMenu(packageExplorerTree, + IDELabel.Menu.GUVNOR,IDELabel.Menu.GUVNOR_COMMIT); + bot.sleep(Timing.time5S()); + // check history + ContextMenuHelper.prepareTreeItemForContextMenu(packageExplorerTree, t= iTestRuleFile); + ContextMenuHelper.clickContextMenu(packageExplorerTree, + IDELabel.Menu.GUVNOR,IDELabel.Menu.GUVNOR_SHOW_HISTORY); + bot.sleep(Timing.time5S()); + SWTBotView guvnorResourceHistoryView =3D open.viewOpen(GuvnorGuvnorRes= ourceHistory.LABEL); + SWTBot guvnorResourceHistoryBot =3D guvnorResourceHistoryView.bot(); + SWTBotTable guvnorResourceHistoryTable =3D guvnorResourceHistoryView.b= ot().table(); + assertTrue("Guvnor Resource History table for file " + testFileName + + " has to contain at least one record but is empty.", + guvnorResourceHistoryTable.rowCount() > 0); + // Compare Revisions + String secondAddedChange =3D "222222" + addedChange; + editor.toTextEditor().insertText(0,0,secondAddedChange); + editor.saveAndClose(); + bot.sleep(Timing.time1S()); + ContextMenuHelper.prepareTreeItemForContextMenu(packageExplorerTree, t= iTestRuleFile); + ContextMenuHelper.clickContextMenu(packageExplorerTree, + IDELabel.Menu.GUVNOR,IDELabel.Menu.GUVNOR_COMPARE_WITH_VERSION); + eclipse.waitForShell(""); + guvnorResourceHistoryBot.activeShell().bot().button(IDELabel.Button.OK= ).click(); + SWTBotEditor compareEditor =3D bot.editorByTitle("Compare"); + Matcher widgetOfTypeMatcher =3D WidgetMatcherFactory.widge= tOfType(StyledText.class); + final List styledTexts =3D compareEditor.bot().widgets(widgetOfType= Matcher,compareEditor.getWidget()); + String newVersionEditorText =3D syncExec(new StringResult() { + public String run() { + return ((StyledText)styledTexts.get(0)).getText(); + } + }); + String revisionEditorText =3D syncExec(new StringResult() { + public String run() { + return ((StyledText)styledTexts.get(1)).getText(); + } + }); + compareEditor.close(); + assertTrue("Actual version of file opened within compare editor has wr= ong content.\n" + + "Content should start with " + secondAddedChange + + "\n but is " + newVersionEditorText,newVersionEditorText.startsWith(= secondAddedChange)); + assertTrue("File stored in Guvnor Repository opened within compare edi= tor has wrong content.\n" + + "Content should start with " + addedChange + + "\n but is " + revisionEditorText,revisionEditorText.startsWith(adde= dChange)); + // Open Revision + guvnorResourceHistoryView.show(); + guvnorResourceHistoryTable.setFocus(); + bot.sleep(Timing.time1S()); + guvnorResourceHistoryTable.select(0); + bot.sleep(Timing.time1S()); + KeyboardHelper.pressKeyCodeUsingAWT(KeyEvent.VK_ENTER); + KeyboardHelper.releaseKeyCodeUsingAWT(KeyEvent.VK_ENTER); + bot.sleep(Timing.time1S()); + SWTBotEditor revisonFileEditor =3D eclipse.editorStartsWith(testFileNa= me); + String revisionFileText =3D revisonFileEditor.toTextEditor().getText(); + revisonFileEditor.close(); + assertTrue("File stored in Guvnor Repository has wrong content.\n" + + "Content should start with " + addedChange + + "\n but is " + revisionFileText,revisionFileText.startsWith(addedC= hange)); + // Switch to version + editor =3D packageExplorer.openFile(DroolsAllBotTests.DROOLS_PROJECT_N= AME, = + DroolsAllBotTests.SRC_MAIN_RULES_TREE_NODE, + tiTestRuleFile.getText()); + ContextMenuHelper.prepareTreeItemForContextMenu(packageExplorerTree, t= iTestRuleFile); + ContextMenuHelper.clickContextMenu(packageExplorerTree, + IDELabel.Menu.GUVNOR,IDELabel.Menu.GUVNOR_SWITCH_TO_VERSION); + eclipse.waitForShell(""); + guvnorResourceHistoryBot.activeShell().bot().button(IDELabel.Button.OK= ).click(); + bot.sleep(Timing.time3S()); + String editorText =3D editor.toTextEditor().getText(); = + assertTrue("Switched version of file has wrong content.\n" + + "Content should start with " + addedChange + + "\n but is " + editorText,editorText.startsWith(addedChange)); + } } \ No newline at end of file Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/smoke/OpenDroolsPerspective.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/OpenDroolsPerspective.java 2010-05-17 15:18:28 = UTC (rev 22123) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/OpenDroolsPerspective.java 2010-05-17 15:28:59 = UTC (rev 22124) @@ -26,7 +26,7 @@ * Test Opening Drools Rules */ @Test - public void testManageDroolsProject() { + public void testOpenDroolsPerspective() { openDroolsPerspective(); } /** Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/SWTEclipseExt.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-17 15:18:28 UTC (rev 22123) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/SWTEclipseExt.java 2010-05-17 15:28:59 UTC (rev 22124) @@ -1124,7 +1124,28 @@ public void run() { shell.setMaximized(true); = - } = - }); + } = + }); } + /** + * Returns SWTBotEditor with title starting with prefix = + * @param prefix + * @return + */ + public SWTBotEditor editorStartsWith (String prefix){ + SWTBotEditor editor =3D null; + List editors =3D bot.editors(); + Iterator iterator =3D editors.iterator(); + boolean found =3D false; + while (iterator.hasNext() && !found){ + editor =3D ((SWTBotEditor)iterator.next()); = + found =3D editor.getTitle().startsWith(prefix); + } + if (found){ + return editor; + } + else{ + return null; + } + } } \ No newline at end of file Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/IDELabel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-17 15:18:28 UTC (rev 22123) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/IDELabel.java 2010-05-17 15:28:59 UTC (rev 22124) @@ -72,6 +72,9 @@ public static final String GUVNOR_ADD =3D "Add..."; public static final String GUVNOR_DELETE =3D "Delete..."; public static final String GUVNOR_DISCONNECT =3D "Disconnect"; + public static final String GUVNOR_SHOW_HISTORY =3D "Show History"; + public static final String GUVNOR_COMPARE_WITH_VERSION =3D "Compare wi= th Version..."; + public static final String GUVNOR_SWITCH_TO_VERSION =3D "Switch to Ver= sion..."; public static final String NAVIGATION =3D "Navigation"; public static final String MAXIMIZE_ACTIVE_VIEW_OR_EDITOR =3D "Maximiz= e Active View or Editor"; } @@ -188,6 +191,7 @@ public static final String PROBLEMS =3D "Problems"; public static final String DEBUG =3D "Debug"; public static final String GUVNOR_REPOSITORIES =3D "Guvnor Repositories"; + public static final String GUVNOR_RESOURCE_HISTORY =3D "Guvnor Resource = History"; public static final String PROPERTIES =3D "Properties"; } = @@ -460,6 +464,11 @@ public static final String GUVNOR_REPOSITORY_ROOT_TREE_ITEM =3D "http= ://localhost:8080/drools-guvnor/org.drools.guvnor.Guvnor/webdav"; public static final String PACKAGES_TREE_ITEM =3D "packages/"; public static final String MORTGAGE_TREE_ITEM =3D "mortgages/"; + public static final String GO_INTO_GUVNOR_REPOSITORY_TOOLTIP =3D "Go = Into"; + public static final String BACK_GUVNOR_REPOSITORY_TOOLTIP =3D "Back"; + public static final String HOME_GUVNOR_REPOSITORY_TOOLTIP =3D "Home"; + public static final String DEFAULT_PACKAGE_TREE_ITEM =3D "defaultPack= age/"; + public static final String APPLICANTDSL_DSL_TREE_ITEM =3D "ApplicantD= sl.dsl"; } = public static final class GuvnorConsole { Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/types/ViewType.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/ViewType.java 2010-05-17 15:18:28 UTC (rev 22123) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/types/ViewType.java 2010-05-17 15:28:59 UTC (rev 22124) @@ -19,7 +19,8 @@ */ public enum ViewType { PACKAGE_EXPLORER, PROJECT_EXPLORER, WELCOME, DATA_SOURCE_EXPLORER, - SERVERS,WEB_PROJECTS,PROBLEMS,DEBUG,GUVNOR_REPOSITORIES,PROPERTIES; + SERVERS,WEB_PROJECTS,PROBLEMS,DEBUG,GUVNOR_REPOSITORIES,PROPERTIES, + GUVNOR_RESOURCE_HISTORY; = = public String getGroupLabel() { @@ -34,6 +35,7 @@ case DEBUG: viewLabel =3D IDELabel.ViewGroup.DEBUG; break; case GUVNOR_REPOSITORIES: viewLabel =3D IDELabel.ViewGroup.GUVNOR; brea= k; case PROPERTIES: viewLabel =3D IDELabel.ViewGroup.GENERAL; break; + case GUVNOR_RESOURCE_HISTORY: viewLabel =3D IDELabel.ViewGroup.GUVNOR; = break; default: fail("Unknown View Type"); } return viewLabel; = @@ -51,6 +53,7 @@ case DEBUG: viewLabel =3D IDELabel.View.DEBUG; break; case GUVNOR_REPOSITORIES: viewLabel =3D IDELabel.View.GUVNOR_REPOSITORI= ES; break; case PROPERTIES: viewLabel =3D IDELabel.View.PROPERTIES; break; + case GUVNOR_RESOURCE_HISTORY: viewLabel =3D IDELabel.View.GUVNOR_RESOUR= CE_HISTORY; break; default: fail("Unknown View Type"); } return viewLabel; --===============4487991402943670878==-- From jbosstools-commits at lists.jboss.org Mon May 17 11:58:03 2010 Content-Type: multipart/mixed; boundary="===============3414911059544520617==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22125 - branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console. Date: Mon, 17 May 2010 11:58:03 -0400 Message-ID: <201005171558.o4HFw3TM024284@svn01.web.mwc.hst.phx2.redhat.com> --===============3414911059544520617== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-17 11:58:03 -0400 (Mon, 17 May 2010) New Revision: 22125 Modified: branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse/s= rc/org/hibernate/console/ConsoleConfiguration.java Log: https://jira.jboss.org/browse/JBIDE-5997 - (and JBIDE-5839) fix in simplest= manner Modified: branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.ec= lipse/src/org/hibernate/console/ConsoleConfiguration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse/= src/org/hibernate/console/ConsoleConfiguration.java 2010-05-17 15:28:59 UTC= (rev 22124) +++ branches/jbosstools-3.1.x/hibernatetools/plugins/org.hibernate.eclipse/= src/org/hibernate/console/ConsoleConfiguration.java 2010-05-17 15:58:03 UTC= (rev 22125) @@ -325,11 +325,6 @@ Properties properties =3D prefs.getProperties(); = if(properties!=3Dnull) { - // to fix: JBIDE-5839 - setup this property: false is default value = - // to make hibernate tools diff hibernate versions compatible - if (properties.getProperty("hibernate.search.autoregister_listeners"= ) =3D=3D null) { //$NON-NLS-1$ - properties.setProperty("hibernate.search.autoregister_listeners", "= false"); //$NON-NLS-1$ //$NON-NLS-2$ - } // in case the transaction manager is empty then we need to inject a= faketm since hibernate will still try and instantiate it. String str =3D properties.getProperty( "hibernate.transaction.manage= r_lookup_class" ); //$NON-NLS-1$ if(str !=3D null && StringHelper.isEmpty( str )) { @@ -365,6 +360,12 @@ // TODO: HBX- localCfg.setProperty( "hibernate.temp.use_jdbc_metadata_defaults", "f= alse" ); //$NON-NLS-1$//$NON-NLS-2$ localCfg.setProperty( Environment.HBM2DDL_AUTO, "false" ); //$NON-NLS= -1$ + // to fix: JBIDE-5839 & JBIDE-5997 - setup this property: false is de= fault value = + // to make hibernate tools diff hibernate versions compatible: + // if the property not set get NoSuchMethodError with FullTextIndexEv= entListener + if (localCfg.getProperty("hibernate.search.autoregister_listeners") = =3D=3D null) { //$NON-NLS-1$ + localCfg.setProperty("hibernate.search.autoregister_listeners", "fal= se"); //$NON-NLS-1$ //$NON-NLS-2$ + } = return localCfg; } --===============3414911059544520617==-- From jbosstools-commits at lists.jboss.org Mon May 17 12:02:21 2010 Content-Type: multipart/mixed; boundary="===============4639268531283073383==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22126 - trunk/bpel/docs/reference/en-US/modules. Date: Mon, 17 May 2010 12:02:21 -0400 Message-ID: <201005171602.o4HG2Ls8025030@svn01.web.mwc.hst.phx2.redhat.com> --===============4639268531283073383== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-17 12:02:20 -0400 (Mon, 17 May 2010) New Revision: 22126 Modified: trunk/bpel/docs/reference/en-US/modules/install.xml Log:

https://jira.jboss.org/browse/TOOLSDOC-48 - Updated "Installation J= Boss BPEL Runtime" section and added the info about the prerequisites.=

Modified: trunk/bpel/docs/reference/en-US/modules/install.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/docs/reference/en-US/modules/install.xml 2010-05-17 15:58:03= UTC (rev 22125) +++ trunk/bpel/docs/reference/en-US/modules/install.xml 2010-05-17 16:02:20= UTC (rev 22126) @@ -28,19 +28,35 @@
Installation JBoss BPEL Runtime - Unpack the JBossAS installation archive into t= he required location.Then in the = + + Unpack the JBossAS installation archive into the req= uired location. = + + + + Unpack the RiftSaw distribution into the location + alongside the JBossAS installation: + + + Edit the install/deployment.proper= ties file to update = + the JBossAS location settings. + + + + From the install folder, + run: ant deploy -Ddatabase=3Dhsql + to deploy RiftSaw to JBossAS. + + + + + + Then in the = ${RiftSaw}/install folder run the com= mand: ant deploy -Ddatabase=3Dhsql -Dws.stack=3Dnative= -Dws.version=3D3.2.2.GA = - It will help you to download the web service stack, and th= en upgrade it for JBoss AS. = - - Unpack the RiftSaw distribution into the locat= ion alongside the JBossAS installation. - * Edit the install/deployment.properties file to update the JBossAS location settings. - * From the install folder, run: ant deploy -Ddatabase=3Dhsql - to deploy RiftSaw to JBossAS. - - - = + It will help you to download the web service stack, and th= en upgrade it for JBoss AS. + + + = - =
\ No newline at end of file --===============4639268531283073383==-- From jbosstools-commits at lists.jboss.org Mon May 17 13:37:24 2010 Content-Type: multipart/mixed; boundary="===============1321074805128478838==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22127 - trunk/jmx/docs/reference/en-US. Date: Mon, 17 May 2010 13:37:24 -0400 Message-ID: <201005171737.o4HHbOss015760@svn01.web.mwc.hst.phx2.redhat.com> --===============1321074805128478838== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-17 13:37:24 -0400 (Mon, 17 May 2010) New Revision: 22127 Modified: trunk/jmx/docs/reference/en-US/introduction.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-49 Updated the Introduction section Modified: trunk/jmx/docs/reference/en-US/introduction.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/docs/reference/en-US/introduction.xml 2010-05-17 16:02:20 UTC= (rev 22126) +++ trunk/jmx/docs/reference/en-US/introduction.xml 2010-05-17 17:37:24 UTC= (rev 22127) @@ -1,133 +1,268 @@ - - - - - Introduction - JBoss Tools' JMX project is a fork of eclipse-jmx, a p= roject by Jeff Mesnil. - It was forked with permission. - = -
- What is JMX? - -The Java Management Extensions (JMX) technology is a standard part of the = Java Platform, Standard Edition (Java SE platform). The JMX technology was = added to the platform in the Java 2 Platform, Standard Edition (J2SE) 5.0 r= elease. - - -The JMX technology provides a simple, standard way of managing resources s= uch as applications, devices, and services. Because the JMX technology is d= ynamic, you can use it to monitor and manage resources as they are created,= installed and implemented. You can also use the JMX technology to monitor = and manage the Java Virtual Machine (Java VM). - - -The JMX specification defines the architecture, design patterns, APIs, and= services in the Java programming language for management and monitoring of= applications and networks. - - -Using the JMX technology, a given resource is instrumented by one or more = Java objects known as Managed Beans, or MBeans. These MBeans are registered= in a core-managed object server, known as an MBean server. The MBean serve= r acts as a management agent and can run on most devices that have been ena= bled for the Java programming language. = - - - -The specifications define JMX agents that you use to manage any resources = that have been correctly configured for management. A JMX agent consists of= an MBean server, in which MBeans are registered, and a set of services for= handling the MBeans. In this way, JMX agents directly control resources an= d make them available to remote management applications. - - -The way in which resources are instrumented is completely independent from= the management infrastructure. Resources can therefore be rendered managea= ble regardless of how their management applications are implemented. - - -The JMX technology defines standard connectors (known as JMX connectors) t= hat enable you to access JMX agents from remote management applications. JM= X connectors using different protocols provide the same management interfac= e. Consequently, a management application can manage resources transparentl= y, regardless of the communication protocol used. JMX agents can also be us= ed by systems or applications that are not compliant with the JMX specifica= tion, as long as those systems or applications support JMX agents. = - -Read more about JMX. -
- = -
- What is JMX Tools? - JBoss JMX Tools allow to setup multiple JMX = connections and provide view - for exploring the JMX tree and execute operations directly from Eclips= e. - - This chapter covers the basics of working with JMX plugi= n, which is - used to manage Java applications through JMX and its RMI Connector. - -
- JMX Tools - - - - - -
-
- -
Key Features of JMX Tools - For a start, we propose you to look through the table of main fe= atures of JMX Tools: - - = - Key Functionality for JMX Tools - - = - - - - = - - - Feature - Benefit - Chapter - - - = - - = - - MBean Explorer - MBean Explorer is a useful view with a text filte= r that displays domains, mbeans, attributes, and operations inside a connec= tion. - - MBean Explorer - - - = - - MBean Editor - MBean Editor is a multi-page editor to manage MBe= ans. - - MBean Editor - - - - -
-
- = -
- Requirements and Installation -
- Requirements - Requirements to use JMX Tools are the follo= wing: - = - - - JMX Tools is developed on Eclipse 3.4.x= milestones - - - JMX Tools requires that Eclipse is run = on a JDK 1.5.0 or above - (due to dependencies on JMX packages which were introduced in Ja= va 1.5.0) - - -
-
- Installation - Here, we are going to explain how to install the JMX p= lugin into - Eclipse. - - JMX Tools is one module of the JB= oss Tools - project. JMX Tools has no dependency on any oth= er part of JBoss - Tools, and can be downloaded standalone. Even though th= e JMX - Tools have no dependencies, other plugins, such as AS Tools, - do depend on the JMX Tooling and even extend it. - - You can find the JBoss Tools plugins over a= t the download pages. The only - package you'll need to get is the JMX Tooling, however the AS - Tools would give you a more full experience when using = JMX with JBoss Servers. - You can find further download and installation instructions on the J= Boss Wiki in the Installin= gJBossTools - section. -
-
- \ No newline at end of file +<<<<<<< .mine + + + + + Introduction + JBoss Tools' JMX project is a fork of eclipse-jmx, a p= roject by Jeff Mesnil. + It was forked with permission. + = +
+ What is JMX? + +The Java Management Extensions (JMX) technology is a standard part of the = Java Platform, Standard Edition (Java SE platform). The JMX technology was = added to the platform in the Java 2 Platform, Standard Edition (J2SE) 5.0 r= elease. + + +The JMX technology provides a simple, standard way of managing resources s= uch as applications, devices, and services. Because the JMX technology is d= ynamic, you can use it to monitor and manage resources as they are created,= installed and implemented. You can also use the JMX technology to monitor = and manage the Java Virtual Machine (Java VM). + + +The JMX specification defines the architecture, design patterns, APIs, and= services in the Java programming language for management and monitoring of= applications and networks. + + +Using the JMX technology, a given resource is instrumented by one or more = Java objects known as Managed Beans, or MBeans. These MBeans are registered= in a core-managed object server, known as an MBean server. The MBean serve= r acts as a management agent and can run on most devices that have been ena= bled for the Java programming language. = + + = + +The specifications define JMX agents that you use to manage any resources = that have been correctly configured for management. A JMX agent consists of= an MBean server, in which MBeans are registered, and a set of services for= handling the MBeans. In this way, JMX agents directly control resources an= d make them available to remote management applications. + + +The way in which resources are instrumented is completely independent from= the management infrastructure. Resources can therefore be rendered managea= ble regardless of how their management applications are implemented. + + +The JMX technology defines standard connectors (known as JMX connectors) t= hat enable you to access JMX agents from remote management applications. JM= X connectors using different protocols provide the same management interfac= e. Consequently, a management application can manage resources transparentl= y, regardless of the communication protocol used. JMX agents can also be us= ed by systems or applications that are not compliant with the JMX specifica= tion, as long as those systems or applications support JMX agents. = + +Read more about JMX. +
+ = +
+ What is JMX Tools? + JBoss JMX Tools allow to setup multiple JMX = connections and provide view + for exploring the JMX tree and execute operations directly from Eclips= e. + + This chapter covers the basics of working with JMX plugi= n, which is + used to manage Java applications (with Managed Beans) through JMX and = its RMI Connector. + +
+ JMX Tools + + + + + +
+
+ +
Key Features of JMX Tools + For a start, we propose you to look through the table of main fe= atures of JBoss JMX Tools: + + = + Key Functionality for JBoss JMX Tools + + = + + + + = + + + Feature + Benefit + Chapter + + + = + + = + + MBean Explorer + MBean Explorer is a useful view with a text filte= r that displays domains, mbeans, attributes, and operations inside a connec= tion. + + MBean Explorer + + + = + + MBean Editor + MBean Editor is a multi-page editor to manage MBe= ans. + + MBean Editor + + + + +
+
+ = +
+ Requirements and Installation +
+ Requirements + Requirements to use JBoss JMX Tools are th= e following: + = + + + JBoss JMX Tools is developed on Eclipse= 3.4.x milestones + + + JBoss JMX Tools requires that Eclipse i= s run on a JDK 1.5.0 or above + (due to dependencies on JMX packages which were introduced in Ja= va 1.5.0) + + +
+
+ Installation + Here, we are going to explain how to install the JMX p= lugin into + Eclipse. + + JBoss JMX Tools is one module of the JBoss Tools + project. JBoss JMX Tools has no dependency on = any other part of JBoss + Tools, and can be downloaded as a standalone Eclipse pl= ugin. Even though the JMX + Tools have no dependencies on other plugins, such as AS Tools, + JBoss JMX Tools do depend on the JMX Tooling and= even extend it. + + You can find the JBoss JBoss Tools plugins = over at the download pages. The only + package you'll need to get is the JBoss JMX Tooling, however t= he AS + Tools would give you a wider experience and more option= s when using JMX with JBoss Servers. + You can find further download and installation instructions on the J= Boss Wiki in the Installin= gJBossTools + section. +
+
+ +=3D=3D=3D=3D=3D=3D=3D + + + + + Introduction + JBoss Tools' JMX project is a fork of eclipse-jmx, a p= roject by Jeff Mesnil. + It was forked with permission. + = +
+ What is JMX? + +The Java Management Extensions (JMX) technology is a standard part of the = Java Platform, Standard Edition (Java SE platform). The JMX technology was = added to the platform in the Java 2 Platform, Standard Edition (J2SE) 5.0 r= elease. + + +The JMX technology provides a simple, standard way of managing resources s= uch as applications, devices, and services. Because the JMX technology is d= ynamic, you can use it to monitor and manage resources as they are created,= installed and implemented. You can also use the JMX technology to monitor = and manage the Java Virtual Machine (Java VM). + + +The JMX specification defines the architecture, design patterns, APIs, and= services in the Java programming language for management and monitoring of= applications and networks. + + +Using the JMX technology, a given resource is instrumented by one or more = Java objects known as Managed Beans, or MBeans. These MBeans are registered= in a core-managed object server, known as an MBean server. The MBean serve= r acts as a management agent and can run on most devices that have been ena= bled for the Java programming language. = + + + +The specifications define JMX agents that you use to manage any resources = that have been correctly configured for management. A JMX agent consists of= an MBean server, in which MBeans are registered, and a set of services for= handling the MBeans. In this way, JMX agents directly control resources an= d make them available to remote management applications. + + +The way in which resources are instrumented is completely independent from= the management infrastructure. Resources can therefore be rendered managea= ble regardless of how their management applications are implemented. + + +The JMX technology defines standard connectors (known as JMX connectors) t= hat enable you to access JMX agents from remote management applications. JM= X connectors using different protocols provide the same management interfac= e. Consequently, a management application can manage resources transparentl= y, regardless of the communication protocol used. JMX agents can also be us= ed by systems or applications that are not compliant with the JMX specifica= tion, as long as those systems or applications support JMX agents. = + +Read more about JMX. +
+ = +
+ What is JMX Tools? + JBoss JMX Tools allow to setup multiple JMX = connections and provide view + for exploring the JMX tree and execute operations directly from Eclips= e. + + This chapter covers the basics of working with JMX plugi= n, which is + used to manage Java applications through JMX and its RMI Connector. + +
+ JMX Tools + + + + + +
+
+ +
Key Features of JMX Tools + For a start, we propose you to look through the table of main fe= atures of JMX Tools: + + = + Key Functionality for JMX Tools + + = + + + + = + + + Feature + Benefit + Chapter + + + = + + = + + MBean Explorer + MBean Explorer is a useful view with a text filte= r that displays domains, mbeans, attributes, and operations inside a connec= tion. + + MBean Explorer + + + = + + MBean Editor + MBean Editor is a multi-page editor to manage MBe= ans. + + MBean Editor + + + + +
+
+ = +
+ Requirements and Installation +
+ Requirements + Requirements to use JMX Tools are the follo= wing: + = + + + JMX Tools is developed on Eclipse 3.4.x= milestones + + + JMX Tools requires that Eclipse is run = on a JDK 1.5.0 or above + (due to dependencies on JMX packages which were introduced in Ja= va 1.5.0) + + +
+
+ Installation + Here, we are going to explain how to install the JMX p= lugin into + Eclipse. + + JMX Tools is one module of the JB= oss Tools + project. JMX Tools has no dependency on any oth= er part of JBoss + Tools, and can be downloaded standalone. Even though th= e JMX + Tools have no dependencies, other plugins, such as AS Tools, + do depend on the JMX Tooling and even extend it. + + You can find the JBoss Tools plugins over a= t the download pages. The only + package you'll need to get is the JMX Tooling, however the AS + Tools would give you a more full experience when using = JMX with JBoss Servers. + You can find further download and installation instructions on the J= Boss Wiki in the Installin= gJBossTools + section. +
+
+>>>>>>> .r22100 --===============1321074805128478838==-- From jbosstools-commits at lists.jboss.org Mon May 17 13:38:13 2010 Content-Type: multipart/mixed; boundary="===============5560583919555895082==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22128 - trunk/jmx/docs/reference/en-US. Date: Mon, 17 May 2010 13:38:12 -0400 Message-ID: <201005171738.o4HHcCMX015777@svn01.web.mwc.hst.phx2.redhat.com> --===============5560583919555895082== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-17 13:38:12 -0400 (Mon, 17 May 2010) New Revision: 22128 Modified: trunk/jmx/docs/reference/en-US/introduction.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-49 Corrected minor error Modified: trunk/jmx/docs/reference/en-US/introduction.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/docs/reference/en-US/introduction.xml 2010-05-17 17:37:24 UTC= (rev 22127) +++ trunk/jmx/docs/reference/en-US/introduction.xml 2010-05-17 17:38:12 UTC= (rev 22128) @@ -261,7 +261,7 @@ package you'll need to get is the JMX Tooling, however the AS Tools would give you a more full experience when using = JMX with JBoss Servers. You can find further download and installation instructions on the J= Boss Wiki in the Installin= gJBossTools + url=3D"http://www.jboss.org/tools/download/installation">Installin= g JBoss Tools section. --===============5560583919555895082==-- From jbosstools-commits at lists.jboss.org Mon May 17 14:26:10 2010 Content-Type: multipart/mixed; boundary="===============4788760872392088820==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22129 - trunk/jmx/docs/reference/en-US. Date: Mon, 17 May 2010 14:26:10 -0400 Message-ID: <201005171826.o4HIQAo9028049@svn01.web.mwc.hst.phx2.redhat.com> --===============4788760872392088820== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-17 14:26:10 -0400 (Mon, 17 May 2010) New Revision: 22129 Modified: trunk/jmx/docs/reference/en-US/tasks.xml Log: https://jira.jboss.org/jira/browse/TOOLSDOC-49 Corrected minor error Modified: trunk/jmx/docs/reference/en-US/tasks.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/docs/reference/en-US/tasks.xml 2010-05-17 17:38:12 UTC (rev 2= 2128) +++ trunk/jmx/docs/reference/en-US/tasks.xml 2010-05-17 18:26:10 UTC (rev 2= 2129) @@ -219,13 +219,13 @@ be found in the AS Tools section, however, the short summary i= s: - Open the Servers view + Open the Servers view. = Right-click in the view and select New > Server - + . = @@ -233,27 +233,27 @@ JBoss Enterprise Middleware or in JBoss Community - section, select a server version + section, select a server version. = If a runtime has not yet been created, you'll b= e prompted for the - server's home directory, JDK, and configuration + server's home directory, JDK, and configuration. = Finish the wizard and note that you have a new entry= in both the Servers view and the MB= ean - Explorer + Explorer. = Start the server by right-clicking it and selecting = - Start + Start. Note that once the server is started, the JMX connec= tion can be - expanded + expanded. = --===============4788760872392088820==-- From jbosstools-commits at lists.jboss.org Mon May 17 15:17:02 2010 Content-Type: multipart/mixed; boundary="===============3857887414266539823==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22130 - in trunk: build and 1 other directory. Date: Mon, 17 May 2010 15:17:01 -0400 Message-ID: <201005171917.o4HJH14M007246@svn01.web.mwc.hst.phx2.redhat.com> --===============3857887414266539823== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 15:17:01 -0400 (Mon, 17 May 2010) New Revision: 22130 Added: trunk/pom-all-components.xml trunk/pom.xml Modified: trunk/build/build.xml trunk/genpom.xml trunk/parent-pom.xml Log: merge from branch into trunk Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-17 18:26:10 UTC (rev 22129) +++ trunk/build/build.xml 2010-05-17 19:17:01 UTC (rev 22130) @@ -1,62 +1,129 @@ - - - + = - + + + + - = - + = - - + + = + + + + + + + + + + To run this script in Eclipse: - Run As > Ant Build + Run As > Ant Build = -To run this script via commandline (build default modules + run tests): - cd /home/nboldt/workspace36/jbosstools-modular_build; ant +To run this script via commandline (build default modules + run tests, the= n collect test results and build per-component + overall update site zips): + cd /path/to/checked/out/source/tree; ant = or, to build everything but not *run* the tests: - cd /home/nboldt/workspace36/jbosstools-modular_build; ant -DMAVEN_FLAGS= =3D"clean install -Dmaven.test.skip" + ant -DMAVEN_FLAGS=3D"clean install -Dmaven.test.skip" + or + ant -Dnotests=3Dtrue = -or, to build specific module(s): = - cd /home/nboldt/workspace36/jbosstools-modular_build; ant -DCOMPONENTS=3D= tests,common,flow,jbpm +or, to purge the local repo (or purge then build): + ant purge -q + or + ant clean-run = or, to rebuild even if sources have not changed: - cd /home/nboldt/workspace36/jbosstools-modular_build; ant -DCOMPONENTS=3D= tests,common -Dbuild.if.sources.unchanged=3Dtrue + ant -Dbuild.if.sources.unchanged=3Dtrue = +or, to fetch fresh sources, then build anew: + ant -Dclean.sources=3Dtrue + or, to (re-)run tests w/o (re-)building first: - cd /home/nboldt/workspace36/jbosstools-modular_build; ant -DCOMPONENTS=3D= tests,common,jmx -DMAVEN_FLAGS=3D"osgi-test:test -B -fn" + ant -DMAVEN_FLAGS=3D"osgi-test:test -B -fn" + = +or, to build, test, and install 1 or more specific module(s): = + ant -DCOMPONENTS=3Dtests,common,flow,jbpm = +or, to re-build a single component's update site w/o building, testing, an= d installing it into the m2 repo: + ant -DCOMPONENT=3Djmx create.update.site + +or, to re-build the overall update site w/o building first (no applicable = when COMPONENTS=3D.): + ant create.overall.update.site -Dbuild.if.sources.unchanged=3Dtrue + +To have hudson manage sources (rather than having this script checkout/upd= ate them) use: = + -Dhudson.managed.sources=3Dtrue + = +Note: if tests stall on Linux, install Xvfb and this script will use that = to run Maven, unless use: + -DnoXvfb=3Dtrue + Here is the order in which components must be built: - + - + = + + + + + + + + + + + + + + + + + + = + + + + + + @@ -90,18 +157,67 @@ = + ${os.name}, ${os.arch}, ${os.version}, ${osgi.os}<= /echo> - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Error! +Build cannot proceed! + Must install svnant.jar, svnkit.jar + svnClientAdapter.jar from = + ${SVNANT_MIRROR}/svnant-1.3.0.zip = + into ${COMMON_TOOLS}/. + + + + + + + Warning! = +Svnant unavailable. Will use Maven to fetch sources. + + + = @@ -120,15 +236,24 @@ = + + - ${now} + ${now} @{info} = + + + + + + + @@ -153,6 +278,7 @@ = + @@ -167,7 +293,7 @@ = - + = @@ -180,42 +306,115 @@ - - - - + Update '@{COMPONENT}' + + + + + + + + + + + + + + + + + + + + + + + + + - Fetch sources from ${svn.root}/@{component} int= o ${WORKINGDIR}/@{component} - - - + Fetch sources from ${svn.root}/@{component} into= ${WORKINGDIR}/@{component} + + + + + + + + + + + + + + + = - - - + + + + + + + + svn.info.@{co= mponent}.rev =3D ${svn.info.@{component}.rev} - + = + + + + + + + + + - + + + + + + + + + + + + @@ -238,13 +437,18 @@ - - - + + + + + + + + @@ -268,7 +472,7 @@ - + @@ -291,60 +495,242 @@ = + + + + + + + + + + - - + - All components up to date: nothing to do! + + + + + All components up to date: nothing to do! To force a build of unchanged components, use -Dbuild.if.sources.unchanged= =3Dtrue = - - - - <?xml version=3D"1.0" encoding=3D"UTF-8" ?> + + + + <?xml version=3D"1.0" encoding=3D"UTF-8" ?> <testsuite failures=3D"0" time=3D"0.001" errors=3D"0" skipped=3D"0" tes= ts=3D"1" name=3D"org.jboss.tools.NoTestsRun"> <testcase time=3D"0.001" classname=3D"org.jboss.tools.NoTestsRun" nam= e=3D"NoTestsRun"/> </testsuite> + + + + + + + + + The following components' sources have chan= ged and will be built: + COMPONENTS.to.build =3D ${COMPONENTS.to.build} + + + + + + + + + + + + + = - + + + + + + + + + + + + + + + + + + + + + + + - - + + + + Build overall update @{COMPONENT} + + + Build '@{COMPONENT}' component + + + + + + + + + + + + + + + + + Run custom '@{COMPONENT}/build.xml' + + + + + + + + - Exe: ${COMMON_TOOLS}/apache-maven-${maven.vers= ion}/bin/mvn - Pom: ${WORKINGDIR}/@{COMPONENT}/pom.xml - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + Builds done = + + + + Exe: ${COMMON_TOOLS}/apache-maven-${maven.versio= n}/bin/${mvnExe} + Pom: ${WORKINGDIR}/${COMPONENT}/pom.xml + + + + + + + + + + + + + + + + + + + + + + + + + + + ${mvnExe} ${MAVEN_FLAGS} ${maven.repo.local} + + + + + + + + + + + + + + + + + + + + #!/bin/bash +if [[ -f /tmp/.X3-lock ]]; then = +kill -9 `cat /tmp/.X3-lock` +rm -fr /tmp/.X3-lock +fi +/usr/bin/Xvfb :3 -ac 2>&1 1>/dev/null & = +DISPLAY=3D:3 /opt/maven3/bin/mvn $* +kill -9 `cat /tmp/.X3-lock` +rm -fr /tmp/.X3-lock + + + + + + + + + @@ -360,12 +746,18 @@ = - + + + + - + @@ -401,8 +793,32 @@ = - ${testsuite.name} ran ${testsuite.tests} tests in= ${testsuite.time}s${testsuite.skipped}${testsuite.errors}${testsuite.failu= res} = - + + + + + + + + + + + + + + + + + + + + + + @@ -411,110 +827,583 @@ + ------------------------------------------------= ------- + A L L T E S T R E S U L T S = +------------------------------------------------------- +${test.results.all} +------------------------------------------------------- + + + + + + + + + + + ------------------------------------------------= ------- + T E S T R E S U L T S = +------------------------------------------------------- +${test.results.errors.failures.skipped} +------------------------------------------------------- + + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = + + + + + + + + + + + + + + + + + @{COMPONENT} :: ${updateZip} + + + + + + + + + :: @{featureJar} + + + + + + + @{COMPONENT} :: ${updateZip} + + + + + + + + + + No update site found for @{COMPONENT}. + + + + + + + + + = - - - + + + + + + All components up to date: nothing to do! +To force a build of unchanged components, use -Dbuild.if.sources.unchanged= =3Dtrue + + + = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = - - - - + + + + = - Promote build in ${sourceZipsDirActual} ... - - - + + + + + + + - + - - - - - - + - - Copy ${aBuildDir} into ${targetZipsDir}/ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + Overall update site zip contains no features! + + + Update site zip for ${COMPONENTS.to.build} cont= ains no features! + + + = - + + + + + + + + + + + + + + + + + + + + + + + + + + <project xsi:schemaLocation=3D"http:= //maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" x= mlns=3D"http://maven.apache.org/POM/4.0.0" xmlns:xsi=3D"http://www.w3.org/2= 001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> = + <parent> + <relativePath>../../parent-pom.xml</relativePath> + <groupId>org.jboss.tools</groupId> + <artifactId>org.jboss.tools.parent.pom</artifactId> + <version>0.0.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools</groupId> + <artifactId>${COMPONENT}.site</artifactId> = + <version>0.0.1-SNAPSHOT</version> + <packaging>${packaging}</packaging> +</project> + + + + + + + + + + + <?xml version=3D"1.0" enc= oding=3D"UTF-8"?> +<site> + <description>To install these features, point Eclipse at this site.= </description> + <!-- ${category.name} --> + <category-def label=3D"${category.name}" name=3D"${category.name}"> + <description>${category.name}: contains all features in this build= .</description> + </category-def> + + + + + + + + + + + + + + <featu= re url=3D"features/${feature.id}_0.0.0.jar" id=3D"${feature.id}" version=3D= "0.0.0"> + <category name=3D"${category.name}"/> + </feature> + + + + + + +</site> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${WORKINGDIR}/${COMPONENT}/features + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + - - - - - - - - - - - - - - - - + bin.includes =3D feat= ure.*, ., plugin.*, about.*, META-INF/, .options/, lib/, help/, icons/, org= /, src/ + - = + + + + + + + + + + + + Promote build in ${sourceDir} ... + + + + + + + + + + + + + + ERROR! +Cannot deploy - please install scp or rsync on this server and try again. + + + + + + + + + + + + + ERROR! +Cannot deploy - sourceDir not found in = + ${sourceDir} + + + + + + = @@ -522,7 +1411,7 @@ = - + = @@ -534,14 +1423,317 @@ = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + = - + + = + + + + + + + + + + + + + + + + + Test feature.ids for @{COMPONENT} + + + + + + Test @{artifactJar} + + + + + + + + + + + + + + + + + + + + + + + Test plugin.ids for @{COMPONENT} + + + + + + [1] Test @{artifactJar} + + + + + + + + + + + + + + + + [2] Test @{artifactJar} + + + + + + + + + + + + + + + + + + + + - + @@ -589,9 +1781,9 @@ - - + @@ -599,9 +1791,9 @@ - + - + @@ -626,13 +1818,14 @@ + - - + @@ -640,9 +1833,9 @@ - + - + @@ -664,13 +1857,14 @@ = 5/6: Test info w/o update + - - + @@ -678,9 +1872,9 @@ - + - + @@ -701,11 +1895,42 @@ ---------------------------------- = - - + + - + + = + + foobar! + + error! + info! + + + + + + + + + + + + + Modified: trunk/genpom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/genpom.xml 2010-05-17 18:26:10 UTC (rev 22129) +++ trunk/genpom.xml 2010-05-17 19:17:01 UTC (rev 22130) @@ -2,27 +2,34 @@ - + + = - - + + + +To run this script in Eclipse: + Run As > Ant Build = +To run this script via commandline: + ant -f genpom.xml -q = + +or, to build a specific module IFF no poms already exist: + ant -f genpom.xml -q -DCOMPONENT=3Dxulrunner + +or, to build a specific module and overwrite existing pom.xml files: + ant -f genpom.xml -q -DCOMPONENT=3Dcommon -Doverwrite.existing.pom.xml= =3Dtrue + + + = - - + + + + + + + + = + + + + + + WORKINGDIR =3D ${WORKINGDIR} + + + + + + COMMON_TOOLS =3D ${COMMON_TOOLS} + @@ -58,6 +87,8 @@ = + + = @@ -102,6 +133,17 @@ /> Agg dir: ${activeDir}, artifactType: ${arti= factType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion}, = parentpom: @{parentpom} + + + + + + + + + + + @@ -191,6 +233,17 @@ /> Mod dir: ${activeDir}, artifactType: ${arti= factType}, artifactId: ${artifactId}, artifactVersion: ${artifactVersion}, = parentpom: @{parentpom} + + + + + + + + + + + @@ -312,6 +365,17 @@ + + + + + + + + + + + - + + + + + writeModulePom dir=3D"@{subdir}" parentpom= =3D"${pathToParentPom}@{parentpom}" + + + @@ -393,69 +464,110 @@ = - - - - - - Error: no parent-pom.xml found in ${WORKINGDIR}/${pathToParentPo= m} - - + = - - - + + + + + + - - + + + + + + + + + + - COMPONENT =3D ${COMPONENT}, pathToParentPom =3D = ${pathToParentPom} + + + + COMPONENT =3D '${COMPONENT}' + + + + + + Error: no parent-pom.xml found in ${WORKINGDIR}/${pathToParent= PomInput} + + = - - + = - - - - - - - - - + + + + + + + + + = - - - + + + = - - - - - - - - - - - - - - - ${WORKINGDIR}/${COMPONENT} :: Modules: ${modulecoun= t}, Aggregations: ${aggregatorcount} - + + + + + + + + + + + + + + + ${WORKINGDIR}/${COMPONENT} :: Modules: ${moduleco= unt}, Aggregations: ${aggregatorcount} + + + + + + + ${show.pom.exists.warning.count} '${COMPONEN= T}' pom.xml file(s) already exist. To overwrite, use -Doverwrite.existing.p= om.xml=3Dtrue + + + + + + + + = @@ -482,7 +594,15 @@ - + + + + + + + + + @@ -735,17 +855,20 @@ = - - - + + + - - - - - + + + + + + = @@ -769,12 +892,17 @@ + = + + @@ -784,6 +912,7 @@ + = @@ -811,7 +940,7 @@ = - + = @@ -967,6 +1097,17 @@ ${WORKINGDIR}/esb/features/org.jboss.tools.esb.feature ${WORKINGDIR}/as/tests/org.jboss.ide.eclipse.as.archives.integration.test ${WORKINGDIR}/esb/plugins/org.jboss.tools.esb.core + ${WORKINGDIR}/esb/plugins/org.jboss.tools.esb.core + ${WORKINGDIR}/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui + ${WORKINGDIR}/bpel/features/org.jboss.tools.bpel.sdk.feature + ${WORKINGDIR}/bpel/plugins/org.eclipse.bpel.xpath10 + ${WORKINGDIR}/vpe/plugins/org.jboss.tools.vpe.ui.palette + ${WORKINGDIR}/tests/features/org.jboss.tools.test.feature + ${WORKINGDIR}/portlet/features/org.jboss.tools.portlet.test.feature + ${WORKINGDIR}/jst/features/org.jboss.tools.jst.feature + ${WORKINGDIR}/jst/features/org.jboss.tools.jst.web.tiles.feature + ${WORKINGDIR}/flow/tests/org.jboss.tools.flow.common.test + ${WORKINGDIR}/jbpm/tests/org.jboss.tools.flow.jpdl4.test " /> org.sonatype.tycho + maven-osgi-packaging-plugin + ${tychoVersion} + + 'v'yyyyMMdd-HHmm + true + + + + + org.sonatype.tycho tycho-maven-plugin ${tychoVersion} true = + org.apache.maven.plugins + maven-scm-plugin + 1.0 + + true + connection + + + + + org.sonatype.tycho target-platform-configuration ${tychoVersion} @@ -125,7 +146,7 @@ scm:svn:http://anonsvn.jboss.org/repos/jbosstools/$= {scmBranch} - http://anonsvn.jboss.org/repos/jbosstools/branches/${scmBranch} + http://anonsvn.jboss.org/repos/jbosstools/${scmBranch} = @@ -199,6 +220,17 @@ + svnkit13 + http://eclipse.svnkit.com/1.3.x/ + p2 + + true + + + true + + + subclipse16 http://subclipse.tigris.org/update_1.6.x/ p2 @@ -239,6 +271,7 @@ = + galileo http://download.eclipse.org/releases/galileo/ @@ -356,7 +389,7 @@ tycho - http://repository.sonatype.org/content/repositories/snapshots/ + https://repository.sonatype.org/content/repositories/snapshots/ true @@ -365,6 +398,16 @@ true + + apache-snapshots + http://repository.apache.org/snapshots/ + + true + + + true + + = + tests + common + flow + jbpm + jmx + archives + as + drools + bpel + smooks + freemarker + profiler + portlet + modeshape + xulrunner + jst + vpe + jsf + esb + tptp + ws + cdi + struts + hibernatetools + seam + examples + birt + maven + site + + + = Added: trunk/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/pom.xml (rev 0) +++ trunk/pom.xml 2010-05-17 19:17:01 UTC (rev 22130) @@ -0,0 +1,47 @@ + + 4.0.0 + + parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + trunk + 0.0.1-SNAPSHOT + pom + + + tests + common + flow + jbpm + + + + = --===============3857887414266539823==-- From jbosstools-commits at lists.jboss.org Mon May 17 15:19:48 2010 Content-Type: multipart/mixed; boundary="===============0413709193690643534==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22131 - in trunk: build and 1 other directory. Date: Mon, 17 May 2010 15:19:48 -0400 Message-ID: <201005171919.o4HJJmsc007875@svn01.web.mwc.hst.phx2.redhat.com> --===============0413709193690643534== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 15:19:48 -0400 (Mon, 17 May 2010) New Revision: 22131 Modified: trunk/build/build.xml trunk/genpom.xml Log: tweak Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-17 19:17:01 UTC (rev 22130) +++ trunk/build/build.xml 2010-05-17 19:19:48 UTC (rev 22131) @@ -18,7 +18,7 @@ /> = - + = Modified: trunk/genpom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/genpom.xml 2010-05-17 19:17:01 UTC (rev 22130) +++ trunk/genpom.xml 2010-05-17 19:19:48 UTC (rev 22131) @@ -20,6 +20,7 @@ Run As > Ant Build = To run this script via commandline: + cd /path/to/checked/out/source/tree; \ ant -f genpom.xml -q = = or, to build a specific module IFF no poms already exist: --===============0413709193690643534==-- From jbosstools-commits at lists.jboss.org Mon May 17 15:22:06 2010 Content-Type: multipart/mixed; boundary="===============2983908639824700641==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22132 - branches/modular_build/drools. Date: Mon, 17 May 2010 15:22:06 -0400 Message-ID: <201005171922.o4HJM6Rn008346@svn01.web.mwc.hst.phx2.redhat.com> --===============2983908639824700641== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 15:22:05 -0400 (Mon, 17 May 2010) New Revision: 22132 Added: branches/modular_build/drools/README.building.txt Log: drools/README.building.txt Added: branches/modular_build/drools/README.building.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/drools/README.building.txt = (rev 0) +++ branches/modular_build/drools/README.building.txt 2010-05-17 19:22:05 U= TC (rev 22132) @@ -0,0 +1,9 @@ +To build drools, you first need to run the build.xml script: + +$ ant + +Then run maven: + +$ mvn clean install + + --===============2983908639824700641==-- From jbosstools-commits at lists.jboss.org Mon May 17 15:23:51 2010 Content-Type: multipart/mixed; boundary="===============5269981914415326923==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22133 - in trunk/drools: features and 11 other directories. Date: Mon, 17 May 2010 15:23:51 -0400 Message-ID: <201005171923.o4HJNp4G008366@svn01.web.mwc.hst.phx2.redhat.com> --===============5269981914415326923== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 15:23:50 -0400 (Mon, 17 May 2010) New Revision: 22133 Added: trunk/drools/README.building.txt trunk/drools/build.xml trunk/drools/features/ trunk/drools/features/org.drools.eclipse.feature/ trunk/drools/features/org.drools.eclipse.feature/pom.xml trunk/drools/features/org.drools.eclipse.task.feature/ trunk/drools/features/org.drools.eclipse.task.feature/pom.xml trunk/drools/features/org.guvnor.tools.feature/ trunk/drools/features/org.guvnor.tools.feature/pom.xml trunk/drools/features/pom.xml trunk/drools/plugins/org.drools.eclipse.task/ trunk/drools/plugins/org.drools.eclipse.task/pom.xml trunk/drools/plugins/org.drools.eclipse/ trunk/drools/plugins/org.drools.eclipse/pom.xml trunk/drools/plugins/org.eclipse.webdav/ trunk/drools/plugins/org.eclipse.webdav/pom.xml trunk/drools/plugins/org.guvnor.tools/ trunk/drools/plugins/org.guvnor.tools/pom.xml trunk/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml trunk/drools/plugins/pom.xml trunk/drools/pom.xml trunk/drools/site/ trunk/drools/site/pom.xml trunk/drools/site/site.xml Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/META-INF/MANIFEST.MF Log: add poms, build.xml, site/, and add .qualifier to org.jboss.tools.flow.rule= flow plugin Added: trunk/drools/README.building.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/README.building.txt (rev 0) +++ trunk/drools/README.building.txt 2010-05-17 19:23:50 UTC (rev 22133) @@ -0,0 +1,9 @@ +To build drools, you first need to run the build.xml script: + +$ ant + +Then run maven: + +$ mvn clean install + + Added: trunk/drools/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/build.xml (rev 0) +++ trunk/drools/build.xml 2010-05-17 19:23:50 UTC (rev 22133) @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + WORKINGDIR =3D ${WORKINGDIR} + + + + + + + + + COMMON_TOOLS =3D ${COMMON_TOOLS} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: trunk/drools/features/org.drools.eclipse.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/features/org.drools.eclipse.feature/pom.xml = (rev 0) +++ trunk/drools/features/org.drools.eclipse.feature/pom.xml 2010-05-17 19:= 23:50 UTC (rev 22133) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.drools.eclipse.feature = + 5.1.0-SNAPSHOT + eclipse-feature + Added: trunk/drools/features/org.drools.eclipse.task.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/features/org.drools.eclipse.task.feature/pom.xml = (rev 0) +++ trunk/drools/features/org.drools.eclipse.task.feature/pom.xml 2010-05-1= 7 19:23:50 UTC (rev 22133) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.drools.eclipse.task.feature = + 5.1.0-SNAPSHOT + eclipse-feature + Added: trunk/drools/features/org.guvnor.tools.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/features/org.guvnor.tools.feature/pom.xml = (rev 0) +++ trunk/drools/features/org.guvnor.tools.feature/pom.xml 2010-05-17 19:23= :50 UTC (rev 22133) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.guvnor.tools.feature = + 5.1.0-SNAPSHOT + eclipse-feature + Added: trunk/drools/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/features/pom.xml (rev 0) +++ trunk/drools/features/pom.xml 2010-05-17 19:23:50 UTC (rev 22133) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + drools.features + 0.0.1-SNAPSHOT + pom + + org.drools.eclipse.feature + org.drools.eclipse.task.feature + org.guvnor.tools.feature + + + = \ No newline at end of file Added: trunk/drools/plugins/org.drools.eclipse/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/plugins/org.drools.eclipse/pom.xml = (rev 0) +++ trunk/drools/plugins/org.drools.eclipse/pom.xml 2010-05-17 19:23:50 UTC= (rev 22133) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.drools.eclipse = + 5.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/drools/plugins/org.drools.eclipse.task/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/plugins/org.drools.eclipse.task/pom.xml = (rev 0) +++ trunk/drools/plugins/org.drools.eclipse.task/pom.xml 2010-05-17 19:23:5= 0 UTC (rev 22133) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.drools.eclipse.task = + 5.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/drools/plugins/org.eclipse.webdav/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/plugins/org.eclipse.webdav/pom.xml = (rev 0) +++ trunk/drools/plugins/org.eclipse.webdav/pom.xml 2010-05-17 19:23:50 UTC= (rev 22133) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.eclipse.webdav = + 3.0.101 + eclipse-plugin + Added: trunk/drools/plugins/org.guvnor.tools/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/plugins/org.guvnor.tools/pom.xml (= rev 0) +++ trunk/drools/plugins/org.guvnor.tools/pom.xml 2010-05-17 19:23:50 UTC (= rev 22133) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.guvnor.tools = + 5.1.0-SNAPSHOT + eclipse-plugin + Modified: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/META-INF/MANIF= EST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/META-INF/MANIFEST.MF= 2010-05-17 19:22:05 UTC (rev 22132) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/META-INF/MANIFEST.MF= 2010-05-17 19:23:50 UTC (rev 22133) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.flow.ruleflow;singleton:=3Dtrue -Bundle-Version: 1.0.0 +Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.jboss.tools.process.ruleflow.Activator Bundle-Vendor: %Bundle-Vendor.0 Require-Bundle: = Added: trunk/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml = (rev 0) +++ trunk/drools/plugins/org.jboss.tools.flow.ruleflow/pom.xml 2010-05-17 1= 9:23:50 UTC (rev 22133) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.flow.ruleflow = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/drools/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/plugins/pom.xml (rev 0) +++ trunk/drools/plugins/pom.xml 2010-05-17 19:23:50 UTC (rev 22133) @@ -0,0 +1,22 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + drools.plugins + 0.0.1-SNAPSHOT + pom + + org.drools.eclipse + org.drools.eclipse.task + org.eclipse.webdav + org.guvnor.tools + org.jboss.tools.flow.ruleflow + + + = \ No newline at end of file Added: trunk/drools/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/pom.xml (rev 0) +++ trunk/drools/pom.xml 2010-05-17 19:23:50 UTC (rev 22133) @@ -0,0 +1,34 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + drools + 0.0.1-SNAPSHOT + pom + + plugins + features + + + + + = Added: trunk/drools/site/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/site/pom.xml (rev 0) +++ trunk/drools/site/pom.xml 2010-05-17 19:23:50 UTC (rev 22133) @@ -0,0 +1,13 @@ + + 4.0.0 = + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + drools.site = + 0.0.1-SNAPSHOT + eclipse-update-site + Added: trunk/drools/site/site.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/site/site.xml (rev 0) +++ trunk/drools/site/site.xml 2010-05-17 19:23:50 UTC (rev 22133) @@ -0,0 +1,18 @@ + + + To install these features, point Eclipse at this site. + + + JBoss Tools drools Nightly Build Update Site: contains all = features in this build. + + + + + + + + + + + + --===============5269981914415326923==-- From jbosstools-commits at lists.jboss.org Mon May 17 15:28:51 2010 Content-Type: multipart/mixed; boundary="===============3922530077881002463==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22134 - in trunk/drools: tests and 1 other directories. Date: Mon, 17 May 2010 15:28:51 -0400 Message-ID: <201005171928.o4HJSpxC008861@svn01.web.mwc.hst.phx2.redhat.com> --===============3922530077881002463== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 15:28:51 -0400 (Mon, 17 May 2010) New Revision: 22134 Added: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml trunk/drools/tests/pom.xml Modified: trunk/drools/pom.xml Log: add drools bot test to pom.xml Modified: trunk/drools/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/pom.xml 2010-05-17 19:23:50 UTC (rev 22133) +++ trunk/drools/pom.xml 2010-05-17 19:28:51 UTC (rev 22134) @@ -15,6 +15,7 @@ plugins features + tests Added: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml = (rev 0) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/pom.xml 2010-05-1= 7 19:28:51 UTC (rev 22134) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.drools.ui.bot.test = + 1.0.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/drools/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/pom.xml (rev 0) +++ trunk/drools/tests/pom.xml 2010-05-17 19:28:51 UTC (rev 22134) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + drools.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.drools.ui.bot.test + + + = --===============3922530077881002463==-- From jbosstools-commits at lists.jboss.org Mon May 17 16:47:15 2010 Content-Type: multipart/mixed; boundary="===============8429722380174937192==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22135 - trunk/tests/features/org.jboss.tools.test.sdk.feature. Date: Mon, 17 May 2010 16:47:14 -0400 Message-ID: <201005172047.o4HKlESw023969@svn01.web.mwc.hst.phx2.redhat.com> --===============8429722380174937192== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 16:47:14 -0400 (Mon, 17 May 2010) New Revision: 22135 Modified: trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml Log: set unpack=3Dtrue for common.ui, jmx.core; add new ws.ui.bot.test plugin Modified: trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-= 05-17 19:28:51 UTC (rev 22134) +++ trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-= 05-17 20:47:14 UTC (rev 22135) @@ -142,7 +142,7 @@ download-size=3D"0" install-size=3D"0" version=3D"0.0.0" - unpack=3D"false"/> + unpack=3D"true"/> = = + + + version=3D"0.0.0" + unpack=3D"true"/> = --===============2052292010026105217== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 16:54:28 -0400 (Mon, 17 May 2010) New Revision: 22136 Added: trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml trunk/ws/tests/pom.xml Log: add ws tests including new bot test (JBIDE-6274) Added: trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml = (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml 2010-05-17 20:54:28= UTC (rev 22136) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.ws.core.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml = (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.creation.core.test/pom.xml 2010-05-17= 20:54:28 UTC (rev 22136) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.ws.creation.core.test = + 1.0.0 + eclipse-plugin + Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml = (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2010-05-17 20:54:= 28 UTC (rev 22136) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.ws.ui.bot.test = + 1.0.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml = (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml 2010-05-17 20:54:28 U= TC (rev 22136) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.ws.ui.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/ws/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/pom.xml (rev 0) +++ trunk/ws/tests/pom.xml 2010-05-17 20:54:28 UTC (rev 22136) @@ -0,0 +1,21 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + ws.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.ws.core.test + org.jboss.tools.ws.creation.core.test + org.jboss.tools.ws.ui.bot.test + org.jboss.tools.ws.ui.test + + + = \ No newline at end of file --===============2052292010026105217==-- From jbosstools-commits at lists.jboss.org Mon May 17 16:55:14 2010 Content-Type: multipart/mixed; boundary="===============2510755741722470761==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22137 - in trunk/ws: features and 6 other directories. Date: Mon, 17 May 2010 16:55:14 -0400 Message-ID: <201005172055.o4HKtE84025437@svn01.web.mwc.hst.phx2.redhat.com> --===============2510755741722470761== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 16:55:13 -0400 (Mon, 17 May 2010) New Revision: 22137 Added: trunk/ws/features/org.jboss.tools.ws.feature/pom.xml trunk/ws/features/pom.xml trunk/ws/plugins/org.jboss.tools.ws.core/pom.xml trunk/ws/plugins/org.jboss.tools.ws.creation.core/pom.xml trunk/ws/plugins/org.jboss.tools.ws.creation.ui/pom.xml trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml trunk/ws/plugins/pom.xml trunk/ws/pom.xml Log: add ws pom.xml files Added: trunk/ws/features/org.jboss.tools.ws.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/features/org.jboss.tools.ws.feature/pom.xml = (rev 0) +++ trunk/ws/features/org.jboss.tools.ws.feature/pom.xml 2010-05-17 20:55:1= 3 UTC (rev 22137) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.ws.feature = + 1.0.0 + eclipse-feature + Added: trunk/ws/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/features/pom.xml (rev 0) +++ trunk/ws/features/pom.xml 2010-05-17 20:55:13 UTC (rev 22137) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + ws.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.ws.feature + + + = \ No newline at end of file Added: trunk/ws/plugins/org.jboss.tools.ws.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.core/pom.xml = (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.core/pom.xml 2010-05-17 20:55:13 UT= C (rev 22137) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.ws.core = + 1.0.0 + eclipse-plugin + Added: trunk/ws/plugins/org.jboss.tools.ws.creation.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/pom.xml = (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/pom.xml 2010-05-17 20= :55:13 UTC (rev 22137) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.ws.creation.core = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/pom.xml = (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/pom.xml 2010-05-17 20:5= 5:13 UTC (rev 22137) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.ws.creation.ui = + 1.0.0 + eclipse-plugin + Added: trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml = (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml 2010-05-17 20:55:13 UTC = (rev 22137) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.ws.ui = + 1.0.0 + eclipse-plugin + Added: trunk/ws/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/pom.xml (rev 0) +++ trunk/ws/plugins/pom.xml 2010-05-17 20:55:13 UTC (rev 22137) @@ -0,0 +1,21 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + ws.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.ws.core + org.jboss.tools.ws.creation.core + org.jboss.tools.ws.creation.ui + org.jboss.tools.ws.ui + + + = \ No newline at end of file Added: trunk/ws/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/pom.xml (rev 0) +++ trunk/ws/pom.xml 2010-05-17 20:55:13 UTC (rev 22137) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + ws + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file --===============2510755741722470761==-- From jbosstools-commits at lists.jboss.org Mon May 17 17:01:50 2010 Content-Type: multipart/mixed; boundary="===============0396205818753702116==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22138 - in trunk/as: features and 17 other directories. Date: Mon, 17 May 2010 17:01:49 -0400 Message-ID: <201005172101.o4HL1n2a026224@svn01.web.mwc.hst.phx2.redhat.com> --===============0396205818753702116== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 17:01:48 -0400 (Mon, 17 May 2010) New Revision: 22138 Added: trunk/as/features/org.jboss.ide.eclipse.as.feature/pom.xml trunk/as/features/org.jboss.ide.eclipse.as.test.feature/pom.xml trunk/as/features/pom.xml trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/pom.xml trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/pom.xml trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/pom.xml trunk/as/plugins/org.jboss.ide.eclipse.as.core/pom.xml trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/pom.xml trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/pom.xml trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/pom.xml trunk/as/plugins/org.jboss.ide.eclipse.as.ui/pom.xml trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/pom.xml trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/pom.xml trunk/as/plugins/pom.xml trunk/as/pom.xml trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/pom.xml trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml trunk/as/tests/pom.xml Log: add pom.xml files Added: trunk/as/features/org.jboss.ide.eclipse.as.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/features/org.jboss.ide.eclipse.as.feature/pom.xml = (rev 0) +++ trunk/as/features/org.jboss.ide.eclipse.as.feature/pom.xml 2010-05-17 2= 1:01:48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.feature = + 1.0.0 + eclipse-feature + Added: trunk/as/features/org.jboss.ide.eclipse.as.test.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/features/org.jboss.ide.eclipse.as.test.feature/pom.xml = (rev 0) +++ trunk/as/features/org.jboss.ide.eclipse.as.test.feature/pom.xml 2010-05= -17 21:01:48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.test.feature = + 1.0.0 + eclipse-feature + Added: trunk/as/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/features/pom.xml (rev 0) +++ trunk/as/features/pom.xml 2010-05-17 21:01:48 UTC (rev 22138) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + as.features + 0.0.1-SNAPSHOT + pom + + org.jboss.ide.eclipse.as.feature + org.jboss.ide.eclipse.as.test.feature + + + = \ No newline at end of file Added: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/pom.xml = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/pom.xml 2010-0= 5-17 21:01:48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.archives.webtools = + 2.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/pom.xml = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.core/pom.xml 2010-0= 5-17 21:01:48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.classpath.core = + 1.0.0 + eclipse-plugin + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/pom.xml = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.classpath.ui/pom.xml 2010-05-= 17 21:01:48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.classpath.ui = + 1.0.0 + eclipse-plugin + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/pom.xml = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/pom.xml 2010-05-17 21:01= :48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.core = + 1.0.0 + eclipse-plugin + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/pom.xml = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.doc.user/pom.xml 2010-05-17 2= 1:01:48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.doc.user = + 1.0.0 + eclipse-plugin + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/pom.xml = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/pom.xml 2010-05-17 21:01:= 48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.ssh = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/pom.xml = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/pom.xml 2010-05-17 21:01:4= 8 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.ui = + 2.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/pom.xml = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/pom.xml 2010-05-17 = 21:01:48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.ui.mbeans = + 1.0.0 + eclipse-plugin + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/pom.xml = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/pom.xml 2010-05-17 2= 1:01:48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.wtp.core = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/pom.xml = (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.ui/pom.xml 2010-05-17 21:= 01:48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.wtp.ui = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/as/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/pom.xml (rev 0) +++ trunk/as/plugins/pom.xml 2010-05-17 21:01:48 UTC (rev 22138) @@ -0,0 +1,27 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + as.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.ide.eclipse.archives.webtools + org.jboss.ide.eclipse.as.classpath.core + org.jboss.ide.eclipse.as.classpath.ui + org.jboss.ide.eclipse.as.core + org.jboss.ide.eclipse.as.doc.user + org.jboss.ide.eclipse.as.ssh + org.jboss.ide.eclipse.as.ui + org.jboss.ide.eclipse.as.ui.mbeans + org.jboss.ide.eclipse.as.wtp.core + org.jboss.ide.eclipse.as.wtp.ui + + + = \ No newline at end of file Added: trunk/as/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/pom.xml (rev 0) +++ trunk/as/pom.xml 2010-05-17 21:01:48 UTC (rev 22138) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + as + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/po= m.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/pom.x= ml (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/pom.x= ml 2010-05-17 21:01:48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.archives.integration.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml = (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2010-05-17 21:01:4= 8 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml = (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml 2010-05-17 21:0= 1:48 UTC (rev 22138) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.as.ui.test = + 1.0.0 + eclipse-plugin + Added: trunk/as/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/pom.xml (rev 0) +++ trunk/as/tests/pom.xml 2010-05-17 21:01:48 UTC (rev 22138) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + as.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.ide.eclipse.as.archives.integration.test + org.jboss.ide.eclipse.as.test + org.jboss.ide.eclipse.as.ui.test + + + = \ No newline at end of file --===============0396205818753702116==-- From jbosstools-commits at lists.jboss.org Mon May 17 17:05:33 2010 Content-Type: multipart/mixed; boundary="===============4059498795909308911==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22139 - in trunk/jmx: plugins and 2 other directories. Date: Mon, 17 May 2010 17:05:33 -0400 Message-ID: <201005172105.o4HL5XK0032493@svn01.web.mwc.hst.phx2.redhat.com> --===============4059498795909308911== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 17:05:32 -0400 (Mon, 17 May 2010) New Revision: 22139 Added: trunk/jmx/plugins/org.jboss.tools.jmx.core/pom.xml trunk/jmx/plugins/org.jboss.tools.jmx.ui/pom.xml trunk/jmx/plugins/pom.xml Modified: trunk/jmx/pom.xml Log: add pom.xml files Added: trunk/jmx/plugins/org.jboss.tools.jmx.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/plugins/org.jboss.tools.jmx.core/pom.xml = (rev 0) +++ trunk/jmx/plugins/org.jboss.tools.jmx.core/pom.xml 2010-05-17 21:05:32 = UTC (rev 22139) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jmx.core = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/jmx/plugins/org.jboss.tools.jmx.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/plugins/org.jboss.tools.jmx.ui/pom.xml = (rev 0) +++ trunk/jmx/plugins/org.jboss.tools.jmx.ui/pom.xml 2010-05-17 21:05:32 UT= C (rev 22139) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jmx.ui = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/jmx/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/plugins/pom.xml (rev 0) +++ trunk/jmx/plugins/pom.xml 2010-05-17 21:05:32 UTC (rev 22139) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + jmx.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.jmx.core + org.jboss.tools.jmx.ui + + + = \ No newline at end of file Modified: trunk/jmx/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/pom.xml 2010-05-17 21:01:48 UTC (rev 22138) +++ trunk/jmx/pom.xml 2010-05-17 21:05:32 UTC (rev 22139) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - jmx.all + jmx 0.0.1-SNAPSHOT pom --===============4059498795909308911==-- From jbosstools-commits at lists.jboss.org Mon May 17 17:05:55 2010 Content-Type: multipart/mixed; boundary="===============4949858806601312175==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22140 - in trunk/archives: features and 9 other directories. Date: Mon, 17 May 2010 17:05:54 -0400 Message-ID: <201005172105.o4HL5s6b032522@svn01.web.mwc.hst.phx2.redhat.com> --===============4949858806601312175== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 17:05:54 -0400 (Mon, 17 May 2010) New Revision: 22140 Added: trunk/archives/features/org.jboss.ide.eclipse.archives.feature/pom.xml trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/pom.= xml trunk/archives/features/pom.xml trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/po= m.xml trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/pom.xml trunk/archives/plugins/pom.xml trunk/archives/pom.xml trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml trunk/archives/tests/pom.xml Log: add pom.xml files Added: trunk/archives/features/org.jboss.ide.eclipse.archives.feature/pom.x= ml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/features/org.jboss.ide.eclipse.archives.feature/pom.xml = (rev 0) +++ trunk/archives/features/org.jboss.ide.eclipse.archives.feature/pom.xml = 2010-05-17 21:05:54 UTC (rev 22140) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.archives.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/= pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/pom= .xml (rev 0) +++ trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/pom= .xml 2010-05-17 21:05:54 UTC (rev 22140) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.archives.test.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/archives/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/features/pom.xml (rev 0) +++ trunk/archives/features/pom.xml 2010-05-17 21:05:54 UTC (rev 22140) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + archives.features + 0.0.1-SNAPSHOT + pom + + org.jboss.ide.eclipse.archives.feature + org.jboss.ide.eclipse.archives.test.feature + + + = \ No newline at end of file Added: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml = (rev 0) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/pom.xml 2010= -05-17 21:05:54 UTC (rev 22140) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.archives.core = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integratio= n/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/p= om.xml (rev 0) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.jdt.integration/p= om.xml 2010-05-17 21:05:54 UTC (rev 22140) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.archives.jdt.integration = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/pom.xml = (rev 0) +++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/pom.xml 2010-0= 5-17 21:05:54 UTC (rev 22140) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.archives.ui = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/archives/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/plugins/pom.xml (rev 0) +++ trunk/archives/plugins/pom.xml 2010-05-17 21:05:54 UTC (rev 22140) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + archives.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.ide.eclipse.archives.core + org.jboss.ide.eclipse.archives.jdt.integration + org.jboss.ide.eclipse.archives.ui + + + = \ No newline at end of file Added: trunk/archives/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/pom.xml (rev 0) +++ trunk/archives/pom.xml 2010-05-17 21:05:54 UTC (rev 22140) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + archives + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml = (rev 0) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml 2010-0= 5-17 21:05:54 UTC (rev 22140) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.archives.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml = (rev 0) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/pom.xml 201= 0-05-17 21:05:54 UTC (rev 22140) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.archives.ui.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/archives/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/pom.xml (rev 0) +++ trunk/archives/tests/pom.xml 2010-05-17 21:05:54 UTC (rev 22140) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + archives.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.ide.eclipse.archives.test + org.jboss.ide.eclipse.archives.ui.test + + + = \ No newline at end of file --===============4949858806601312175==-- From jbosstools-commits at lists.jboss.org Mon May 17 17:11:49 2010 Content-Type: multipart/mixed; boundary="===============6948065879658404958==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22141 - in trunk/bpel: features and 15 other directories. Date: Mon, 17 May 2010 17:11:49 -0400 Message-ID: <201005172111.o4HLBnom000528@svn01.web.mwc.hst.phx2.redhat.com> --===============6948065879658404958== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 17:11:48 -0400 (Mon, 17 May 2010) New Revision: 22141 Added: trunk/bpel/features/org.jboss.tools.bpel.feature/pom.xml trunk/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml trunk/bpel/features/pom.xml trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml trunk/bpel/plugins/org.eclipse.bpel.common.model/pom.xml trunk/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml trunk/bpel/plugins/org.eclipse.bpel.model/pom.xml trunk/bpel/plugins/org.eclipse.bpel.ui/pom.xml trunk/bpel/plugins/org.eclipse.bpel.validator/pom.xml trunk/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml trunk/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml trunk/bpel/plugins/pom.xml trunk/bpel/pom.xml trunk/bpel/tests/pom.xml Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.feature/build.properties trunk/bpel/features/org.jboss.tools.bpel.tests.feature/feature.xml Log: add pom.xml files Added: trunk/bpel/features/org.jboss.tools.bpel.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/features/org.jboss.tools.bpel.feature/pom.xml = (rev 0) +++ trunk/bpel/features/org.jboss.tools.bpel.feature/pom.xml 2010-05-17 21:= 11:48 UTC (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.bpel.feature = + 1.0.0-SNAPSHOT + eclipse-feature + Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.feature/build.prop= erties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/features/org.jboss.tools.bpel.tests.feature/build.properties= 2010-05-17 21:05:54 UTC (rev 22140) +++ trunk/bpel/features/org.jboss.tools.bpel.tests.feature/build.properties= 2010-05-17 21:11:48 UTC (rev 22141) @@ -1,4 +1,3 @@ bin.includes =3D feature.xml,\ feature.properties,\ license.html -generate.plugin(a)org.jboss.tools.bpel.ui.test.source=3Dorg.jboss.tools.bp= el.ui.test Modified: trunk/bpel/features/org.jboss.tools.bpel.tests.feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/features/org.jboss.tools.bpel.tests.feature/feature.xml 2010= -05-17 21:05:54 UTC (rev 22140) +++ trunk/bpel/features/org.jboss.tools.bpel.tests.feature/feature.xml 2010= -05-17 21:11:48 UTC (rev 22141) @@ -19,59 +19,24 @@ = - - - - = - - - - - - - - = - - Added: trunk/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml = (rev 0) +++ trunk/bpel/features/org.jboss.tools.bpel.tests.feature/pom.xml 2010-05-= 17 21:11:48 UTC (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.bpel.tests.feature = + 1.0.0-SNAPSHOT + eclipse-feature + Added: trunk/bpel/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/features/pom.xml (rev 0) +++ trunk/bpel/features/pom.xml 2010-05-17 21:11:48 UTC (rev 22141) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + bpel.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.bpel.feature + org.jboss.tools.bpel.tests.feature + + + = \ No newline at end of file Added: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml = (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.model/pom.xml 201= 0-05-17 21:11:48 UTC (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.eclipse.bpel.apache.ode.deploy.model = + 0.5.0-SNAPSHOT + eclipse-plugin + Added: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml = (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/pom.xml 2010-0= 5-17 21:11:48 UTC (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.eclipse.bpel.apache.ode.deploy.ui = + 0.5.0-SNAPSHOT + eclipse-plugin + Added: trunk/bpel/plugins/org.eclipse.bpel.common.model/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.common.model/pom.xml = (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.common.model/pom.xml 2010-05-17 21:= 11:48 UTC (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.eclipse.bpel.common.model = + 0.5.0-SNAPSHOT + eclipse-plugin + Added: trunk/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml = (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/pom.xml 2010-05-17 21:11:= 48 UTC (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.eclipse.bpel.common.ui = + 0.5.0-SNAPSHOT + eclipse-plugin + Added: trunk/bpel/plugins/org.eclipse.bpel.model/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.model/pom.xml = (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.model/pom.xml 2010-05-17 21:11:48 U= TC (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.eclipse.bpel.model = + 0.5.0-SNAPSHOT + eclipse-plugin + Added: trunk/bpel/plugins/org.eclipse.bpel.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/pom.xml = (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/pom.xml 2010-05-17 21:11:48 UTC = (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.eclipse.bpel.ui = + 0.5.0-SNAPSHOT + eclipse-plugin + Added: trunk/bpel/plugins/org.eclipse.bpel.validator/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.validator/pom.xml = (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.validator/pom.xml 2010-05-17 21:11:= 48 UTC (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.eclipse.bpel.validator = + 0.5.0-SNAPSHOT + eclipse-plugin + Added: trunk/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml = (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.wsil.model/pom.xml 2010-05-17 21:11= :48 UTC (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.eclipse.bpel.wsil.model = + 0.5.0-SNAPSHOT + eclipse-plugin + Added: trunk/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml = (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.xpath10/pom.xml 2010-05-17 21:11:48= UTC (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.eclipse.bpel.xpath10 = + 0.5.0-SNAPSHOT + eclipse-plugin + Added: trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml = (rev 0) +++ trunk/bpel/plugins/org.jboss.tools.bpel.cheatsheet/pom.xml 2010-05-17 2= 1:11:48 UTC (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.bpel.cheatsheet = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml = (rev 0) +++ trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/pom.xml 2010-05-17 21:= 11:48 UTC (rev 22141) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.bpel.runtimes = + 0.4.0-SNAPSHOT + eclipse-plugin + Added: trunk/bpel/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/pom.xml (rev 0) +++ trunk/bpel/plugins/pom.xml 2010-05-17 21:11:48 UTC (rev 22141) @@ -0,0 +1,28 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + bpel.plugins + 0.0.1-SNAPSHOT + pom + + org.eclipse.bpel.apache.ode.deploy.model + org.eclipse.bpel.apache.ode.deploy.ui + org.eclipse.bpel.common.model + org.eclipse.bpel.common.ui + org.eclipse.bpel.model + org.eclipse.bpel.ui + org.eclipse.bpel.validator + org.eclipse.bpel.wsil.model + org.eclipse.bpel.xpath10 + org.jboss.tools.bpel.cheatsheet + org.jboss.tools.bpel.runtimes + + + = \ No newline at end of file Added: trunk/bpel/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/pom.xml (rev 0) +++ trunk/bpel/pom.xml 2010-05-17 21:11:48 UTC (rev 22141) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + bpel + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/bpel/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/tests/pom.xml (rev 0) +++ trunk/bpel/tests/pom.xml 2010-05-17 21:11:48 UTC (rev 22141) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + bpel.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.bpel.ui.test + + + = \ No newline at end of file --===============6948065879658404958==-- From jbosstools-commits at lists.jboss.org Mon May 17 17:12:22 2010 Content-Type: multipart/mixed; boundary="===============6831865231935105571==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22142 - in trunk/smooks: features and 11 other directories. Date: Mon, 17 May 2010 17:12:22 -0400 Message-ID: <201005172112.o4HLCMf5000544@svn01.web.mwc.hst.phx2.redhat.com> --===============6831865231935105571== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 17:12:21 -0400 (Mon, 17 May 2010) New Revision: 22142 Added: trunk/smooks/features/org.jboss.tools.smooks.feature/pom.xml trunk/smooks/features/org.jboss.tools.smooks.test.feature/pom.xml trunk/smooks/features/pom.xml trunk/smooks/plugins/org.jboss.tools.smooks.core/pom.xml trunk/smooks/plugins/org.jboss.tools.smooks.runtime/pom.xml trunk/smooks/plugins/org.jboss.tools.smooks.templating/pom.xml trunk/smooks/plugins/org.jboss.tools.smooks.ui/pom.xml trunk/smooks/plugins/pom.xml trunk/smooks/pom.xml trunk/smooks/tests/org.jboss.tools.smooks.core.test/pom.xml trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml trunk/smooks/tests/pom.xml Log: add pom.xml files Added: trunk/smooks/features/org.jboss.tools.smooks.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/features/org.jboss.tools.smooks.feature/pom.xml = (rev 0) +++ trunk/smooks/features/org.jboss.tools.smooks.feature/pom.xml 2010-05-17= 21:12:21 UTC (rev 22142) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.smooks.feature = + 1.0.0 + eclipse-feature + Added: trunk/smooks/features/org.jboss.tools.smooks.test.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/features/org.jboss.tools.smooks.test.feature/pom.xml = (rev 0) +++ trunk/smooks/features/org.jboss.tools.smooks.test.feature/pom.xml 2010-= 05-17 21:12:21 UTC (rev 22142) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.smooks.test.feature = + 1.0.0 + eclipse-feature + Added: trunk/smooks/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/features/pom.xml (rev 0) +++ trunk/smooks/features/pom.xml 2010-05-17 21:12:21 UTC (rev 22142) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + smooks.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.smooks.feature + org.jboss.tools.smooks.test.feature + + + = \ No newline at end of file Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/plugins/org.jboss.tools.smooks.core/pom.xml = (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/pom.xml 2010-05-17 21:= 12:21 UTC (rev 22142) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.smooks.core = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/plugins/org.jboss.tools.smooks.runtime/pom.xml = (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.runtime/pom.xml 2010-05-17 = 21:12:21 UTC (rev 22142) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.smooks.runtime = + 1.2.1-SNAPSHOT + eclipse-plugin + Added: trunk/smooks/plugins/org.jboss.tools.smooks.templating/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/plugins/org.jboss.tools.smooks.templating/pom.xml = (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.templating/pom.xml 2010-05-= 17 21:12:21 UTC (rev 22142) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.smooks.templating = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/pom.xml = (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/pom.xml 2010-05-17 21:12= :21 UTC (rev 22142) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.smooks.ui = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/smooks/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/plugins/pom.xml (rev 0) +++ trunk/smooks/plugins/pom.xml 2010-05-17 21:12:21 UTC (rev 22142) @@ -0,0 +1,21 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + smooks.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.smooks.core + org.jboss.tools.smooks.runtime + org.jboss.tools.smooks.templating + org.jboss.tools.smooks.ui + + + = \ No newline at end of file Added: trunk/smooks/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/pom.xml (rev 0) +++ trunk/smooks/pom.xml 2010-05-17 21:12:21 UTC (rev 22142) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + smooks + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/smooks/tests/org.jboss.tools.smooks.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/tests/org.jboss.tools.smooks.core.test/pom.xml = (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.core.test/pom.xml 2010-05-17 = 21:12:21 UTC (rev 22142) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.smooks.core.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml = (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml 2010-= 05-17 21:12:21 UTC (rev 22142) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.smooks.templating.test = + 1.0.0 + eclipse-plugin + Added: trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml = (rev 0) +++ trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml 2010-05-17 21= :12:21 UTC (rev 22142) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.smooks.ui.test = + 1.0.0 + eclipse-plugin + Added: trunk/smooks/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/tests/pom.xml (rev 0) +++ trunk/smooks/tests/pom.xml 2010-05-17 21:12:21 UTC (rev 22142) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + smooks.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.smooks.core.test + org.jboss.tools.smooks.templating.test + org.jboss.tools.smooks.ui.test + + + = \ No newline at end of file --===============6831865231935105571==-- From jbosstools-commits at lists.jboss.org Mon May 17 17:12:43 2010 Content-Type: multipart/mixed; boundary="===============0120589124118400424==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22143 - in trunk/freemarker: features and 6 other directories. Date: Mon, 17 May 2010 17:12:43 -0400 Message-ID: <201005172112.o4HLChD0000555@svn01.web.mwc.hst.phx2.redhat.com> --===============0120589124118400424== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 17:12:43 -0400 (Mon, 17 May 2010) New Revision: 22143 Added: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.x= ml trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/= pom.xml trunk/freemarker/features/pom.xml trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml trunk/freemarker/plugins/pom.xml trunk/freemarker/pom.xml trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml trunk/freemarker/tests/pom.xml Log: add pom.xml files Added: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/p= om.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.= xml (rev 0) +++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.feature/pom.= xml 2010-05-17 21:12:43 UTC (rev 22143) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.freemarker.feature = + 1.1.0-SNAPSHOT + eclipse-feature + Added: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feat= ure/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature= /pom.xml (rev 0) +++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature= /pom.xml 2010-05-17 21:12:43 UTC (rev 22143) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.freemarker.test.feature = + 1.0.0 + eclipse-feature + Added: trunk/freemarker/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/freemarker/features/pom.xml (rev 0) +++ trunk/freemarker/features/pom.xml 2010-05-17 21:12:43 UTC (rev 22143) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + freemarker.features + 0.0.1-SNAPSHOT + pom + + org.jboss.ide.eclipse.freemarker.feature + org.jboss.ide.eclipse.freemarker.test.feature + + + = \ No newline at end of file Added: trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml = (rev 0) +++ trunk/freemarker/plugins/org.jboss.ide.eclipse.freemarker/pom.xml 2010-= 05-17 21:12:43 UTC (rev 22143) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.freemarker = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/freemarker/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/freemarker/plugins/pom.xml (rev 0) +++ trunk/freemarker/plugins/pom.xml 2010-05-17 21:12:43 UTC (rev 22143) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + freemarker.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.ide.eclipse.freemarker + + + = \ No newline at end of file Added: trunk/freemarker/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/freemarker/pom.xml (rev 0) +++ trunk/freemarker/pom.xml 2010-05-17 21:12:43 UTC (rev 22143) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + freemarker + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml = (rev 0) +++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml 20= 10-05-17 21:12:43 UTC (rev 22143) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.ide.eclipse.freemarker.test = + 1.0.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/freemarker/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/freemarker/tests/pom.xml (rev 0) +++ trunk/freemarker/tests/pom.xml 2010-05-17 21:12:43 UTC (rev 22143) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + freemarker.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.ide.eclipse.freemarker.test + + + = \ No newline at end of file --===============0120589124118400424==-- From jbosstools-commits at lists.jboss.org Mon May 17 17:12:57 2010 Content-Type: multipart/mixed; boundary="===============5761499174961534841==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22144 - in trunk/profiler: features and 4 other directories. Date: Mon, 17 May 2010 17:12:57 -0400 Message-ID: <201005172112.o4HLCvSq000567@svn01.web.mwc.hst.phx2.redhat.com> --===============5761499174961534841== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 17:12:56 -0400 (Mon, 17 May 2010) New Revision: 22144 Added: trunk/profiler/features/org.jboss.tools.profiler.feature/pom.xml trunk/profiler/features/pom.xml trunk/profiler/plugins/org.jboss.tools.profiler.ui/pom.xml trunk/profiler/plugins/pom.xml trunk/profiler/pom.xml trunk/profiler/tests/pom.xml Log: add pom.xml files Added: trunk/profiler/features/org.jboss.tools.profiler.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/profiler/features/org.jboss.tools.profiler.feature/pom.xml = (rev 0) +++ trunk/profiler/features/org.jboss.tools.profiler.feature/pom.xml 2010-0= 5-17 21:12:56 UTC (rev 22144) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.profiler.feature = + 1.0.0-SNAPSHOT + eclipse-feature + Added: trunk/profiler/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/profiler/features/pom.xml (rev 0) +++ trunk/profiler/features/pom.xml 2010-05-17 21:12:56 UTC (rev 22144) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + profiler.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.profiler.feature + + + = \ No newline at end of file Added: trunk/profiler/plugins/org.jboss.tools.profiler.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/profiler/plugins/org.jboss.tools.profiler.ui/pom.xml = (rev 0) +++ trunk/profiler/plugins/org.jboss.tools.profiler.ui/pom.xml 2010-05-17 2= 1:12:56 UTC (rev 22144) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.profiler.ui = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/profiler/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/profiler/plugins/pom.xml (rev 0) +++ trunk/profiler/plugins/pom.xml 2010-05-17 21:12:56 UTC (rev 22144) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + profiler.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.profiler.ui + + + = \ No newline at end of file Added: trunk/profiler/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/profiler/pom.xml (rev 0) +++ trunk/profiler/pom.xml 2010-05-17 21:12:56 UTC (rev 22144) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + profiler + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/profiler/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/profiler/tests/pom.xml (rev 0) +++ trunk/profiler/tests/pom.xml 2010-05-17 21:12:56 UTC (rev 22144) @@ -0,0 +1,17 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + profiler.tests + 0.0.1-SNAPSHOT + pom + + + + = \ No newline at end of file --===============5761499174961534841==-- From jbosstools-commits at lists.jboss.org Mon May 17 17:13:13 2010 Content-Type: multipart/mixed; boundary="===============2194801827125124327==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22145 - in trunk/modeshape: features/org.jboss.tools.modeshape.rest.feature and 3 other directories. Date: Mon, 17 May 2010 17:13:13 -0400 Message-ID: <201005172113.o4HLDCh0000581@svn01.web.mwc.hst.phx2.redhat.com> --===============2194801827125124327== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 17:13:12 -0400 (Mon, 17 May 2010) New Revision: 22145 Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/pom.xml trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/pom= .xml trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml trunk/modeshape/pom.xml trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml Log: add pom.xml files Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/p= om.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/pom.xml= 2010-05-17 21:12:56 UTC (rev 22144) +++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.feature/pom.xml= 2010-05-17 21:13:12 UTC (rev 22145) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.modeshape.rest.feature = - 1.0.0 + 1.0.0-SNAPSHOT eclipse-feature Modified: trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feat= ure/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/po= m.xml 2010-05-17 21:12:56 UTC (rev 22144) +++ trunk/modeshape/features/org.jboss.tools.modeshape.rest.test.feature/po= m.xml 2010-05-17 21:13:12 UTC (rev 22145) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.modeshape.rest.test.feature = - 1.0.0 + 1.0.0-SNAPSHOT eclipse-feature Modified: trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml 2010-05-= 17 21:12:56 UTC (rev 22144) +++ trunk/modeshape/plugins/org.jboss.tools.modeshape.rest/pom.xml 2010-05-= 17 21:13:12 UTC (rev 22145) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.modeshape.rest = - 1.0.0 + 1.0.0-SNAPSHOT eclipse-plugin Modified: trunk/modeshape/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/modeshape/pom.xml 2010-05-17 21:12:56 UTC (rev 22144) +++ trunk/modeshape/pom.xml 2010-05-17 21:13:12 UTC (rev 22145) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - modeshape.all + modeshape 0.0.1-SNAPSHOT pom Modified: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml 2010-= 05-17 21:12:56 UTC (rev 22144) +++ trunk/modeshape/tests/org.jboss.tools.modeshape.rest.test/pom.xml 2010-= 05-17 21:13:12 UTC (rev 22145) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.modeshape.rest.test = - 1.0.0 + 1.0.0-SNAPSHOT eclipse-test-plugin --===============2194801827125124327==-- From jbosstools-commits at lists.jboss.org Mon May 17 17:17:31 2010 Content-Type: multipart/mixed; boundary="===============5574332417169678705==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22146 - in trunk/portlet: features and 7 other directories. Date: Mon, 17 May 2010 17:17:31 -0400 Message-ID: <201005172117.o4HLHVaN001142@svn01.web.mwc.hst.phx2.redhat.com> --===============5574332417169678705== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 17:17:30 -0400 (Mon, 17 May 2010) New Revision: 22146 Added: trunk/portlet/features/org.jboss.tools.portlet.feature/pom.xml trunk/portlet/features/org.jboss.tools.portlet.test.feature/pom.xml trunk/portlet/features/pom.xml trunk/portlet/plugins/org.jboss.tools.portlet.core/pom.xml trunk/portlet/plugins/org.jboss.tools.portlet.ui/pom.xml trunk/portlet/plugins/pom.xml trunk/portlet/pom.xml trunk/portlet/tests/org.jboss.tools.portlet.core.test/pom.xml trunk/portlet/tests/pom.xml Log: add pom.xml files Added: trunk/portlet/features/org.jboss.tools.portlet.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/features/org.jboss.tools.portlet.feature/pom.xml = (rev 0) +++ trunk/portlet/features/org.jboss.tools.portlet.feature/pom.xml 2010-05-= 17 21:17:30 UTC (rev 22146) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.portlet.feature = + 1.1.0-SNAPSHOT + eclipse-feature + Added: trunk/portlet/features/org.jboss.tools.portlet.test.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/features/org.jboss.tools.portlet.test.feature/pom.xml = (rev 0) +++ trunk/portlet/features/org.jboss.tools.portlet.test.feature/pom.xml 201= 0-05-17 21:17:30 UTC (rev 22146) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.portlet.test.feature = + 1.1.0-SNAPSHOT + eclipse-feature + Added: trunk/portlet/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/features/pom.xml (rev 0) +++ trunk/portlet/features/pom.xml 2010-05-17 21:17:30 UTC (rev 22146) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + portlet.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.portlet.feature + org.jboss.tools.portlet.test.feature + + + = \ No newline at end of file Added: trunk/portlet/plugins/org.jboss.tools.portlet.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/org.jboss.tools.portlet.core/pom.xml = (rev 0) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/pom.xml 2010-05-17 2= 1:17:30 UTC (rev 22146) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.portlet.core = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/portlet/plugins/org.jboss.tools.portlet.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/pom.xml = (rev 0) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/pom.xml 2010-05-17 21:= 17:30 UTC (rev 22146) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.portlet.ui = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/portlet/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/pom.xml (rev 0) +++ trunk/portlet/plugins/pom.xml 2010-05-17 21:17:30 UTC (rev 22146) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + portlet.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.portlet.core + org.jboss.tools.portlet.ui + + + = \ No newline at end of file Added: trunk/portlet/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/pom.xml (rev 0) +++ trunk/portlet/pom.xml 2010-05-17 21:17:30 UTC (rev 22146) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + portlet + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/portlet/tests/org.jboss.tools.portlet.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/tests/org.jboss.tools.portlet.core.test/pom.xml = (rev 0) +++ trunk/portlet/tests/org.jboss.tools.portlet.core.test/pom.xml 2010-05-1= 7 21:17:30 UTC (rev 22146) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.portlet.core.test = + 1.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/portlet/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/tests/pom.xml (rev 0) +++ trunk/portlet/tests/pom.xml 2010-05-17 21:17:30 UTC (rev 22146) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + portlet.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.portlet.core.test + + + = \ No newline at end of file --===============5574332417169678705==-- From jbosstools-commits at lists.jboss.org Mon May 17 17:20:14 2010 Content-Type: multipart/mixed; boundary="===============3013597257368973394==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22147 - in trunk/jst: features and 22 other directories. Date: Mon, 17 May 2010 17:20:14 -0400 Message-ID: <201005172120.o4HLKE86001559@svn01.web.mwc.hst.phx2.redhat.com> --===============3013597257368973394== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 17:20:13 -0400 (Mon, 17 May 2010) New Revision: 22147 Added: trunk/jst/features/org.jboss.tools.jst.feature/pom.xml trunk/jst/features/org.jboss.tools.jst.web.tiles.feature/pom.xml trunk/jst/features/pom.xml trunk/jst/plugins/org.jboss.tools.jst.css/pom.xml trunk/jst/plugins/org.jboss.tools.jst.firstrun/pom.xml trunk/jst/plugins/org.jboss.tools.jst.jsp/pom.xml trunk/jst/plugins/org.jboss.tools.jst.text.ext/pom.xml trunk/jst/plugins/org.jboss.tools.jst.web.kb/pom.xml trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/pom.xml trunk/jst/plugins/org.jboss.tools.jst.web.tiles/pom.xml trunk/jst/plugins/org.jboss.tools.jst.web.ui/pom.xml trunk/jst/plugins/org.jboss.tools.jst.web.verification/pom.xml trunk/jst/plugins/org.jboss.tools.jst.web/pom.xml trunk/jst/plugins/pom.xml trunk/jst/pom.xml trunk/jst/tests/org.jboss.tools.jst.css.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml trunk/jst/tests/org.jboss.tools.ui.bot.ext/pom.xml trunk/jst/tests/pom.xml Log: add pom.xml files Added: trunk/jst/features/org.jboss.tools.jst.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/features/org.jboss.tools.jst.feature/pom.xml = (rev 0) +++ trunk/jst/features/org.jboss.tools.jst.feature/pom.xml 2010-05-17 21:20= :13 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/jst/features/org.jboss.tools.jst.web.tiles.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/features/org.jboss.tools.jst.web.tiles.feature/pom.xml = (rev 0) +++ trunk/jst/features/org.jboss.tools.jst.web.tiles.feature/pom.xml 2010-0= 5-17 21:20:13 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.web.tiles.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/jst/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/features/pom.xml (rev 0) +++ trunk/jst/features/pom.xml 2010-05-17 21:20:13 UTC (rev 22147) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + jst.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.jst.feature + org.jboss.tools.jst.web.tiles.feature + + + = \ No newline at end of file Added: trunk/jst/plugins/org.jboss.tools.jst.css/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/pom.xml = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.css/pom.xml 2010-05-17 21:20:13 U= TC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.css = + 1.0.0 + eclipse-plugin + Added: trunk/jst/plugins/org.jboss.tools.jst.firstrun/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.firstrun/pom.xml = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/pom.xml 2010-05-17 21:20= :13 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.firstrun = + 2.0.0 + eclipse-plugin + Added: trunk/jst/plugins/org.jboss.tools.jst.jsp/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/pom.xml = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/pom.xml 2010-05-17 21:20:13 U= TC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.jsp = + 2.0.0 + eclipse-plugin + Added: trunk/jst/plugins/org.jboss.tools.jst.text.ext/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/pom.xml = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/pom.xml 2010-05-17 21:20= :13 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.text.ext = + 2.0.0 + eclipse-plugin + Added: trunk/jst/plugins/org.jboss.tools.jst.web/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/pom.xml = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web/pom.xml 2010-05-17 21:20:13 U= TC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.web = + 2.0.0 + eclipse-plugin + Added: trunk/jst/plugins/org.jboss.tools.jst.web.kb/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/pom.xml = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/pom.xml 2010-05-17 21:20:1= 3 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.web.kb = + 1.0.0 + eclipse-plugin + Added: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/pom.xml = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/pom.xml 2010-05-17 21:2= 0:13 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.web.tiles = + 2.0.0 + eclipse-plugin + Added: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/pom.xml = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/pom.xml 2010-05-17 2= 1:20:13 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.web.tiles.ui = + 2.0.0 + eclipse-plugin + Added: trunk/jst/plugins/org.jboss.tools.jst.web.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/pom.xml = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/pom.xml 2010-05-17 21:20:1= 3 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.web.ui = + 2.0.0 + eclipse-plugin + Added: trunk/jst/plugins/org.jboss.tools.jst.web.verification/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.verification/pom.xml = (rev 0) +++ trunk/jst/plugins/org.jboss.tools.jst.web.verification/pom.xml 2010-05-= 17 21:20:13 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.web.verification = + 2.0.0 + eclipse-plugin + Added: trunk/jst/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/pom.xml (rev 0) +++ trunk/jst/plugins/pom.xml 2010-05-17 21:20:13 UTC (rev 22147) @@ -0,0 +1,27 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + jst.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.jst.css + org.jboss.tools.jst.firstrun + org.jboss.tools.jst.jsp + org.jboss.tools.jst.text.ext + org.jboss.tools.jst.web + org.jboss.tools.jst.web.kb + org.jboss.tools.jst.web.tiles + org.jboss.tools.jst.web.tiles.ui + org.jboss.tools.jst.web.ui + org.jboss.tools.jst.web.verification + + + = \ No newline at end of file Added: trunk/jst/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/pom.xml (rev 0) +++ trunk/jst/pom.xml 2010-05-17 21:20:13 UTC (rev 22147) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + jst + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/jst/tests/org.jboss.tools.jst.css.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/pom.xml = (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/pom.xml 2010-05-17 21:20:1= 3 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.css.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/jst/tests/org.jboss.tools.jst.jsp.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/pom.xml = (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/pom.xml 2010-05-17 21:20:1= 3 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.jsp.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml = (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml 2010-05-17 21:2= 0:13 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.ui.bot.test = + 1.0.0 + eclipse-plugin + Added: trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml = (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml 2010-0= 5-17 21:20:13 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.ui.firstrun.bot.test = + 1.0.0 + eclipse-plugin + Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml = (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml 2010-05-17 21:2= 0:13 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.web.kb.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml = (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml 2010-05-17 21:20:1= 3 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.web.test = + 2.0.0 + eclipse-test-plugin + Added: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml = (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml 2010-05-17 21:2= 0:13 UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jst.web.ui.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/pom.xml = (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/pom.xml 2010-05-17 21:20:13 = UTC (rev 22147) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.ui.bot.ext = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/jst/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/pom.xml (rev 0) +++ trunk/jst/tests/pom.xml 2010-05-17 21:20:13 UTC (rev 22147) @@ -0,0 +1,25 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + jst.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.jst.css.test + org.jboss.tools.jst.jsp.test + org.jboss.tools.jst.ui.bot.test + org.jboss.tools.jst.ui.firstrun.bot.test + org.jboss.tools.jst.web.kb.test + org.jboss.tools.jst.web.test + org.jboss.tools.jst.web.ui.test + org.jboss.tools.ui.bot.ext + + + = \ No newline at end of file --===============3013597257368973394==-- From jbosstools-commits at lists.jboss.org Mon May 17 17:20:56 2010 Content-Type: multipart/mixed; boundary="===============5705657185993246938==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22148 - in trunk/vpe: features and 19 other directories. Date: Mon, 17 May 2010 17:20:56 -0400 Message-ID: <201005172120.o4HLKu8K001650@svn01.web.mwc.hst.phx2.redhat.com> --===============5705657185993246938== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 17:20:55 -0400 (Mon, 17 May 2010) New Revision: 22148 Added: trunk/vpe/features/org.jboss.tools.vpe.feature/pom.xml trunk/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml trunk/vpe/features/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.docbook/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.html/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.jsp/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.resref/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe/pom.xml trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/pom.xml trunk/vpe/plugins/org.jboss.tools.xulrunner/pom.xml trunk/vpe/plugins/pom.xml trunk/vpe/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml trunk/vpe/tests/pom.xml Log: add pom.xml files Added: trunk/vpe/features/org.jboss.tools.vpe.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/features/org.jboss.tools.vpe.feature/pom.xml = (rev 0) +++ trunk/vpe/features/org.jboss.tools.vpe.feature/pom.xml 2010-05-17 21:20= :55 UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml = (rev 0) +++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/pom.xml 2010-05-17= 21:20:55 UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.xulrunner.feature = + 1.9.1.2 + eclipse-feature + Added: trunk/vpe/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/features/pom.xml (rev 0) +++ trunk/vpe/features/pom.xml 2010-05-17 21:20:55 UTC (rev 22148) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + vpe.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.vpe.feature + org.jboss.tools.xulrunner.feature + + + = \ No newline at end of file Added: trunk/vpe/plugins/org.jboss.tools.vpe/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/pom.xml (= rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/pom.xml 2010-05-17 21:20:55 UTC (= rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe = + 2.1.0 + eclipse-plugin + Added: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/pom.xml = (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/pom.xml 2010-05-17 21:20:= 55 UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.docbook = + 1.0.0 + eclipse-plugin + Added: trunk/vpe/plugins/org.jboss.tools.vpe.html/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.html/pom.xml = (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/pom.xml 2010-05-17 21:20:55 = UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.html = + 2.1.0 + eclipse-plugin + Added: trunk/vpe/plugins/org.jboss.tools.vpe.jsp/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.jsp/pom.xml = (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/pom.xml 2010-05-17 21:20:55 U= TC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.jsp = + 2.1.0 + eclipse-plugin + Added: trunk/vpe/plugins/org.jboss.tools.vpe.resref/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/pom.xml = (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/pom.xml 2010-05-17 21:20:5= 5 UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.resref = + 2.0.0 + eclipse-plugin + Added: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/pom.xml = (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/pom.xml 2010-05-17 21:= 20:55 UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.ui.palette = + 2.1.0 + eclipse-plugin + Added: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/pom.xml = (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/pom.xml 2010-05-17 21:2= 0:55 UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.xulrunner = + 2.1.0 + eclipse-plugin + Added: trunk/vpe/plugins/org.jboss.tools.xulrunner/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.xulrunner/pom.xml = (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.xulrunner/pom.xml 2010-05-17 21:20:55= UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.xulrunner = + 1.0.0 + eclipse-plugin + Added: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/pom.xml = (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/pom.xml 2010-05= -17 21:20:55 UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.xulrunner.initializer = + 1.0.0 + eclipse-plugin + Added: trunk/vpe/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/pom.xml (rev 0) +++ trunk/vpe/plugins/pom.xml 2010-05-17 21:20:55 UTC (rev 22148) @@ -0,0 +1,26 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + vpe.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.vpe + org.jboss.tools.vpe.docbook + org.jboss.tools.vpe.html + org.jboss.tools.vpe.jsp + org.jboss.tools.vpe.resref + org.jboss.tools.vpe.ui.palette + org.jboss.tools.vpe.xulrunner + org.jboss.tools.xulrunner + org.jboss.tools.xulrunner.initializer + + + = \ No newline at end of file Added: trunk/vpe/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/pom.xml (rev 0) +++ trunk/vpe/pom.xml 2010-05-17 21:20:55 UTC (rev 22148) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + vpe + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml = (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2010-05-17 21:20:= 55 UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.html.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml = (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2010-05-17 21:20:5= 5 UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.jsp.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml = (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml 2010-05-17 21:20:55 UT= C (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.test = + 2.0.0 + eclipse-test-plugin + Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml = (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml 2010-05-17 21:2= 0:55 UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.ui.bot.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml = (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2010-05-17 21:20:55= UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.ui.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml = (rev 0) +++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2010-05-17 2= 1:20:55 UTC (rev 22148) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.vpe.xulrunner.test = + 2.0.0 + eclipse-test-plugin + Added: trunk/vpe/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/pom.xml (rev 0) +++ trunk/vpe/tests/pom.xml 2010-05-17 21:20:55 UTC (rev 22148) @@ -0,0 +1,23 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + vpe.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.vpe.html.test + org.jboss.tools.vpe.jsp.test + org.jboss.tools.vpe.test + org.jboss.tools.vpe.ui.bot.test + org.jboss.tools.vpe.ui.test + org.jboss.tools.vpe.xulrunner.test + + + = \ No newline at end of file --===============5705657185993246938==-- From jbosstools-commits at lists.jboss.org Mon May 17 17:22:14 2010 Content-Type: multipart/mixed; boundary="===============7759226482609900951==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22149 - in trunk/jsf: features and 32 other directories. Date: Mon, 17 May 2010 17:22:14 -0400 Message-ID: <201005172122.o4HLME91001671@svn01.web.mwc.hst.phx2.redhat.com> --===============7759226482609900951== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 17:22:13 -0400 (Mon, 17 May 2010) New Revision: 22149 Added: trunk/jsf/features/org.jboss.tools.jsf.feature/pom.xml trunk/jsf/features/org.jboss.tools.richfaces.feature/pom.xml trunk/jsf/features/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.ui/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.verification/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf/pom.xml trunk/jsf/plugins/pom.xml trunk/jsf/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml trunk/jsf/tests/pom.xml Log: add pom.xml files Added: trunk/jsf/features/org.jboss.tools.jsf.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/features/org.jboss.tools.jsf.feature/pom.xml = (rev 0) +++ trunk/jsf/features/org.jboss.tools.jsf.feature/pom.xml 2010-05-17 21:22= :13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/jsf/features/org.jboss.tools.richfaces.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/features/org.jboss.tools.richfaces.feature/pom.xml = (rev 0) +++ trunk/jsf/features/org.jboss.tools.richfaces.feature/pom.xml 2010-05-17= 21:22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.richfaces.feature = + 2.0.0 + eclipse-feature + Added: trunk/jsf/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/features/pom.xml (rev 0) +++ trunk/jsf/features/pom.xml 2010-05-17 21:22:13 UTC (rev 22149) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + jsf.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.jsf.feature + org.jboss.tools.richfaces.feature + + + = \ No newline at end of file Added: trunk/jsf/plugins/org.jboss.tools.jsf/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/pom.xml (= rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf/pom.xml 2010-05-17 21:22:13 UTC (= rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf = + 2.0.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/pom.xml 2010-05-17 21:22= :13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.doc.user = + 1.0.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/pom.xml 2010-05-17 21:22= :13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.text.ext = + 2.0.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/pom.xml 2010-05= -17 21:22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.text.ext.facelets = + 2.0.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/pom.xml 2010-0= 5-17 21:22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.text.ext.richfaces = + 2.0.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/pom.xml 2010-05-17 21:22:13 UT= C (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.ui = + 2.0.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.verification/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.verification/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.verification/pom.xml 2010-05-17 2= 1:22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.verification = + 2.0.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/pom.xml 2010-05-17 2= 1:22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.ajax4jsf = + 2.1.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/pom.xml 2010-05-17 2= 1:22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.facelets = + 2.1.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jbpm/pom.xml 2010-05-17 21:22= :13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.jbpm = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/pom.xml 2010-05-17 21:22:= 13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.jsf = + 2.1.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/pom.xml 2010-05-17 21:22= :13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.jstl = + 2.1.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/pom.xml 2010-05-17 21= :22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.myfaces = + 2.1.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/pom.xml 2010-05-17 = 21:22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.richfaces = + 2.1.0 + eclipse-plugin + Added: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/pom.xml = (rev 0) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/pom.xml 2010-05-17 21:22= :13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.seam = + 2.1.0 + eclipse-plugin + Added: trunk/jsf/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/pom.xml (rev 0) +++ trunk/jsf/plugins/pom.xml 2010-05-17 21:22:13 UTC (rev 22149) @@ -0,0 +1,32 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + jsf.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.jsf + org.jboss.tools.jsf.doc.user + org.jboss.tools.jsf.text.ext + org.jboss.tools.jsf.text.ext.facelets + org.jboss.tools.jsf.text.ext.richfaces + org.jboss.tools.jsf.ui + org.jboss.tools.jsf.verification + org.jboss.tools.jsf.vpe.ajax4jsf + org.jboss.tools.jsf.vpe.facelets + org.jboss.tools.jsf.vpe.jbpm + org.jboss.tools.jsf.vpe.jsf + org.jboss.tools.jsf.vpe.jstl + org.jboss.tools.jsf.vpe.myfaces + org.jboss.tools.jsf.vpe.richfaces + org.jboss.tools.jsf.vpe.seam + + + = \ No newline at end of file Added: trunk/jsf/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/pom.xml (rev 0) +++ trunk/jsf/pom.xml 2010-05-17 21:22:13 UTC (rev 22149) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + jsf + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2010-05-17 21:22:13 UT= C (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.test = + 2.0.0 + eclipse-test-plugin + Added: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml 2010-05-17 21= :22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.text.ext.test = + 2.0.0 + eclipse-test-plugin + Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml 2010-05-17 21:2= 2:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.ui.bot.test = + 1.0.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml 2010-05-17 21:22:13= UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.ui.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml 2010-05-1= 7 21:22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.verification.test = + 2.0.0 + eclipse-test-plugin + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2010-05-1= 7 21:22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.ajax4jsf.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml 2010-05-1= 7 21:22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.facelets.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jbpm.test/pom.xml 2010-05-17 21= :22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.jbpm.test = + 1.0.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2010-05-17 21:= 22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.jsf.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml 2010-05-17 21= :22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.jstl.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml 2010-05-17= 21:22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.myfaces.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2010-05-= 17 21:22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.richfaces.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml = (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2010-05-17 21= :22:13 UTC (rev 22149) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsf.vpe.seam.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/jsf/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/pom.xml (rev 0) +++ trunk/jsf/tests/pom.xml 2010-05-17 21:22:13 UTC (rev 22149) @@ -0,0 +1,30 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + jsf.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.jsf.test + org.jboss.tools.jsf.text.ext.test + org.jboss.tools.jsf.ui.bot.test + org.jboss.tools.jsf.ui.test + org.jboss.tools.jsf.verification.test + org.jboss.tools.jsf.vpe.ajax4jsf.test + org.jboss.tools.jsf.vpe.facelets.test + org.jboss.tools.jsf.vpe.jbpm.test + org.jboss.tools.jsf.vpe.jsf.test + org.jboss.tools.jsf.vpe.jstl.test + org.jboss.tools.jsf.vpe.myfaces.test + org.jboss.tools.jsf.vpe.richfaces.test + org.jboss.tools.jsf.vpe.seam.test + + + = \ No newline at end of file --===============7759226482609900951==-- From jbosstools-commits at lists.jboss.org Mon May 17 18:07:08 2010 Content-Type: multipart/mixed; boundary="===============5828616633930903422==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22150 - trunk/tests/features/org.jboss.tools.test.sdk.feature. Date: Mon, 17 May 2010 18:07:08 -0400 Message-ID: <201005172207.o4HM78d5013285@svn01.web.mwc.hst.phx2.redhat.com> --===============5828616633930903422== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 18:07:08 -0400 (Mon, 17 May 2010) New Revision: 22150 Modified: trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml Log: https://jira.jboss.org/browse/JBIDE-6158 add drools bot test Modified: trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-= 05-17 21:22:13 UTC (rev 22149) +++ trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-= 05-17 22:07:08 UTC (rev 22150) @@ -331,4 +331,10 @@ install-size=3D"0" version=3D"0.0.0"/> = + + --===============5828616633930903422==-- From jbosstools-commits at lists.jboss.org Mon May 17 18:12:39 2010 Content-Type: multipart/mixed; boundary="===============5035309546747428118==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22151 - trunk/tests. Date: Mon, 17 May 2010 18:12:39 -0400 Message-ID: <201005172212.o4HMCdEc013776@svn01.web.mwc.hst.phx2.redhat.com> --===============5035309546747428118== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 18:12:39 -0400 (Mon, 17 May 2010) New Revision: 22151 Modified: trunk/tests/pom.xml Log: add pom.xml files Modified: trunk/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/pom.xml 2010-05-17 22:07:08 UTC (rev 22150) +++ trunk/tests/pom.xml 2010-05-17 22:12:39 UTC (rev 22151) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - tests.all + tests 0.0.1-SNAPSHOT pom --===============5035309546747428118==-- From jbosstools-commits at lists.jboss.org Mon May 17 18:21:53 2010 Content-Type: multipart/mixed; boundary="===============0241802865343539659==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22152 - in trunk/common: features and 23 other directories. Date: Mon, 17 May 2010 18:21:53 -0400 Message-ID: <201005172221.o4HMLrSM014835@svn01.web.mwc.hst.phx2.redhat.com> --===============0241802865343539659== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-17 18:21:51 -0400 (Mon, 17 May 2010) New Revision: 22152 Added: trunk/common/features/org.jboss.tools.common.all.feature/pom.xml trunk/common/features/org.jboss.tools.common.all.tests.feature/pom.xml trunk/common/features/org.jboss.tools.common.core.feature/pom.xml trunk/common/features/org.jboss.tools.common.feature/pom.xml trunk/common/features/org.jboss.tools.common.text.ext.feature/pom.xml trunk/common/features/org.jboss.tools.common.ui.feature/pom.xml trunk/common/features/org.jboss.tools.common.verification.feature/pom.xml trunk/common/features/pom.xml trunk/common/plugins/org.jboss.tools.common.el.core/pom.xml trunk/common/plugins/org.jboss.tools.common.el.ui/pom.xml trunk/common/plugins/org.jboss.tools.common.gef/pom.xml trunk/common/plugins/org.jboss.tools.common.meta.ui/pom.xml trunk/common/plugins/org.jboss.tools.common.model.ui/pom.xml trunk/common/plugins/org.jboss.tools.common.model/pom.xml trunk/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml trunk/common/plugins/org.jboss.tools.common.resref.core/pom.xml trunk/common/plugins/org.jboss.tools.common.resref.ui/pom.xml trunk/common/plugins/org.jboss.tools.common.text.ext/pom.xml trunk/common/plugins/org.jboss.tools.common.text.xml/pom.xml trunk/common/plugins/org.jboss.tools.common.ui/pom.xml trunk/common/plugins/org.jboss.tools.common.verification.ui/pom.xml trunk/common/plugins/org.jboss.tools.common.verification/pom.xml trunk/common/plugins/org.jboss.tools.common/pom.xml trunk/common/plugins/pom.xml trunk/common/pom.xml Log: add pom.xml files Added: trunk/common/features/org.jboss.tools.common.all.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/features/org.jboss.tools.common.all.feature/pom.xml = (rev 0) +++ trunk/common/features/org.jboss.tools.common.all.feature/pom.xml 2010-0= 5-17 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.all.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/common/features/org.jboss.tools.common.all.tests.feature/pom.x= ml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/features/org.jboss.tools.common.all.tests.feature/pom.xml = (rev 0) +++ trunk/common/features/org.jboss.tools.common.all.tests.feature/pom.xml = 2010-05-17 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.all.tests.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/common/features/org.jboss.tools.common.core.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/features/org.jboss.tools.common.core.feature/pom.xml = (rev 0) +++ trunk/common/features/org.jboss.tools.common.core.feature/pom.xml 2010-= 05-17 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.core.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/common/features/org.jboss.tools.common.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/features/org.jboss.tools.common.feature/pom.xml = (rev 0) +++ trunk/common/features/org.jboss.tools.common.feature/pom.xml 2010-05-17= 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/common/features/org.jboss.tools.common.text.ext.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/features/org.jboss.tools.common.text.ext.feature/pom.xml = (rev 0) +++ trunk/common/features/org.jboss.tools.common.text.ext.feature/pom.xml 2= 010-05-17 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.text.ext.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/common/features/org.jboss.tools.common.ui.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/features/org.jboss.tools.common.ui.feature/pom.xml = (rev 0) +++ trunk/common/features/org.jboss.tools.common.ui.feature/pom.xml 2010-05= -17 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.ui.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/common/features/org.jboss.tools.common.verification.feature/po= m.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/features/org.jboss.tools.common.verification.feature/pom.x= ml (rev 0) +++ trunk/common/features/org.jboss.tools.common.verification.feature/pom.x= ml 2010-05-17 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.verification.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/common/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/features/pom.xml (rev 0) +++ trunk/common/features/pom.xml 2010-05-17 22:21:51 UTC (rev 22152) @@ -0,0 +1,24 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + common.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.common.all.feature + org.jboss.tools.common.all.tests.feature + org.jboss.tools.common.core.feature + org.jboss.tools.common.feature + org.jboss.tools.common.text.ext.feature + org.jboss.tools.common.ui.feature + org.jboss.tools.common.verification.feature + + + = \ No newline at end of file Added: trunk/common/plugins/org.jboss.tools.common/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common/pom.xml 2010-05-17 22:21:51= UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.el.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.core/pom.xml 2010-05-17 = 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.el.core = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.el.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.ui/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.el.ui/pom.xml 2010-05-17 22= :21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.el.ui = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.gef/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.gef/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.gef/pom.xml 2010-05-17 22:2= 1:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.gef = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.meta.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.meta.ui/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.meta.ui/pom.xml 2010-05-17 = 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.meta.ui = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.model/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model/pom.xml 2010-05-17 22= :21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.model = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.model.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model.ui/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model.ui/pom.xml 2010-05-17= 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.model.ui = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.projecttemplates/pom.xml 20= 10-05-17 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.projecttemplates = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.resref.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.resref.core/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.resref.core/pom.xml 2010-05= -17 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.resref.core = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.resref.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.resref.ui/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.resref.ui/pom.xml 2010-05-1= 7 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.resref.ui = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.text.ext/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.text.ext/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.text.ext/pom.xml 2010-05-17= 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.text.ext = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.text.xml/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.text.xml/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.text.xml/pom.xml 2010-05-17= 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.text.xml = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.ui/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.ui/pom.xml 2010-05-17 22:21= :51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.ui = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.verification/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.verification/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.verification/pom.xml 2010-0= 5-17 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.verification = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/org.jboss.tools.common.verification.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.verification.ui/pom.xml = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.verification.ui/pom.xml 201= 0-05-17 22:21:51 UTC (rev 22152) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.common.verification.ui = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/common/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/pom.xml (rev 0) +++ trunk/common/plugins/pom.xml 2010-05-17 22:21:51 UTC (rev 22152) @@ -0,0 +1,32 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + common.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.common + org.jboss.tools.common.el.core + org.jboss.tools.common.el.ui + org.jboss.tools.common.gef + org.jboss.tools.common.meta.ui + org.jboss.tools.common.model + org.jboss.tools.common.model.ui + org.jboss.tools.common.projecttemplates + org.jboss.tools.common.resref.core + org.jboss.tools.common.resref.ui + org.jboss.tools.common.text.ext + org.jboss.tools.common.text.xml + org.jboss.tools.common.ui + org.jboss.tools.common.verification + org.jboss.tools.common.verification.ui + + + = \ No newline at end of file Added: trunk/common/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/pom.xml (rev 0) +++ trunk/common/pom.xml 2010-05-17 22:21:51 UTC (rev 22152) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + common + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file --===============0241802865343539659==-- From jbosstools-commits at lists.jboss.org Mon May 17 18:28:47 2010 Content-Type: multipart/mixed; boundary="===============1653228901347029071==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22153 - trunk/documentation/guides/JBDS_Release_Notes/en-US. Date: Mon, 17 May 2010 18:28:46 -0400 Message-ID: <201005172228.o4HMSkOY015920@svn01.web.mwc.hst.phx2.redhat.com> --===============1653228901347029071== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: irooskov(a)redhat.com Date: 2010-05-17 18:28:46 -0400 (Mon, 17 May 2010) New Revision: 22153 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml Log: updated with JBDS-1214 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-17 22:21:51 UTC (rev 22152) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-17 22:28:46 UTC (rev 22153) @@ -72,6 +72,18 @@ + + Portlet + + + + + JBDS-1214= : The JBoss Enterprise Portal Platform 5.0 was not compatible with = the JBoss Developer Studio when a user would generate specific JBoss Portal= XML files. To allow for the JBoss Enterprise Portal Platform to work with = the JBoss Developer Studio the option to remove JBoss Portal XML file creat= ion when the user chooses JBoss Enterprise Portal Platform 5.0. If a user a= ttempts to deploy a JBoss Portal 2 project to the JBoss Enterprise Portal P= latform 5.0, the user has to remove or rename the jboss-app.xml file in order to ensure compatibility. + + + + + + - + = - - + = - - - - - - + + + + + + = - - + + = - - - - + + --===============6762406194451989925==-- From jbosstools-commits at lists.jboss.org Tue May 18 02:05:31 2010 Content-Type: multipart/mixed; boundary="===============3347182908642058936==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22164 - branches/jbosstools-3.1.x/tests/features/org.jboss.tools.all.test.feature. Date: Tue, 18 May 2010 02:05:31 -0400 Message-ID: <201005180605.o4I65V4u019915@svn01.web.mwc.hst.phx2.redhat.com> --===============3347182908642058936== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 02:05:31 -0400 (Tue, 18 May 2010) New Revision: 22164 Modified: branches/jbosstools-3.1.x/tests/features/org.jboss.tools.all.test.featur= e/feature.xml Log: mark plugins to be unpacked (help resolving test projects within plugins) Modified: branches/jbosstools-3.1.x/tests/features/org.jboss.tools.all.test= .feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/tests/features/org.jboss.tools.all.test.featu= re/feature.xml 2010-05-18 04:50:43 UTC (rev 22163) +++ branches/jbosstools-3.1.x/tests/features/org.jboss.tools.all.test.featu= re/feature.xml 2010-05-18 06:05:31 UTC (rev 22164) @@ -142,7 +142,7 @@ download-size=3D"0" install-size=3D"0" version=3D"0.0.0" - unpack=3D"false"/> + unpack=3D"true"/> = + version=3D"0.0.0" + unpack=3D"true"/> = + unpack=3D"true"/> = --===============2445060280328526826== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 02:08:16 -0400 (Tue, 18 May 2010) New Revision: 22165 Modified: trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml Log: mark plugins to be unpacked (help resolving test projects within plugins) Modified: trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-= 05-18 06:05:31 UTC (rev 22164) +++ trunk/tests/features/org.jboss.tools.test.sdk.feature/feature.xml 2010-= 05-18 06:08:16 UTC (rev 22165) @@ -244,7 +244,7 @@ install-size=3D"0" version=3D"0.0.0" fragment=3D"true" - unpack=3D"false"/> + unpack=3D"true"/> = --===============1144273026414040595== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-18 03:05:56 -0400 (Tue, 18 May 2010) New Revision: 22166 Modified: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools= /common/model/test/MetaModelTest.java Log: testEntytyExtensions method is useless in tycho tests because it runs onl= y model plugin without clients and thus there is n extensions found Modified: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jbos= s/tools/common/model/test/MetaModelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tool= s/common/model/test/MetaModelTest.java 2010-05-18 06:08:16 UTC (rev 22165) +++ trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tool= s/common/model/test/MetaModelTest.java 2010-05-18 07:05:56 UTC (rev 22166) @@ -184,8 +184,11 @@ = /** * Check that extensions reference existing entities. + * This test make sense only in client plug-ins. It should be moved to js= t,jsf and = + * others plug-ins which are using model plug-in. = + * */ - public void testEntityExtensionsFixMe() { + public void fixmeTestEntityExtensions() { XModelMetaDataImpl meta =3D (XModelMetaDataImpl)XModelMetaDataImpl.getIn= stance(); XExtensions s =3D meta.getExtensions(); //TODO - should be tested through public interface --===============1144273026414040595==-- From jbosstools-commits at lists.jboss.org Tue May 18 08:17:45 2010 Content-Type: multipart/mixed; boundary="===============8057824479835762175==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22168 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test: resources/jbossws and 1 other directories. Date: Tue, 18 May 2010 08:17:45 -0400 Message-ID: <201005181217.o4ICHjhs002802@svn01.web.mwc.hst.phx2.redhat.com> --===============8057824479835762175== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: jlukas(a)redhat.com Date: 2010-05-18 08:17:44 -0400 (Tue, 18 May 2010) New Revision: 22168 Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message_= soap_out.xml trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/= bot/test/WsTesterTest.java Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF Log: tests for ws tester feature Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF 2010= -05-18 12:03:37 UTC (rev 22167) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF 2010= -05-18 12:17:44 UTC (rev 22168) @@ -16,7 +16,8 @@ org.eclipse.swtbot.swt.finder;bundle-version=3D"2.0.0", org.eclipse.ui.ide;bundle-version=3D"3.5.1", org.eclipse.ui.forms;bundle-version=3D"3.4.1", - org.junit4;bundle-version=3D"4.5.0" + org.junit4;bundle-version=3D"4.5.0", + org.jboss.tools.ws.ui;bundle-version=3D"1.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Eclipse-RegisterBuddy: org.apache.log4j Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/mess= age_soap_out.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message= _soap_out.xml (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/resources/jbossws/message= _soap_out.xml 2010-05-18 12:17:44 UTC (rev 22168) @@ -0,0 +1,11 @@ + + + + + Mark + 1 + 1 + + + Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws= /ui/bot/test/WsTesterTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui= /bot/test/WsTesterTest.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui= /bot/test/WsTesterTest.java 2010-05-18 12:17:44 UTC (rev 22168) @@ -0,0 +1,471 @@ +/*************************************************************************= ****** + * 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.bot.test; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + +import org.eclipse.core.runtime.Platform; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.waits.Conditions; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTabItem; +import org.eclipse.ui.internal.WorkbenchMessages; +import org.eclipse.ui.internal.ide.IDEWorkbenchMessages; +import org.jboss.tools.ui.bot.ext.SWTTestExt; +import org.jboss.tools.ui.bot.ext.gen.IView; +import org.jboss.tools.ui.bot.ext.view.ViewBase; +import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; +import org.junit.Assert; +import org.junit.Test; +import org.osgi.framework.Bundle; + +/** + * Tests for Web Service Tester + * + * @author jlukas + */ +(a)SuppressWarnings("restriction") +public class WsTesterTest extends SWTTestExt { + + private static final Logger L =3D Logger.getLogger(WsTesterTest.class.= getName()); + private static final String SERVICE_URL =3D "http://www.webservicex.ne= t/BibleWebservice.asmx"; + + /** + * Test behavior of UI + */ + @Test + public void testUI() { + WsTesterView wstv =3D new WsTesterView(); + SWTBotView viewBot =3D wstv.show(); + Assert.assertTrue("Tester View is not active", viewBot.isActive()); + Assert.assertFalse(wstv.isHttpMethodSelectionEnabled()); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_RS); + Assert.assertTrue(wstv.isHttpMethodSelectionEnabled()); + wstv.setHttpMethod(WsTesterView.Http_Method.PUT); + Assert.assertEquals(WsTesterView.Http_Method.PUT, wstv.getHttpMeth= od()); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_WS); + Assert.assertFalse(wstv.isHttpMethodSelectionEnabled()); + Assert.assertEquals(WsTesterView.Http_Method.POST, wstv.getHttpMet= hod()); + + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_RS); + Assert.assertTrue(wstv.isHttpMethodSelectionEnabled()); + wstv.setHttpMethod(WsTesterView.Http_Method.DELETE); + Assert.assertEquals(WsTesterView.Http_Method.DELETE, wstv.getHttpM= ethod()); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.HEADER, "a", "1"); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.HEADER, "b", "2"); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.HEADER, "c", "3"); + Assert.assertEquals(3, wstv.getRequestArgs(WsTesterView.Request_Ar= g_Type.HEADER).keySet().size()); + Assert.assertTrue(wstv.getRequestArgs(WsTesterView.Request_Arg_Typ= e.HEADER).containsKey("b")); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.HEADER, "d", "4"); + Assert.assertEquals(4, wstv.getRequestArgs(WsTesterView.Request_Ar= g_Type.HEADER).keySet().size()); + Assert.assertTrue(wstv.getRequestArgs(WsTesterView.Request_Arg_Typ= e.HEADER).containsKey("d")); + wstv.upRequestArg(WsTesterView.Request_Arg_Type.HEADER, "c", "3"); + wstv.downRequestArg(WsTesterView.Request_Arg_Type.HEADER, "b", "2"= ); + Assert.assertEquals(4, wstv.getRequestArgs(WsTesterView.Request_Ar= g_Type.HEADER).keySet().size()); + wstv.removeRequestArg(WsTesterView.Request_Arg_Type.HEADER, "a", "= 1"); + wstv.removeRequestArg(WsTesterView.Request_Arg_Type.HEADER, "c", "= 3"); + Assert.assertEquals(2, wstv.getRequestArgs(WsTesterView.Request_Ar= g_Type.HEADER).keySet().size()); + wstv.clearRequestArgs(WsTesterView.Request_Arg_Type.HEADER); + Assert.assertEquals(0, wstv.getRequestArgs(WsTesterView.Request_Ar= g_Type.HEADER).keySet().size()); + viewBot.close(); + } + + /** + * Test SOAP service invocation + */ + @Test + public void testSOAPService() { + WsTesterView wstv =3D new WsTesterView(); + wstv.show(); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_WS); + Assert.assertFalse(wstv.isHttpMethodSelectionEnabled()); + Assert.assertEquals(WsTesterView.Http_Method.POST, wstv.getHttpMet= hod()); + String actionUrl =3D "http://www.webserviceX.NET/GetBibleWordsByCh= apterAndVerse"; + wstv.setServiceURL(SERVICE_URL); + wstv.setActionURL(actionUrl); + InputStream is =3D WsTesterTest.class.getResourceAsStream("/resour= ces/jbossws/message_soap_out.xml"); + wstv.setRequestBody(readResource(is)); + wstv.invoke(); + String rsp =3D wstv.getResponseBody(); + L.log(Level.FINE, "SOAP response: {0}", rsp); + Assert.assertTrue(rsp.trim().length() > 0); + checkResponse(rsp, "<BookTitle>Mark</BookTitle>"); + } + + /** + * Test REST service invocation (GET request) + */ + @Test + public void testRESTGETService() { + WsTesterView wstv =3D new WsTesterView(); + wstv.show(); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_RS); + wstv.setHttpMethod(WsTesterView.Http_Method.GET); + wstv.setServiceURL(SERVICE_URL + "/GetBibleWordsByChapterAndVerse"= ); + wstv.clearRequestArgs(WsTesterView.Request_Arg_Type.PARAMETER); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.PARAMETER, "BookT= itle", "Luke"); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.PARAMETER, "chapt= er", "2"); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.PARAMETER, "Verse= ", "2"); + wstv.editRequestArg(WsTesterView.Request_Arg_Type.PARAMETER, "chap= ter", "2", "chapter", "1"); + wstv.invoke(); + String rsp =3D wstv.getResponseBody(); + String[] rspHeaders =3D wstv.getResponseHeaders(); + L.log(Level.FINE, "REST response: {0}", rsp); + L.log(Level.FINE, "Response headers: {0}", Arrays.asList(rspHeader= s)); + Assert.assertTrue(rsp.trim().length() > 0); + checkResponse(rsp, "<Chapter>1</Chapter>"); + checkResponse(rsp, "ministers of the word"); + } + + /** + * Test REST service invocation (POST request) + */ + @Test + public void testRESTPOSTService() { + WsTesterView wstv =3D new WsTesterView(); + wstv.show(); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_RS); + wstv.setHttpMethod(WsTesterView.Http_Method.POST); + wstv.setServiceURL(SERVICE_URL + "/GetBibleWordsByChapterAndVerse"= ); + String requestBody =3D "BookTitle=3DJohn&chapter=3D3&Verse=3D1\r"; + wstv.setRequestBody(requestBody); + wstv.clearRequestArgs(WsTesterView.Request_Arg_Type.PARAMETER); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.HEADER, "Content-= Type", "application/x-www-form-urlencoded"); + wstv.addRequestArg(WsTesterView.Request_Arg_Type.HEADER, "Content-= Length", String.valueOf(requestBody.length())); + wstv.invoke(); + String rsp =3D wstv.getResponseBody(); + String[] rspHeaders =3D wstv.getResponseHeaders(); + L.log(Level.FINE, "REST response: {0}", rsp); + L.log(Level.FINE, "Response headers: {0}", Arrays.asList(rspHeader= s)); + Assert.assertTrue(rsp.trim().length() > 0); + checkResponse(rsp, "<Chapter>3</Chapter>"); + checkResponse(rsp, "There was a man of the Pharisees, named Nicode= mus, a ruler of the Jews"); + } + +// @Test +// @Ignore +// public void testSOAPSample() { +// WsTesterView wstv =3D new WsTesterView(); +// wstv.show(); +// wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_WS); +// wstv.setSampleContent(); +// wstv.invoke(); +// String rsp =3D wstv.getResponseBody(); +// L.log(Level.FINE, "SOAP Sample response: {0}", rsp); +// checkResponse(rsp, "To be, or not to be: that is the question"); +// } +// +// @Test +// @Ignore +// public void testRESTSample() { +// WsTesterView wstv =3D new WsTesterView(); +// SWTBotView viewBot =3D wstv.show(); +// wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_RS); +// wstv.setSampleContent(); +// wstv.invoke(); +// String rsp =3D wstv.getResponseBody(); +// String[] rspHeaders =3D wstv.getResponseHeaders(); +// L.log(Level.FINE, "REST Sample response: {0}", rsp); +// L.log(Level.FINE, "Response headers: {0}", Arrays.asList(rspHeader= s)); +// checkResponse(rsp, "Colorado Springs"); +// viewBot.close(); +// } + @Test + public void testOpenMonitor() { + WsTesterView wstv =3D new WsTesterView(); + SWTBotView tv =3D wstv.show(); + wstv.openMonitor(); + SWTBotView av =3D bot.activeView(); + Assert.assertEquals("TCP/IP Monitor", av.getTitle()); + av.close(); + tv.close(); + } + + @Test + public void testConfigureMonitor() { + WsTesterView wstv =3D new WsTesterView(); + SWTBotView tv =3D wstv.show(); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_WS); + Assert.assertFalse(wstv.isHttpMethodSelectionEnabled()); + Assert.assertEquals(WsTesterView.Http_Method.POST, wstv.getHttpMet= hod()); + String actionUrl =3D "http://www.webserviceX.NET/GetBibleWordsByCh= apterAndVerse"; + wstv.setServiceURL(SERVICE_URL); + wstv.setActionURL(actionUrl); + InputStream is =3D WsTesterTest.class.getResourceAsStream("/resour= ces/jbossws/message_soap_out.xml"); + wstv.setRequestBody(readResource(is)); + wstv.configureMonitor(); + SWTBotShell sh =3D bot.activeShell(); + Assert.assertEquals("New Monitor", sh.getText()); + sh.bot().spinner("80", 0).setSelection(8077); + sh.bot().button("OK").click(); + tv.show(); + wstv.invoke(); + tv.show(); + String rsp =3D wstv.getResponseBody(); + L.log(Level.FINE, "SOAP response: {0}", rsp); + Assert.assertTrue(rsp.trim().length() > 0); + checkResponse(rsp, "<BookTitle>Mark</BookTitle>"); + } + + @Test + public void testErrorResponse() { + WsTesterView wstv =3D new WsTesterView(); + wstv.show(); + wstv.setWebServiceType(WsTesterView.Ws_Type.JAX_RS); + wstv.setHttpMethod(WsTesterView.Http_Method.GET); + wstv.setServiceURL("http://www.zvents.com/rest/event_update"); + wstv.invoke(); + Assert.assertEquals(0, wstv.getRequestArgs(WsTesterView.Request_Ar= g_Type.PARAMETER).size()); + String rsp =3D wstv.getResponseBody(); + String[] rspHeaders =3D wstv.getResponseHeaders(); + L.log(Level.FINE, "REST response: {0}", rsp); + L.log(Level.FINE, "Response headers: {0}", Arrays.asList(rspHeader= s)); + Assert.assertTrue(rsp.trim().length() > 0); + checkResponse(rsp, "Invalid API Key."); + } + + private String readResource(InputStream is) { + StringBuilder sb =3D new StringBuilder(); + BufferedReader br =3D null; + try { + br =3D new BufferedReader(new InputStreamReader(is)); + String s; + while ((s =3D br.readLine()) !=3D null) { + sb.append(s); + sb.append('\n'); + } + } catch (IOException e) { + L.log(Level.WARNING, e.getMessage(), e); + } finally { + if (br !=3D null) { + try { + br.close(); + } catch (IOException e) { + L.log(Level.FINEST, e.getMessage(), e); + } + } + } + return sb.toString(); + } + + private void checkResponse(String rsp, String expContent) { + try { + Assert.assertTrue(rsp, rsp.contains(expContent)); + } catch (AssertionError t) { + if (rsp.contains("503")) { + L.log(Level.WARNING, "Service Unavailable: {0}", SERVICE_U= RL); + } else { + throw t; + } + } + } + + private static class WsTesterView extends ViewBase { + + private static final Bundle WSUI_BUNDLE =3D Platform.getBundle("or= g.jboss.tools.ws.ui"); + + enum Ws_Type { + + JAX_WS, JAX_RS; + + String getLabel() { + switch (this) { + case JAX_WS: + return "JAX-WS"; + case JAX_RS: + return "JAX-RS"; + } + throw new AssertionError("Invalid Web Service Type"); + } + } + + enum Http_Method { + + GET, POST, PUT, DELETE; + } + + enum Request_Arg_Type { + + HEADER(JBossWSUIMessages.JAXRSWSTestView_Request_Header_Label), + PARAMETER(JBossWSUIMessages.JAXRSWSTestView_Request_Parameters= _Label); + private String type; + + private Request_Arg_Type(String s) { + type =3D s; + } + + private String getType() { + return type; + } + } + + public WsTesterView() { + super(); + viewObject =3D new IView() { + + public String getName() { + // Web Service Tester + return getStringFromBundle("%test.view.name"); + } + + public List getGroupPath() { + // JBoss Tools Web Services + return Collections.singletonList(getStringFromBundle("= %test.view.category.name")); + } + }; + } + + @Override + public SWTBotView show() { + SWTBotView b =3D super.show(); + // maximize tester view + menu(IDEWorkbenchMessages.Workbench_window).menu(WorkbenchMess= ages.MaximizePartAction_text).click(); + return b; + } + + public void setWebServiceType(Ws_Type type) { + comboBox(0).setSelection(type.getLabel()); + } + +// public void setSampleContent() { +// button(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_Label= ).click(); +// } + public void setHttpMethod(Http_Method m) { + comboBox(1).setSelection(m.toString()); + } + + public Http_Method getHttpMethod() { + return Enum.valueOf(Http_Method.class, comboBox(1).getText()); + } + + public boolean isHttpMethodSelectionEnabled() { + return comboBox(1).isEnabled(); + } + + public void setServiceURL(String url) { + comboBox(2).typeText(url); + } + + public void setActionURL(String s) { + text(0).typeText(s); + } + + public void setRequestBody(String s) { + SWTBotTabItem ti =3D tabItem(JBossWSUIMessages.JAXRSWSTestView= _Request_Body_Label); + ti.activate(); + text(1).setText(s); + } + + public void addRequestArg(Request_Arg_Type type, String name, Stri= ng value) { + SWTBotTabItem ti =3D bot.tabItem(type.getType()); + ti.activate(); + text(1).typeText(name + "=3D" + value); + bot.button("Add").click(); + text(1).setText(""); + } + + public Map getRequestArgs(Request_Arg_Type type) { + SWTBotTabItem ti =3D bot.tabItem(type.getType()); + ti.activate(); + String[] args =3D list(0).getItems(); + Map result =3D new HashMap(); + for (String s : args) { + int i =3D s.indexOf('=3D'); + result.put(s.substring(0, i), s.substring(i + 1)); + } + return result; + } + + public void editRequestArg(Request_Arg_Type type, String oldName, + String oldValue, String newName, String newValue) { + SWTBotTabItem ti =3D bot.tabItem(type.getType()); + ti.activate(); + bot.list(0).select(oldName + "=3D" + oldValue); + bot.button("Edit").click(); + SWTBot sh =3D bot.activeShell().bot(); + sh.text(0).typeText(newName + "=3D" + newValue); + sh.button("OK").click(); + } + + public void upRequestArg(Request_Arg_Type type, String name, Strin= g value) { + SWTBotTabItem ti =3D bot.tabItem(type.getType()); + ti.activate(); + list(0).select(name + "=3D" + value); + bot.button("Up").click(); + } + + public void downRequestArg(Request_Arg_Type type, String name, Str= ing value) { + SWTBotTabItem ti =3D bot.tabItem(type.getType()); + ti.activate(); + list(0).select(name + "=3D" + value); + bot.button("Down").click(); + } + + public void removeRequestArg(Request_Arg_Type type, String name, S= tring value) { + SWTBotTabItem ti =3D bot.tabItem(type.getType()); + ti.activate(); + list(0).select(name + "=3D" + value); + bot.button("Remove").click(); + } + + public void clearRequestArgs(Request_Arg_Type type) { + SWTBotTabItem ti =3D bot.tabItem(type.getType()); + ti.activate(); + SWTBotButton b =3D bot.button("Clear All"); + if (b.isEnabled()) { + b.click(); + } + } + + public String getResponseBody() { + SWTBotTabItem ti =3D tabItem(JBossWSUIMessages.JAXRSWSTestView= _Results_Body_Label); + ti.activate(); + return bot.text(2).getText(); + } + + public String[] getResponseHeaders() { + SWTBotTabItem ti =3D tabItem(JBossWSUIMessages.JAXRSWSTestView= _Results_Header_Label); + ti.activate(); + return list(1).getItems(); + } + + public void invoke() { + String dlgTitle =3D JBossWSUIMessages.JAXRSWSTestView_Invoke_L= abel; + button(dlgTitle).click(); + waitWhile(Conditions.shellIsActive(dlgTitle), 120000); + sleep(500); + } + + public void openMonitor() { + button(JBossWSUIMessages.JAXRSWSTestView_Open_Monitor_Button).= click(); + } + + public void configureMonitor() { + button(JBossWSUIMessages.JAXRSWSTestView_Configure_Monitor_But= ton).click(); + } + + private String getStringFromBundle(String key) { + return Platform.getResourceString(WSUI_BUNDLE, key); + } + } +} --===============8057824479835762175==-- From jbosstools-commits at lists.jboss.org Tue May 18 08:57:27 2010 Content-Type: multipart/mixed; boundary="===============3287649587068916244==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22169 - in workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces: src/org/jboss/tools/jsf/vpe/icefaces/utill and 2 other directories. Date: Tue, 18 May 2010 08:57:27 -0400 Message-ID: <201005181257.o4ICvRCG007307@svn01.web.mwc.hst.phx2.redhat.com> --===============3287649587068916244== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-18 08:57:26 -0400 (Tue, 18 May 2010) New Revision: 22169 Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IcePanelGridTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/template/mock/impl/VpeHtmlPanelGrid.java Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceCommandButtonTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceInputSecretTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/template/IceInputTextTemplate.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/icefaces/utill/VpeRendererUtil.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tools= /jsf/vpe/template/mock/impl/VpeUIComponent.java workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-templ= ates-icefaces.xml Log: Working under processing complex jsf elements, https://jira.jboss.org/brows= e/JBIDE-4710 Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-18 12:17:= 44 UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceCommandButtonTemplate.java 2010-05-18 12:57:= 26 UTC (rev 22169) @@ -34,7 +34,7 @@ Renderer render =3D new com.icesoft.faces.component.ext.renderkit.Butto= nRenderer(); VpeUICommand uiComponent =3D new VpeUICommand( (Element) sourceNode); - return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, v= isualDocument, render, uiComponent); + return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, v= isualDocument, render, uiComponent); } = } Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-18 12:1= 7:44 UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesOutputTextTemplate.java 2010-05-18 12:5= 7:26 UTC (rev 22169) @@ -35,7 +35,7 @@ Renderer render =3D new com.icesoft.faces.renderkit.dom_html_basic.Text= Renderer(); VpeUIComponent uiComponent =3D new VpeUIComponent( (Element) sourceNode); - return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, v= isualDocument, render, uiComponent); + return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, v= isualDocument, render, uiComponent); } = } Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010= -05-18 12:17:44 UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceFacesSelectBooleanCheckboxTemplate.java 2010= -05-18 12:57:26 UTC (rev 22169) @@ -34,7 +34,7 @@ Renderer render =3D new com.icesoft.faces.renderkit.dom_html_basic.Chec= kboxRenderer(); VpeUIComponent uiComponent =3D new VpeUIComponent( (Element) sourceNode); - return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, v= isualDocument, render, uiComponent); + return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, v= isualDocument, render, uiComponent); } = } Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/template/IceInputSecretTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceInputSecretTemplate.java 2010-05-18 12:17:44= UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceInputSecretTemplate.java 2010-05-18 12:57:26= UTC (rev 22169) @@ -15,7 +15,6 @@ import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlInputSecret; -import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlInputText; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; import org.jboss.tools.vpe.editor.template.VpeCreationData; @@ -35,7 +34,7 @@ Renderer render =3D new com.icesoft.faces.component.ext.renderkit.Secret= Renderer(); VpeHtmlInputSecret uiComponent =3D new VpeHtmlInputSecret( (Element) sourceNode); - return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, v= isualDocument, render, uiComponent); + return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, v= isualDocument, render, uiComponent); } = } Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/template/IceInputTextTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-18 12:17:44 U= TC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IceInputTextTemplate.java 2010-05-18 12:57:26 U= TC (rev 22169) @@ -34,7 +34,7 @@ Renderer render =3D new com.icesoft.faces.component.ext.renderkit.Input= TextRenderer(); VpeHtmlInputText uiComponent =3D new VpeHtmlInputText( (Element) sourceNode); - return VpeRendererUtil.createVisualEditorDate(pageContext, sourceNode, v= isualDocument, render, uiComponent); + return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, v= isualDocument, render, uiComponent); } = } Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/t= ools/jsf/vpe/icefaces/template/IcePanelGridTemplate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IcePanelGridTemplate.java = (rev 0) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/template/IcePanelGridTemplate.java 2010-05-18 12:57:26 U= TC (rev 22169) @@ -0,0 +1,39 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jsf.vpe.icefaces.template; + +import javax.faces.render.Renderer; +import org.jboss.tools.jsf.vpe.icefaces.utill.VpeRendererUtil; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeFacesContext; +import org.jboss.tools.jsf.vpe.template.mock.impl.VpeHtmlPanelGrid; +import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate; +import org.jboss.tools.vpe.editor.template.VpeCreationData; +import org.mozilla.interfaces.nsIDOMDocument; +import org.w3c.dom.Element; +import org.w3c.dom.Node; + +/** + * @author mareshkau + * + */ +public class IcePanelGridTemplate extends VpeAbstractTemplate{ + + public VpeCreationData create(VpePageContext pageContext, Node sourceNode, + nsIDOMDocument visualDocument) { + VpeFacesContext.getInstance().setResponseWriter(null); + Renderer render =3D new com.icesoft.faces.component.ext.renderkit.GridRe= nderer(); + VpeHtmlPanelGrid uiComponent =3D new VpeHtmlPanelGrid( + (Element) sourceNode); + return VpeRendererUtil.createVisualEditorData(pageContext, sourceNode, v= isualDocument, render, uiComponent); + } + +} Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/icefaces/utill/VpeRendererUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-18 12:17:44 UTC (rev = 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/icefaces/utill/VpeRendererUtil.java 2010-05-18 12:57:26 UTC (rev = 22169) @@ -37,7 +37,7 @@ */ public class VpeRendererUtil { = - public static final VpeCreationData createVisualEditorDate( + public static final VpeCreationData createVisualEditorData( VpePageContext pageContext, Node sourceNode, nsIDOMDocument visualDocument, final Renderer render, final UIComponent uiComponent) { @@ -69,6 +69,7 @@ = try { render.encodeBegin(VpeFacesContext.getInstance(), uiComponent); + render.encodeChildren(VpeFacesContext.getInstance(), uiComponent); render.encodeEnd(VpeFacesContext.getInstance(), uiComponent); } catch (Throwable e) { IceFacesActivator.getDefault().logError(e); Added: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/t= ools/jsf/vpe/template/mock/impl/VpeHtmlPanelGrid.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeHtmlPanelGrid.java = (rev 0) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeHtmlPanelGrid.java 2010-05-18 12:57:26 UTC = (rev 22169) @@ -0,0 +1,149 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.jsf.vpe.template.mock.impl; + +import java.util.HashMap; +import java.util.Map; + +import javax.el.ELContext; +import javax.el.ELException; +import javax.el.PropertyNotWritableException; +import javax.el.ValueExpression; +import javax.faces.component.html.HtmlPanelGrid; +import javax.faces.context.FacesContext; +import javax.el.PropertyNotFoundException; + +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; + +/** + * @author mareshkau + * + */ +public class VpeHtmlPanelGrid extends HtmlPanelGrid { + = + private Map attributesMap; + = + private Element sourceElement; + = + public VpeHtmlPanelGrid(Element sourceElement) { + this.attributesMap =3D new HashMap(); + NamedNodeMap attributes =3D sourceElement.getAttributes(); + for(int i=3D0;i getExpectedType() { + // TODO Auto-generated method stub + return String.class; + } + + @Override + public Class getType(ELContext arg0) + throws NullPointerException, PropertyNotFoundException, + ELException { + // TODO Auto-generated method stub + return String.class; + } + + @Override + public Object getValue(ELContext arg0) throws NullPointerException, + PropertyNotFoundException, ELException { + return getAttributes().get(name); + } + + @Override + public boolean isReadOnly(ELContext arg0) + throws NullPointerException, PropertyNotFoundException, + ELException { + // TODO Auto-generated method stub + return false; + } + + @Override + public void setValue(ELContext arg0, Object arg1) + throws NullPointerException, PropertyNotFoundException, + PropertyNotWritableException, ELException { + // TODO Auto-generated method stub + = + } + + @Override + public boolean equals(Object arg0) { + // TODO Auto-generated method stub + return false; + } + + @Override + public String getExpressionString() { + // TODO Auto-generated method stub + return (String) getAttributes().get(name); + } + + @Override + public int hashCode() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public boolean isLiteralText() { + // TODO Auto-generated method stub + return false; + } + = + }; + } + + /** + * @param sourceElement the sourceElement to set + */ + private void setSourceElement(Element sourceElement) { + this.sourceElement =3D sourceElement; + } + + /** + * @return the sourceElement + */ + private Element getSourceElement() { + return this.sourceElement; + } +} Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jbos= s/tools/jsf/vpe/template/mock/impl/VpeUIComponent.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeUIComponent.java 2010-05-18 12:17:44 UTC (r= ev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/src/org/jboss/tool= s/jsf/vpe/template/mock/impl/VpeUIComponent.java 2010-05-18 12:57:26 UTC (r= ev 22169) @@ -18,9 +18,7 @@ import javax.el.PropertyNotWritableException; import javax.el.ValueExpression; import javax.faces.context.FacesContext; -import javax.faces.el.EvaluationException; import javax.faces.el.PropertyNotFoundException; -import javax.faces.el.ValueBinding; import org.jboss.tools.jsf.vpe.template.mock.abstr.VpeAbstractUIComponent; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Modified: workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vp= e-templates-icefaces.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-temp= lates-icefaces.xml 2010-05-18 12:17:44 UTC (rev 22168) +++ workspace/mareshkau/org.jboss.tools.jsf.vpe.icefaces/templates/vpe-temp= lates-icefaces.xml 2010-05-18 12:57:26 UTC (rev 22169) @@ -70,4 +70,17 @@ + + + + + + + + + + + + --===============3287649587068916244==-- From jbosstools-commits at lists.jboss.org Tue May 18 08:59:25 2010 Content-Type: multipart/mixed; boundary="===============6286020508661477738==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22170 - branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard. Date: Tue, 18 May 2010 08:59:25 -0400 Message-ID: <201005181259.o4ICxPXO007326@svn01.web.mwc.hst.phx2.redhat.com> --===============6286020508661477738== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: koen.aers(a)jboss.com Date: 2010-05-18 08:59:24 -0400 (Tue, 18 May 2010) New Revision: 22170 Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/= jpdl/wizard/ConfigureRuntimePage.java Log: JBDS-1181 Modified: branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/j= bpm/gd/jpdl/wizard/ConfigureRuntimePage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd= /jpdl/wizard/ConfigureRuntimePage.java 2010-05-18 12:57:26 UTC (rev 22169) +++ branches/jbosstools-3.1.x/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd= /jpdl/wizard/ConfigureRuntimePage.java 2010-05-18 12:59:24 UTC (rev 22170) @@ -61,7 +61,7 @@ Composite composite =3D createClientArea(parent); createLocateJbpmRuntimeGroup(composite); createSpace(composite); - createDownloadJbpmRuntimeLink(composite); +// createDownloadJbpmRuntimeLink(composite); setControl(composite); } = @@ -85,19 +85,19 @@ label.setLayoutData(new GridData(GridData.FILL_BOTH)); } = - private void createDownloadJbpmRuntimeLink(Composite composite) { - Link link =3D new Link(composite, SWT.NONE); - link.setText("Download the JBoss jBPM package if you have none availa= ble yet."); - GridData gridData =3D new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalAlignment =3D SWT.CENTER; - gridData.verticalIndent =3D 5; - link.setLayoutData(gridData); - link.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - Program.launch("http://labs.jboss.com/jbossjbpm/downloads/"); - } = - }); - } +// private void createDownloadJbpmRuntimeLink(Composite composite) { +// Link link =3D new Link(composite, SWT.NONE); +// link.setText("Download the JBoss jBPM package if you have none avai= lable yet."); +// GridData gridData =3D new GridData(GridData.FILL_HORIZONTAL); +// gridData.horizontalAlignment =3D SWT.CENTER; +// gridData.verticalIndent =3D 5; +// link.setLayoutData(gridData); +// link.addSelectionListener(new SelectionAdapter() { +// public void widgetSelected(SelectionEvent e) { +// Program.launch("http://labs.jboss.com/jbossjbpm/downloads/"); +// } = +// }); +// } = private void createLocateJbpmRuntimeGroup(Composite composite) { Group group =3D new Group(composite, SWT.NONE); --===============6286020508661477738==-- From jbosstools-commits at lists.jboss.org Tue May 18 09:02:14 2010 Content-Type: multipart/mixed; boundary="===============7032581053125113445==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22171 - trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard. Date: Tue, 18 May 2010 09:02:14 -0400 Message-ID: <201005181302.o4ID2E2j008634@svn01.web.mwc.hst.phx2.redhat.com> --===============7032581053125113445== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: koen.aers(a)jboss.com Date: 2010-05-18 09:02:14 -0400 (Tue, 18 May 2010) New Revision: 22171 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/Configur= eRuntimePage.java Log: JBDS-1181 Modified: trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/C= onfigureRuntimePage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/Configu= reRuntimePage.java 2010-05-18 12:59:24 UTC (rev 22170) +++ trunk/jbpm/plugins/org.jbpm.gd.jpdl/src/org/jbpm/gd/jpdl/wizard/Configu= reRuntimePage.java 2010-05-18 13:02:14 UTC (rev 22171) @@ -61,7 +61,7 @@ Composite composite =3D createClientArea(parent); createLocateJbpmRuntimeGroup(composite); createSpace(composite); - createDownloadJbpmRuntimeLink(composite); +// createDownloadJbpmRuntimeLink(composite); setControl(composite); } = @@ -85,19 +85,19 @@ label.setLayoutData(new GridData(GridData.FILL_BOTH)); } = - private void createDownloadJbpmRuntimeLink(Composite composite) { - Link link =3D new Link(composite, SWT.NONE); - link.setText("Download the JBoss jBPM package if you have none availa= ble yet."); - GridData gridData =3D new GridData(GridData.FILL_HORIZONTAL); - gridData.horizontalAlignment =3D SWT.CENTER; - gridData.verticalIndent =3D 5; - link.setLayoutData(gridData); - link.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - Program.launch("http://labs.jboss.com/jbossjbpm/downloads/"); - } = - }); - } +// private void createDownloadJbpmRuntimeLink(Composite composite) { +// Link link =3D new Link(composite, SWT.NONE); +// link.setText("Download the JBoss jBPM package if you have none avai= lable yet."); +// GridData gridData =3D new GridData(GridData.FILL_HORIZONTAL); +// gridData.horizontalAlignment =3D SWT.CENTER; +// gridData.verticalIndent =3D 5; +// link.setLayoutData(gridData); +// link.addSelectionListener(new SelectionAdapter() { +// public void widgetSelected(SelectionEvent e) { +// Program.launch("http://labs.jboss.com/jbossjbpm/downloads/"); +// } = +// }); +// } = private void createLocateJbpmRuntimeGroup(Composite composite) { Group group =3D new Group(composite, SWT.NONE); --===============7032581053125113445==-- From jbosstools-commits at lists.jboss.org Tue May 18 10:37:23 2010 Content-Type: multipart/mixed; boundary="===============7064622465290492128==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22172 - in trunk/seam: plugins/org.jboss.tools.seam.xml/resources/help and 7 other directories. Date: Tue, 18 May 2010 10:37:23 -0400 Message-ID: <201005181437.o4IEbNKK031630@svn01.web.mwc.hst.phx2.redhat.com> --===============7064622465290492128== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-18 10:37:22 -0400 (Tue, 18 May 2010) New Revision: 22172 Added: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-navigati= on.meta trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/ trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/ trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components2= 2.xml trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/= xml/test/SeamXMLAllTests.java trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/= xml/test/SeamXMLModelTest.java trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/= xml/test/SeamXMLTestSetup.java trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/= xml/test/SeamXMLTestSuite.java Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/= xml/ui/editor/form/core/PropertyListFormLayoutData.java trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam/= xml/ui/editor/form/core/SeamComponentsCoreFormLayoutData.java trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-men= u.properties trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.pro= perties trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties Log: https://jira.jboss.org/browse/JBIDE-6224 Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2010-05-18 13:02= :14 UTC (rev 22171) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/plugin.xml 2010-05-18 14:37= :22 UTC (rev 22172) @@ -11,6 +11,7 @@ + Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-s= eam-menu.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-me= nu.properties 2010-05-18 13:02:14 UTC (rev 22171) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam-me= nu.properties 2010-05-18 14:37:22 UTC (rev 22172) @@ -73,6 +73,8 @@ Seam.AddContextLoader.menu=3DContext Loader... Seam.AddTaskDispatcher.menu=3DTask Dispatcher... Seam.AddTransaction.menu=3DTransaction... +Seam.Navigation.menu=3DNavigation +Seam.AddNavigationPages.menu=3DNavigation Pages... Seam.Theme.menu=3DTheme Seam.AddThemeSelector.menu=3DTheme Selector... Seam.Transaction.menu=3DTransaction Modified: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-s= eam.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.pr= operties 2010-05-18 13:02:14 UTC (rev 22171) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/help/keys-seam.pr= operties 2010-05-18 14:37:22 UTC (rev 22172) @@ -975,6 +975,9 @@ FileSeamComponents20_AddThemeSelector.WindowTitle=3DAdd Theme Selector FileSeamComponents20_AddThemeSelector.Title=3DSeam Theme Selector = +FileSeamComponents20_AddNavigationPages.WindowTitle=3DAdd Navigation Pages +FileSeamComponents20_AddNavigationPages.Title=3DSeam Navigation Pages + FileSeamComponents20_EditorActionList_AddThemeSelector.WindowTitle=3DAdd T= heme Selector FileSeamComponents20_EditorActionList_AddThemeSelector.Title=3DSeam Theme = Selector = @@ -1317,6 +1320,9 @@ FileSeamComponents21_AddThemeSelector.WindowTitle=3DAdd Theme Selector FileSeamComponents21_AddThemeSelector.Title=3DSeam Theme Selector = +FileSeamComponents21_AddNavigationPages.WindowTitle=3DAdd Navigation Pages +FileSeamComponents21_AddNavigationPages.Title=3DSeam Navigation Pages + FileSeamComponents21_AddEjb.WindowTitle=3DAdd Ejb FileSeamComponents21_AddEjb.Title=3DSeam Transaction Ejb = @@ -1413,6 +1419,9 @@ FileSeamComponents22_AddThemeSelector.WindowTitle=3DAdd Theme Selector FileSeamComponents22_AddThemeSelector.Title=3DSeam Theme Selector = +FileSeamComponents22_AddNavigationPages.WindowTitle=3DAdd Navigation Pages +FileSeamComponents22_AddNavigationPages.Title=3DSeam Navigation Pages + FileSeamComponents22_AddEjb.WindowTitle=3DAdd Ejb FileSeamComponents22_AddEjb.Title=3DSeam Transaction Ejb = Added: trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-navi= gation.meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-navigat= ion.meta (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/resources/meta/seam-navigat= ion.meta 2010-05-18 14:37:22 UTC (rev 22172) @@ -0,0 +1,226 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tool= s/seam/xml/ui/editor/form/core/PropertyListFormLayoutData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam= /xml/ui/editor/form/core/PropertyListFormLayoutData.java 2010-05-18 13:02:1= 4 UTC (rev 22171) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam= /xml/ui/editor/form/core/PropertyListFormLayoutData.java 2010-05-18 14:37:2= 2 UTC (rev 22172) @@ -33,6 +33,9 @@ static String ENT_RESTRICTIONS =3D "SeamFrameworkRestrictions"; //$NON-NL= S-1$ static String ENT_HINTS =3D "SeamFrameworkHints"; //$NON-NLS-1$ = + static String ENT_NAVIGATION_PAGES =3D "SeamNavigationPages"; //$NON-NLS-= 1$ + static String ENT_NAVIGATION_RESOURCES =3D "SeamNavigationResources"; //$= NON-NLS-1$ + static String ENT_THEME_SELECTOR =3D "SeamThemeSelector"; //$NON-NLS-1$ static String ENT_AVAILABLE_THEMES =3D "SeamThemeAvailableThemes"; //$NON= -NLS-1$ = @@ -225,6 +228,23 @@ ENT_FILTER, new String[]{null}, FILTER_DEFINITIONS); = /** + * Navigation + */ + private final static IFormData[] NAVIGATION_RESOURCES_DEFINITIONS =3D new= IFormData[] { + createListDefinition("Resources") //$NON-NLS-1$ + }; + = + final static IFormData NAVIGATION_RESOURCES_FORM_DEFINITION =3D new FormD= ata( + ENT_NAVIGATION_RESOURCES, new String[]{null}, NAVIGATION_RESOURCES_DEFIN= ITIONS); + + private final static IFormData[] NAVIGATION_PAGES_DEFINITIONS =3D = + createDefinitionsForListHolder("Navigation Pages", ENT_NAVIGATION_PAGES,= "Resources", "resources"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + final static IFormData NAVIGATION_PAGES_FORM_DEFINITION =3D new FormData( + ENT_NAVIGATION_PAGES, new String[]{null}, NAVIGATION_PAGES_DEFINITIONS); + + + /** * Theme */ private final static IFormData[] AVAILABLE_THEMES_DEFINITIONS =3D new IFo= rmData[] { Modified: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tool= s/seam/xml/ui/editor/form/core/SeamComponentsCoreFormLayoutData.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam= /xml/ui/editor/form/core/SeamComponentsCoreFormLayoutData.java 2010-05-18 1= 3:02:14 UTC (rev 22171) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/src/org/jboss/tools/seam= /xml/ui/editor/form/core/SeamComponentsCoreFormLayoutData.java 2010-05-18 1= 4:37:22 UTC (rev 22172) @@ -43,6 +43,9 @@ PropertyListFormLayoutData.HINTS_FORM_DEFINITION, PropertyListFormLayoutData.RESTRICTIONS_FORM_DEFINITION, = + PropertyListFormLayoutData.NAVIGATION_PAGES_FORM_DEFINITION, + PropertyListFormLayoutData.NAVIGATION_RESOURCES_FORM_DEFINITION, + = PropertyListFormLayoutData.THEME_SELECTOR_FORM_DEFINITION, PropertyListFormLayoutData.AVAILABLE_THEMES_FORM_DEFINITION, = Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.= MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF 201= 0-05-18 13:02:14 UTC (rev 22171) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/META-INF/MANIFEST.MF 201= 0-05-18 14:37:22 UTC (rev 22172) @@ -3,6 +3,10 @@ Bundle-Name: Seam XML Tests Bundle-SymbolicName: org.jboss.tools.seam.xml.test;singleton:=3Dtrue Bundle-Version: 3.1.0.qualifier -Require-Bundle: org.eclipse.core.runtime +Require-Bundle: org.eclipse.core.runtime, + org.junit, + org.jboss.tools.seam.xml, + org.jboss.tools.common.test, + org.jboss.tools.tests Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties 2010-05= -18 13:02:14 UTC (rev 22171) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/build.properties 2010-05= -18 14:37:22 UTC (rev 22172) @@ -1,4 +1,5 @@ source.. =3D src/ output.. =3D bin/ bin.includes =3D META-INF/,\ - . + .,\ + projects/ Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/compone= nts22.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components= 22.xml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/projects/Test/components= 22.xml 2010-05-18 14:37:22 UTC (rev 22172) @@ -0,0 +1,20 @@ + + + + + + + + + v2 + + + + Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/project= s/Test/components22.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/s= eam/xml/test/SeamXMLAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam= /xml/test/SeamXMLAllTests.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam= /xml/test/SeamXMLAllTests.java 2010-05-18 14:37:22 UTC (rev 22172) @@ -0,0 +1,31 @@ +/*************************************************************************= ****** + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.seam.xml.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + + +/** + * @author V.Kabanovich + * + */ +public class SeamXMLAllTests { + public static final String PLUGIN_ID =3D "org.jboss.tools.seam.xml"; + + public static Test suite() { + TestSuite suite =3D new TestSuite(); + suite.setName("All tests for " + PLUGIN_ID); + suite.addTest(new SeamXMLTestSetup(SeamXMLTestSuite.suite())); + + return suite; + } +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org= /jboss/tools/seam/xml/test/SeamXMLAllTests.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/s= eam/xml/test/SeamXMLModelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam= /xml/test/SeamXMLModelTest.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam= /xml/test/SeamXMLModelTest.java 2010-05-18 14:37:22 UTC (rev 22172) @@ -0,0 +1,100 @@ +/*************************************************************************= ****** + * Copyright (c) 2007 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.seam.xml.test; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.Path; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.seam.xml.components.model.SeamComponentConstants; + +public class SeamXMLModelTest extends TestCase { + IProject project =3D null; + + public SeamXMLModelTest() { + super("Seam Scanner test"); + project =3D getTestProject(); + } + = + public IProject getTestProject() { + if(project=3D=3Dnull) { + try { + project =3D findTestProject(); + if(project=3D=3Dnull || !project.exists()) { +// project =3D importPreparedProject("/"); + } + } catch (Exception e) { + e.printStackTrace(); + fail("Can't import Seam XML test project: " + e.getMessage()); + } + } + return project; + } + + public static IProject findTestProject() { + return ResourcesPlugin.getWorkspace().getRoot().getProject("Test"); + } + + + /** + * This test is to check different cases of declaring components in xml. + * It does not check interaction of xml declaration with other declaratio= ns. + */ + public void testXMLModel() { + IFile f =3D project.getFile(new Path("components22.xml")); + assertNotNull("File components22.xml is not found in Test project.", f); + + XModelObject fileObject =3D EclipseResourceUtil.createObjectForResource(= f); + assertNotNull("Cannot create XModel object for file components22.xml.", = fileObject); + + String entity =3D fileObject.getModelEntity().getName(); + assertEquals("File components22.xml is incorrectly parsed by XModel.", S= eamComponentConstants.ENT_SEAM_COMPONENTS_22, entity); + + //TODO continue test + } + + protected XModelObject getComponents22Object() { + if(project =3D=3D null) return null; + IFile f =3D project.getFile(new Path("components22.xml")); + return f =3D=3D null ? null : EclipseResourceUtil.createObjectForResourc= e(f); + = + } + + public void testNavigationPagesComponent() { + XModelObject fileObject =3D getComponents22Object(); + assertNotNull("Cannot create XModel object for file components22.xml.", = fileObject); + = + XModelObject navigationPages =3D fileObject.getChildByPath("org.jboss.se= am.navigation.pages"); + assertNotNull("Cannot find org.jboss.seam.navigation.pages", navigationP= ages); + = + XModelObject resources =3D navigationPages.getChildByPath("resources"); + assertNotNull("Cannot find resources in org.jboss.seam.navigation.pages"= , resources); + = + XModelObject[] resourcesList =3D resources.getChildren(); + assertEquals(1, resourcesList.length); + = + assertAttribute(navigationPages, "no-conversation-view-id", "a.xhtml"); + assertAttribute(navigationPages, "login-view-id", "b.xhtml"); + assertAttribute(navigationPages, "http-port", "1111"); + assertAttribute(navigationPages, "https-port", "1112"); + + } + + protected void assertAttribute(XModelObject object, String name, String v= alue) { + String actual =3D object.getAttributeValue(name); + assertEquals("Attribute " + name + " in " + object.getPresentationString= () + " is incorrect.", value, actual); + } + = +} Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org= /jboss/tools/seam/xml/test/SeamXMLModelTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/s= eam/xml/test/SeamXMLTestSetup.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam= /xml/test/SeamXMLTestSetup.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam= /xml/test/SeamXMLTestSetup.java 2010-05-18 14:37:22 UTC (rev 22172) @@ -0,0 +1,50 @@ +/*************************************************************************= ****** = + * 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.seam.xml.test; + +import junit.extensions.TestSetup; +import junit.framework.Test; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; +import org.jboss.tools.test.util.xpl.EditorTestHelper; + +/** + * @author Viacheslav Kabanovich + */ +public class SeamXMLTestSetup extends TestSetup { + + protected IProject project; = + + public SeamXMLTestSetup(Test test) { + super(test); + } + + @Override + protected void setUp() throws Exception { + project =3D ResourcesUtils.importProject( + "org.jboss.tools.seam.xml.test","/projects/Test" , new NullProgressMon= itor()); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()= ); + EditorTestHelper.joinBackgroundActivities(); + } + + @Override + protected void tearDown() throws Exception { + boolean saveAutoBuild =3D ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + project.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org= /jboss/tools/seam/xml/test/SeamXMLTestSetup.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/s= eam/xml/test/SeamXMLTestSuite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam= /xml/test/SeamXMLTestSuite.java (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam= /xml/test/SeamXMLTestSuite.java 2010-05-18 14:37:22 UTC (rev 22172) @@ -0,0 +1,26 @@ +/*************************************************************************= ****** + * 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.seam.xml.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * @author V. Kabanovich + */ +public class SeamXMLTestSuite extends TestSuite { + + public static Test suite() { + TestSuite suite =3D new TestSuite("Seam XML Tests"); + suite.addTestSuite(SeamXMLModelTest.class); + return suite; + } +} \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org= /jboss/tools/seam/xml/test/SeamXMLTestSuite.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============7064622465290492128==-- From jbosstools-commits at lists.jboss.org Tue May 18 11:12:38 2010 Content-Type: multipart/mixed; boundary="===============0091859326275181090==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22173 - in branches/hibernatetools-multiversion/hibernatetools/plugins: org.hibernate.mediator and 23 other directories. Date: Tue, 18 May 2010 11:12:38 -0400 Message-ID: <201005181512.o4IFCc7o009477@svn01.web.mwc.hst.phx2.redhat.com> --===============0091859326275181090== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-18 11:12:36 -0400 (Tue, 18 May 2010) New Revision: 22173 Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/_add/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/_add/asm-3.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/_add/bsh-core-2.0b4.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/_add/commons-logging-1.0.4.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/_add/freemarker.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/_add/hibernate-tools.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/_add/jtidy-r8-20060801.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/_add/log4j-1.2.15.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/_add/slf4j-api-1.5.8.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/_add/slf4j-log4j12-1.5.8.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/bytecode/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/bytecode/cglib/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/bytecode/cglib/cglib-2.2.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/bytecode/javassist/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/bytecode/javassist/javassist-3.9.0.GA.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/hibernate3.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/jpa/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/c3p0/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/c3p0/c3p0-0.9.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/ehcache/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/ehcache/ehcache-1.5.0.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/infinispan/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/jbosscache/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/oscache/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/oscache/oscache-2.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/proxool/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/proxool/proxool-0.8.3.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/swarmcache/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/optional/swarmcache/swarmcache-1.0RC2.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/required/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/required/antlr-2.7.6.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/required/commons-collections-3.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/required/dom4j-1.6.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/required/javassist-3.9.0.GA.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/required/jta-1.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/required/slf4j-api-1.5.8.jar Removed: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/bsh-core-2.0b4.jar Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActo= r.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/.classpath branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/META-INF/MANIFEST.MF branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/build.properties branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/base/HObject.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/PersistentClassFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/mapping/SingleTableSubclass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/tool/hbm2x/HibernateMappingExporter= .java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/tool/hbm2x/pojo/POJOClass.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - use Hibernate 3.5 and Hiber= nate Tools compatiable libs, fix issues with hbm exporter Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/Configurat= ionActor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationAct= or.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationAct= or.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -65,6 +65,7 @@ import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.RootClass; import org.hibernate.mediator.x.mapping.SimpleValue; +import org.hibernate.mediator.x.mapping.SingleTableSubclass; import org.hibernate.mediator.x.mapping.Subclass; import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.ToOne; @@ -178,7 +179,7 @@ Subclass subclass =3D null; if (pc !=3D null){ if (pc.isAbstract()){ - subclass =3D (Subclass)PersistentClassFactory.createPersistentClassS= tub(pc); + subclass =3D SingleTableSubclass.newInstance(pc); if (pc instanceof RootClass && pc.getDiscriminator() =3D=3D null){ SimpleValue discr =3D SimpleValue.newInstance(); discr.setTypeName("string"); //$NON-NLS-1$ Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/.classpath 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/.classpath 2010-05-18 15:12:36 UTC (rev 22173) @@ -3,42 +3,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/META-INF/MANIFEST.MF 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/META-INF/MANIFEST.MF 2010-05-18 15:12:36 UTC (rev 22173) @@ -4,48 +4,32 @@ Bundle-SymbolicName: org.hibernate.mediator;singleton:=3Dtrue Bundle-Version: 3.3.0.qualifier Bundle-ClassPath: org.hibernate.mediator.jar, - lib/hibernate/asm.jar, - lib/hibernate/asm-attrs.jar, - lib/hibernate/commons-collections-2.1.1.jar, - lib/hibernate/commons-logging-1.0.4.jar, - lib/hibernate/concurrent-1.3.2.jar, - lib/hibernate/connector.jar, - lib/hibernate/dom4j-1.6.1.jar, - lib/hibernate/hibernate3.jar, - lib/hibernate/jboss-cache.jar, - lib/hibernate/jboss-common.jar, - lib/hibernate/jboss-jmx.jar, - lib/hibernate/jboss-system.jar, - lib/hibernate/jdbc2_0-stdext.jar, - lib/hibernate/jta.jar, - lib/hibernate/jaas.jar, - lib/hibernate/oscache-2.1.jar, - lib/hibernate/proxool-0.8.3.jar, - lib/hibernate/swarmcache-1.0rc2.jar, - lib/tools/hibernate-tools.jar, - lib/tools/bsh-2.0b1.jar, - lib/tools/freemarker.jar, - lib/bsh-core-2.0b4.jar, - lib/annotations/ejb3-persistence.jar, - lib/annotations/hibernate-annotations.jar, - lib/hibernate/cglib-2.1.3.jar, - lib/hibernate/jgroups-2.2.8.jar, - lib/hibernate/antlr-2.7.6.jar, - lib/tools/jtidy-r8-20060801.jar, - lib/annotations/hibernate-entitymanager.jar, - lib/hibernate/javassist.jar, - lib/hibernate/ehcache-1.2.3.jar, - lib/hibernate/c3p0-0.9.1.jar, - lib/annotations/hibernate-commons-annotations.jar, - lib/annotations/hibernate-validator.jar, - lib/annotations/hibernate-search.jar, - lib/annotations/lucene-core-2.2.0.jar, - lib/hibernate/log4j-1.2.15.jar, - lib/hibernate/cglib-2.2.jar, - lib/hibernate/commons-collections-3.1.jar, - lib/hibernate/hibernate-jmx.jar, - lib/hibernate/slf4j-api-1.5.8.jar, - lib/hibernate/slf4j-log4j12-1.5.8.jar + lib/_add/bsh-core-2.0b4.jar, + lib/_add/commons-logging-1.0.4.jar, + lib/_add/freemarker.jar, + lib/_add/hibernate-tools.jar, + lib/_add/jtidy-r8-20060801.jar, + lib/_add/log4j-1.2.15.jar, + lib/_add/slf4j-api-1.5.8.jar, + lib/_add/slf4j-log4j12-1.5.8.jar, + lib/bytecode/cglib/cglib-2.2.jar, + lib/bytecode/javassist/javassist-3.9.0.GA.jar, + lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar, + lib/optional/c3p0/c3p0-0.9.1.jar, + lib/optional/ehcache/ehcache-1.5.0.jar, + lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar, + lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar, + lib/optional/oscache/oscache-2.1.jar, + lib/optional/proxool/proxool-0.8.3.jar, + lib/optional/swarmcache/swarmcache-1.0RC2.jar, + lib/required/antlr-2.7.6.jar, + lib/required/commons-collections-3.1.jar, + lib/required/dom4j-1.6.1.jar, + lib/required/javassist-3.9.0.GA.jar, + lib/required/jta-1.1.jar, + lib/required/slf4j-api-1.5.8.jar, + lib/hibernate3.jar, + lib/_add/asm-3.1.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Export-Package: org.hibernate.mediator, @@ -75,6 +59,8 @@ org.hibernate.mediator.x.util, org.dom4j.mediator.x, org.dom4j.mediator.x.io, + org.objectweb.asm, + org.objectweb.asm.signature, net.sf.cglib.core, net.sf.cglib.proxy, net.sf.cglib.reflect Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/build.properties 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/build.properties 2010-05-18 15:12:36 UTC (rev 22173) @@ -4,24 +4,37 @@ META-INF/,\ hibernate-log4j.properties,\ about.html,\ - lib/tools/jtidy-r8-20060801.jar,\ - lib/annotations/hibernate-entitymanager.jar,\ - lib/hibernate/javassist.jar,\ - lib/hibernate/ehcache-1.2.3.jar,\ - lib/hibernate/c3p0-0.9.1.jar,\ - lib/annotations/hibernate-commons-annotations.jar,\ - lib/annotations/hibernate-validator.jar,\ - lib/hibernate/log4j-1.2.15.jar,\ - lib/hibernate/slf4j-api-1.5.8.jar,\ - lib/hibernate/slf4j-log4j12-1.5.8.jar,\ about.ini,\ about.mappings,\ about.properties,\ hibernate_icon.gif,\ plugin.properties,\ - lib/hibernate/cglib-2.2.jar,\ - lib/hibernate/commons-collections-3.1.jar,\ - lib/hibernate/hibernate-jmx.jar + lib/_add/asm-3.1.jar,\ + lib/_add/bsh-core-2.0b4.jar,\ + lib/_add/commons-logging-1.0.4.jar,\ + lib/_add/freemarker.jar,\ + lib/_add/hibernate-tools.jar,\ + lib/_add/jtidy-r8-20060801.jar,\ + lib/_add/log4j-1.2.15.jar,\ + lib/_add/slf4j-api-1.5.8.jar,\ + lib/_add/slf4j-log4j12-1.5.8.jar,\ + lib/bytecode/cglib/cglib-2.2.jar,\ + lib/bytecode/javassist/javassist-3.9.0.GA.jar,\ + lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar,\ + lib/optional/c3p0/c3p0-0.9.1.jar,\ + lib/optional/ehcache/ehcache-1.5.0.jar,\ + lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar,\ + lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar,\ + lib/optional/oscache/oscache-2.1.jar,\ + lib/optional/proxool/proxool-0.8.3.jar,\ + lib/optional/swarmcache/swarmcache-1.0RC2.jar,\ + lib/required/antlr-2.7.6.jar,\ + lib/required/commons-collections-3.1.jar,\ + lib/required/dom4j-1.6.1.jar,\ + lib/required/javassist-3.9.0.GA.jar,\ + lib/required/jta-1.1.jar,\ + lib/required/slf4j-api-1.5.8.jar,\ + lib/hibernate3.jar jars.compile.order =3D org.hibernate.mediator.jar source.org.hibernate.mediator.jar =3D src/ output.org.hibernate.mediator.jar =3D bin/ Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/_add/asm-3.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/_add/asm-3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/_add/bsh-core-2.0b4.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/_add/bsh-core-2.0b4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/_add/commons-logging-1.0.4.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/_add/commons-logging-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/_add/freemarker.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/_add/freemarker.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/_add/hibernate-tools.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/_add/hibernate-tools.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/_add/jtidy-r8-20060801.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/_add/jtidy-r8-20060801.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/_add/log4j-1.2.15.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/_add/log4j-1.2.15.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/_add/slf4j-api-1.5.8.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/_add/slf4j-api-1.5.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/_add/slf4j-log4j12-1.5.8.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/_add/slf4j-log4j12-1.5.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hi= bernate.mediator/lib/bsh-core-2.0b4.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/bytecode/cglib/cglib-2.2.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/bytecode/cglib/cglib-2.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/bytecode/javassist/javassist-3.9.0.GA.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/bytecode/javassist/javassist-3.9.0.GA.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/hibernate3.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/hibernate3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/optional/c3p0/c3p0-0.9.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/optional/c3p0/c3p0-0.9.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/optional/ehcache/ehcache-1.5.0.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/optional/ehcache/ehcache-1.5.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/optional/infinispan/infinispan-core-4.0.0.= FINAL.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/optional/jbosscache/jbosscache-core-3.2.1.= GA.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/optional/oscache/oscache-2.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/optional/oscache/oscache-2.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/optional/proxool/proxool-0.8.3.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/optional/proxool/proxool-0.8.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/optional/swarmcache/swarmcache-1.0RC2.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/optional/swarmcache/swarmcache-1.0RC2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/required/antlr-2.7.6.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/required/antlr-2.7.6.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/required/commons-collections-3.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/required/commons-collections-3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/required/dom4j-1.6.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/required/dom4j-1.6.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/required/javassist-3.9.0.GA.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/required/javassist-3.9.0.GA.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/required/jta-1.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/required/jta-1.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib/required/slf4j-api-1.5.8.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib/required/slf4j-api-1.5.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/base/HObject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/base/HObject.java 2010-05-18 14:37:2= 2 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/base/HObject.java 2010-05-18 15:12:3= 6 UTC (rev 22173) @@ -266,4 +266,28 @@ throw new HibernateConsoleRuntimeException(e); } } + + public static final Object readStaticFieldValueNoException(final String c= lassName, String fieldName) { + Class clazz; + try { + clazz =3D ReflectHelper.classForName(className); + } catch (ClassNotFoundException e) { + return null; + } + Field fld; + try { + fld =3D clazz.getDeclaredField(fieldName); + } catch (SecurityException e) { + return null; + } catch (NoSuchFieldException e) { + return null; + } + try { + return fld.get(null); + } catch (IllegalArgumentException e) { + return null; + } catch (IllegalAccessException e) { + return null; + } + } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb= 3.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java= 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java= 2010-05-18 15:12:36 UTC (rev 22173) @@ -203,10 +203,10 @@ //result[0] - detect classes //result[1] - detect hbm boolean[] result =3D { false, false }; - String detect =3D overridenProperties !=3D null ? + String detect =3D overridenProperties !=3D null && HibernatePersistence.= AUTODETECTION !=3D null ? (String) overridenProperties.get(HibernatePersistence.AUTODETECTION) := null; - detect =3D detect =3D=3D null ? - properties.getProperty( HibernatePersistence.AUTODETECTION) : detect; + detect =3D detect =3D=3D null && HibernatePersistence.AUTODETECTION !=3D= null ? + properties.getProperty(HibernatePersistence.AUTODETECTION) : detect; if (detect =3D=3D null && excludeIfNotOverriden) { //not overridden through HibernatePersistence.AUTODETECTION so we compl= y with the spec excludeUnlistedClasses return result; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java 2010-05-18 = 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java 2010-05-18 = 15:12:36 UTC (rev 22173) @@ -1,6 +1,7 @@ package org.hibernate.mediator.x.cfg; = import java.io.File; +import java.lang.reflect.Method; import java.sql.Driver; import java.sql.DriverManager; import java.sql.SQLException; @@ -10,6 +11,8 @@ import java.util.Map; import java.util.Properties; = +import net.sf.cglib.proxy.MethodProxy; + import org.eclipse.osgi.util.NLS; import org.hibernate.mediator.HibernateConsoleRuntimeException; import org.hibernate.mediator.Messages; @@ -132,19 +135,22 @@ } = public HibernateMappingExporter createHibernateMappingExporter(File folde= r2Gen, final IExporterNewOutputDir enod) { - return new HibernateMappingExporter(this, folder2Gen) { + return HibernateMappingExporter.newInstance(this, folder2Gen, new Hibern= ateMappingExporter.IExportPOJOInterceptor() { @SuppressWarnings("unchecked") - protected void exportPOJO(Map additionalContext, POJOClass element) { - File outputdir4FileOld =3D getOutputDirectory(); + public Object exportPOJO(Object obj, Method method, Object[] args, Meth= odProxy proxy) throws Throwable { + HibernateMappingExporter hme =3D HibernateMappingExporter.newInstance(= obj); + POJOClass element =3D POJOClass.newInstance(args[1]); + File outputdir4FileOld =3D hme.getOutputDirectory(); File outputdir4FileNew =3D enod.getNewOutputDir(element, outputdir4Fil= eOld); if (!outputdir4FileNew.exists()) { outputdir4FileNew.mkdirs(); } - setOutputDirectory(outputdir4FileNew); - super.exportPOJO(additionalContext, element); - setOutputDirectory(outputdir4FileOld); + hme.setOutputDirectory(outputdir4FileNew); + Object res =3D proxy.invokeSuper(obj, args); + hme.setOutputDirectory(outputdir4FileOld); + return res; } - }; + }); } = @SuppressWarnings("unchecked") Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java 2010= -05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/HibernatePersistence.java 2010= -05-18 15:12:36 UTC (rev 22173) @@ -10,6 +10,6 @@ super(hibernatePersistence, CL); } = - public static final String AUTODETECTION =3D (String)HObject.readStaticFi= eldValue(CL, "AUTODETECTION"); //$NON-NLS-1$ + public static final String AUTODETECTION =3D (String)HObject.readStaticFi= eldValueNoException(CL, "AUTODETECTION"); //$NON-NLS-1$ = } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClassFacto= ry.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/PersistentClassFactory.jav= a 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/PersistentClassFactory.jav= a 2010-05-18 15:12:36 UTC (rev 22173) @@ -1,6 +1,8 @@ package org.hibernate.mediator.x.mapping; = +import org.hibernate.mediator.stubs.util.ClassHelper; = + public class PersistentClassFactory { @SuppressWarnings("unchecked") public static PersistentClass createPersistentClassStub(Object value) { @@ -8,18 +10,16 @@ return null; } final Class cl =3D value.getClass(); - if (0 =3D=3D RootClass.CL.compareTo(cl.getName())) { - return new RootClass(value); - //} else if (0 =3D=3D PersistentClassStub.CL.compareTo(cl.getName())) { - // return new PersistentClassStub(value); - } else if (0 =3D=3D Subclass.CL.compareTo(cl.getName())) { - return new Subclass(value); - } else if (0 =3D=3D JoinedSubclass.CL.compareTo(cl.getName())) { + if (ClassHelper.isClassOrOffspring(cl, JoinedSubclass.CL)) { return new JoinedSubclass(value); - } else if (0 =3D=3D SingleTableSubclass.CL.compareTo(cl.getName())) { + } else if (ClassHelper.isClassOrOffspring(cl, SingleTableSubclass.CL)) { return new SingleTableSubclass(value); - } else if (0 =3D=3D UnionSubclass.CL.compareTo(cl.getName())) { + } else if (ClassHelper.isClassOrOffspring(cl, UnionSubclass.CL)) { return new UnionSubclass(value); + } else if (ClassHelper.isClassOrOffspring(cl, Subclass.CL)) { + return new Subclass(value); + } else if (ClassHelper.isClassOrOffspring(cl, RootClass.CL)) { + return new RootClass(value); } return null; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/mapping/SingleTableSubclass.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/SingleTableSubclass.java 2= 010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/mapping/SingleTableSubclass.java 2= 010-05-18 15:12:36 UTC (rev 22173) @@ -7,4 +7,8 @@ protected SingleTableSubclass(Object singleTableSubclass) { super(singleTableSubclass, CL); } + = + public static SingleTableSubclass newInstance(PersistentClass superclass)= { + return new SingleTableSubclass(newInstance(CL, superclass)); + } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/HibernateMappingE= xporter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/tool/hbm2x/HibernateMappingExporte= r.java 2010-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/tool/hbm2x/HibernateMappingExporte= r.java 2010-05-18 15:12:36 UTC (rev 22173) @@ -5,18 +5,78 @@ import java.lang.reflect.Method; import java.util.Map; = +import net.sf.cglib.proxy.Callback; +import net.sf.cglib.proxy.CallbackFilter; +import net.sf.cglib.proxy.Enhancer; +import net.sf.cglib.proxy.MethodInterceptor; +import net.sf.cglib.proxy.MethodProxy; + import org.hibernate.mediator.HibernateConsoleRuntimeException; import org.hibernate.mediator.base.HObject; +import org.hibernate.mediator.stubs.util.ReflectHelper; import org.hibernate.mediator.x.cfg.Configuration; import org.hibernate.mediator.x.tool.hbm2x.pojo.POJOClass; = public class HibernateMappingExporter extends HObject { public static final String CL =3D "org.hibernate.tool.hbm2x.HibernateMapp= ingExporter"; //$NON-NLS-1$ + = + public interface IExportPOJOInterceptor { + public Object exportPOJO(Object obj, Method method, Object[] args, Metho= dProxy proxy) throws Throwable; + } = - protected HibernateMappingExporter(Configuration cfg, File outputdir) { - super(HObject.newInstance(CL, cfg, outputdir), CL); = + protected HibernateMappingExporter(Object hibernateMappingExporter) { + super(hibernateMappingExporter, CL); = } = + public static HibernateMappingExporter newInstance(Object hibernateMappin= gExporter) { + return new HibernateMappingExporter(hibernateMappingExporter); + } + + public static HibernateMappingExporter newInstance(Configuration cfg, Fil= e outputdir, final IExportPOJOInterceptor exportPOJOInterceptor) { + Class clazz; + try { + clazz =3D ReflectHelper.classForName(CL); + } catch (ClassNotFoundException ex) { + throw new HibernateConsoleRuntimeException(ex); + } + MethodInterceptor mi =3D new MethodInterceptor() { + public Object intercept(Object obj, Method method, Object[] args, Metho= dProxy proxy) throws Throwable { + return exportPOJOInterceptor.exportPOJO(obj, method, args, proxy); + } + }; + Enhancer e =3D createEnhancer(clazz, mi); + try { + clazz =3D ReflectHelper.classForName(Configuration.CL); + } catch (ClassNotFoundException ex) { + throw new HibernateConsoleRuntimeException(ex); + } + Object hibernateMappingExporter =3D e.create(new Class[] { clazz, File.c= lass }, + new Object[] { cfg.Obj(), outputdir } ); + return new HibernateMappingExporter(hibernateMappingExporter); + } + = + private static final CallbackFilter baseExportPOJO =3D new CallbackFilter= () { + public int accept(Method method) { + if ("exportPOJO".equals(method.getName() ) ) { + return 1; + } + return 0; + } + }; + = + public static Enhancer createEnhancer(Class clazz, MethodInterceptor m= i) { + Enhancer e =3D new Enhancer(); + e.setSuperclass(clazz); + MethodInterceptor miDef =3D new MethodInterceptor() { + public Object intercept(Object obj, Method method, Object[] args, Metho= dProxy proxy) throws Throwable { + return proxy.invokeSuper(obj, args); + } + }; + e.setCallbacks(new Callback[] { miDef, mi }); + e.setCallbackFilter(baseExportPOJO); + return e; + } + = public void setGlobalSettings(HibernateMappingGlobalSettings hmgs) { invoke(mn(), hmgs); } @@ -25,16 +85,16 @@ invoke(mn()); } = - protected File getOutputDirectory() { + public File getOutputDirectory() { return (File)invoke(mn()); } = - protected void setOutputDirectory(File outputdir) { + public void setOutputDirectory(File outputdir) { invoke(mn(), outputdir); } = @SuppressWarnings("unchecked") - protected void exportPOJO(Map additionalContext, POJOClass element) { + public void exportPOJO(Map additionalContext, POJOClass element) { // protected -> call via reflection Method m =3D null; try { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/tool/hbm2x/pojo/POJOClass.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/tool/hbm2x/pojo/POJOClass.java 201= 0-05-18 14:37:22 UTC (rev 22172) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/tool/hbm2x/pojo/POJOClass.java 201= 0-05-18 15:12:36 UTC (rev 22173) @@ -9,6 +9,10 @@ super(pojoClass, CL); } = + public static POJOClass newInstance(Object pojoClass) { + return new POJOClass(pojoClass); + } + public String getQualifiedDeclarationName() { return (String)invoke(mn()); } --===============0091859326275181090==-- From jbosstools-commits at lists.jboss.org Tue May 18 11:41:57 2010 Content-Type: multipart/mixed; boundary="===============0131898441707325639==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22174 - trunk/build. Date: Tue, 18 May 2010 11:41:57 -0400 Message-ID: <201005181541.o4IFfvc1013295@svn01.web.mwc.hst.phx2.redhat.com> --===============0131898441707325639== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 11:41:56 -0400 (Tue, 18 May 2010) New Revision: 22174 Modified: trunk/build/build.xml Log: move drools down pending outcome of https://jira.jboss.org/browse/JBIDE-6300 Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-18 15:12:36 UTC (rev 22173) +++ trunk/build/build.xml 2010-05-18 15:41:56 UTC (rev 22174) @@ -9,9 +9,9 @@ value=3D"tests,common; flow,jbpm; jmx,archives,as; - drools,bpel,smooks,freemarker,profiler,portlet,modeshape; + bpel,smooks,freemarker,profiler,portlet,modeshape; xulrunner,jst,vpe,jsf; - esb,tptp,ws; + drools,esb,tptp,ws; cdi,struts,hibernatetools,seam; examples,birt; maven" --===============0131898441707325639==-- From jbosstools-commits at lists.jboss.org Tue May 18 11:43:28 2010 Content-Type: multipart/mixed; boundary="===============6292063417112368064==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22175 - trunk/smooks/plugins/org.jboss.tools.smooks.core. Date: Tue, 18 May 2010 11:43:28 -0400 Message-ID: <201005181543.o4IFhSWq013322@svn01.web.mwc.hst.phx2.redhat.com> --===============6292063417112368064== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 11:43:28 -0400 (Tue, 18 May 2010) New Revision: 22175 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/pom.xml Log: https://jira.jboss.org/browse/JBDS-1212 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/plugins/org.jboss.tools.smooks.core/pom.xml 2010-05-18 15:= 41:56 UTC (rev 22174) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/pom.xml 2010-05-18 15:= 43:28 UTC (rev 22175) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.smooks.core = - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT eclipse-plugin --===============6292063417112368064==-- From jbosstools-commits at lists.jboss.org Tue May 18 11:47:33 2010 Content-Type: multipart/mixed; boundary="===============6110191478506140051==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22176 - in trunk/smooks/plugins/org.jboss.tools.smooks.runtime: META-INF and 1 other directory. Date: Tue, 18 May 2010 11:47:33 -0400 Message-ID: <201005181547.o4IFlXoj013888@svn01.web.mwc.hst.phx2.redhat.com> --===============6110191478506140051== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 11:47:32 -0400 (Tue, 18 May 2010) New Revision: 22176 Removed: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/target/ Modified: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.MF Log: https://jira.jboss.org/browse/JBDS-1212 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANI= FEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.M= F 2010-05-18 15:43:28 UTC (rev 22175) +++ trunk/smooks/plugins/org.jboss.tools.smooks.runtime/META-INF/MANIFEST.M= F 2010-05-18 15:47:32 UTC (rev 22176) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.jboss.tools.smooks.runtime -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.1.qualifier Require-Bundle: org.eclipse.core.runtime, org.apache.commons.codec, org.apache.commons.lang, --===============6110191478506140051==-- From jbosstools-commits at lists.jboss.org Tue May 18 11:49:51 2010 Content-Type: multipart/mixed; boundary="===============3924804377806005204==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22177 - trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test. Date: Tue, 18 May 2010 11:49:50 -0400 Message-ID: <201005181549.o4IFnoVK013906@svn01.web.mwc.hst.phx2.redhat.com> --===============3924804377806005204== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 11:49:50 -0400 (Tue, 18 May 2010) New Revision: 22177 Modified: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml Log: https://jira.jboss.org/browse/JBDS-1212 Modified: trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml 20= 10-05-18 15:47:32 UTC (rev 22176) +++ trunk/freemarker/tests/org.jboss.ide.eclipse.freemarker.test/pom.xml 20= 10-05-18 15:49:50 UTC (rev 22177) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.ide.eclipse.freemarker.test = - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT eclipse-test-plugin --===============3924804377806005204==-- From jbosstools-commits at lists.jboss.org Tue May 18 11:51:08 2010 Content-Type: multipart/mixed; boundary="===============4793094089879348331==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22178 - in branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator: lib.bak and 3 other directories. Date: Tue, 18 May 2010 11:51:08 -0400 Message-ID: <201005181551.o4IFp834014351@svn01.web.mwc.hst.phx2.redhat.com> --===============4793094089879348331== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-18 11:51:07 -0400 (Tue, 18 May 2010) New Revision: 22178 Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/annotations/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/annotations/ejb3-persistence.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/annotations/hibernate-annotations.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/annotations/hibernate-commons-annotations.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/annotations/hibernate-entitymanager.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/annotations/hibernate-validator.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/bsh-core-2.0b4.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/antlr-2.7.6.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/asm-attrs.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/asm.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/c3p0-0.9.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/cglib-2.2.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/commons-collections-3.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/commons-logging-1.0.4.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/concurrent-1.3.2.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/connector.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/dom4j-1.6.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/ehcache-1.2.3.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/hibernate-jmx.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/hibernate3.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/jaas.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/javassist.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/jboss-cache.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/jboss-common.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/jboss-jmx.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/jboss-system.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/jdbc2_0-stdext.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/jgroups-2.2.8.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/jta.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/log4j-1.2.15.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/oscache-2.1.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/proxool-0.8.3.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/slf4j-api-1.5.8.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/slf4j-log4j12-1.5.8.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/hibernate/swarmcache-1.0rc2.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/tools/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/tools/freemarker.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/tools/hibernate-tools.jar branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/tools/jtidy-r8-20060801.jar Removed: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/build/ Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/.cvsignore Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - use Hibernate 3.5 and Hiber= nate Tools compatiable libs, fix issues with hbm exporter Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator ___________________________________________________________________ Name: svn:ignore + build Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/.cvsignore =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/.cvsignore 2010-05-18 15:49:50 UTC (rev 22177) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/.cvsignore 2010-05-18 15:51:07 UTC (rev 22178) @@ -1,2 +1 @@ -build -.settings +build \ No newline at end of file Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/annotations/ejb3-persistence.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/annotations/ejb3-persistence.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/annotations/hibernate-annotations.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/annotations/hibernate-annotations.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/annotations/hibernate-commons-annotations.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/annotations/hibernate-commons-annotati= ons.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/annotations/hibernate-entitymanager.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/annotations/hibernate-entitymanager.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/annotations/hibernate-validator.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/annotations/hibernate-validator.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/bsh-core-2.0b4.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/bsh-core-2.0b4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/antlr-2.7.6.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/antlr-2.7.6.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/asm-attrs.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/asm-attrs.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/asm.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/asm.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/c3p0-0.9.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/c3p0-0.9.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/cglib-2.2.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/cglib-2.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/commons-collections-3.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/commons-collections-3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/commons-logging-1.0.4.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/commons-logging-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/concurrent-1.3.2.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/concurrent-1.3.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/connector.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/connector.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/dom4j-1.6.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/dom4j-1.6.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/ehcache-1.2.3.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/ehcache-1.2.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/hibernate-jmx.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/hibernate-jmx.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/hibernate3.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/hibernate3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/jaas.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/jaas.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/javassist.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/javassist.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/jboss-cache.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/jboss-cache.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/jboss-common.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/jboss-common.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/jboss-jmx.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/jboss-jmx.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/jboss-system.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/jboss-system.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/jdbc2_0-stdext.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/jdbc2_0-stdext.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/jgroups-2.2.8.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/jgroups-2.2.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/jta.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/jta.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/log4j-1.2.15.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/log4j-1.2.15.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/oscache-2.1.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/oscache-2.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/proxool-0.8.3.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/proxool-0.8.3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/slf4j-api-1.5.8.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/slf4j-api-1.5.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/slf4j-log4j12-1.5.8.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/slf4j-log4j12-1.5.8.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/hibernate/swarmcache-1.0rc2.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/hibernate/swarmcache-1.0rc2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/tools/freemarker.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/tools/freemarker.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/tools/hibernate-tools.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/tools/hibernate-tools.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibe= rnate.mediator/lib.bak/tools/jtidy-r8-20060801.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/hibernatetools-multiversion/hibernatetools/pl= ugins/org.hibernate.mediator/lib.bak/tools/jtidy-r8-20060801.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============4793094089879348331==-- From jbosstools-commits at lists.jboss.org Tue May 18 11:51:29 2010 Content-Type: multipart/mixed; boundary="===============1605713906737857279==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22179 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test: META-INF and 1 other directory. Date: Tue, 18 May 2010 11:51:29 -0400 Message-ID: <201005181551.o4IFpTJZ014362@svn01.web.mwc.hst.phx2.redhat.com> --===============1605713906737857279== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 11:51:28 -0400 (Tue, 18 May 2010) New Revision: 22179 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml Log: JBDS-1212 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST= .MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF 20= 10-05-18 15:51:07 UTC (rev 22178) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF 20= 10-05-18 15:51:28 UTC (rev 22179) @@ -11,6 +11,8 @@ org.eclipse.swtbot.swt.finder;bundle-version=3D"2.0.0", org.apache.log4j;bundle-version=3D"1.2.13", org.junit4;bundle-version=3D"4.5.0", + org.eclipse.swtbot.eclipse.spy;bundle-version=3D"2.0.0", + org.eclipse.swtbot.eclipse.ui;bundle-version=3D"2.0.0", org.eclipse.swtbot.junit4_x;bundle-version=3D"2.0.0", org.jboss.tools.ui.bot.ext Bundle-ActivationPolicy: lazy Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml 2010-05-18 15:5= 1:07 UTC (rev 22178) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml 2010-05-18 15:5= 1:28 UTC (rev 22179) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.ui.bot.test = - 1.0.0-SNAPSHOT + 3.1.0-SNAPSHOT eclipse-test-plugin --===============1605713906737857279==-- From jbosstools-commits at lists.jboss.org Tue May 18 11:54:08 2010 Content-Type: multipart/mixed; boundary="===============8001395795974363666==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22180 - trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF. Date: Tue, 18 May 2010 11:54:08 -0400 Message-ID: <201005181554.o4IFs8w3014419@svn01.web.mwc.hst.phx2.redhat.com> --===============8001395795974363666== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 11:54:07 -0400 (Tue, 18 May 2010) New Revision: 22180 Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.= MF Log: add missing org.jboss.tools.tests dep Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MA= NIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST= .MF 2010-05-18 15:51:28 UTC (rev 22179) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST= .MF 2010-05-18 15:54:07 UTC (rev 22180) @@ -1,17 +1,22 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.tools.jsf.verification.test;singleton:=3Dtr= ue -Bundle-Version: 3.1.0.qualifier -Bundle-ClassPath: jsf-verification-tests.jar -Bundle-Vendor: %Bundle-Vendor.0 -Export-Package: org.jboss.tools.jsf.verification.test -Require-Bundle: = - org.junit, - org.jboss.tools.common.verification, - org.jboss.tools.jsf, - org.jboss.tools.common.model.ui, - org.jboss.tools.common.verification.test, - org.jboss.tools.tests -Bundle-Localization: plugin +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.jboss.tools.jsf.verification.test;singleton:=3Dtr= ue +Bundle-Version: 3.1.0.qualifier +Bundle-ClassPath: jsf-verification-tests.jar +Bundle-Vendor: %Bundle-Vendor.0 +Export-Package: org.jboss.tools.jsf.verification.test +Require-Bundle: = + org.junit, + org.jboss.tools.tests + org.eclipse.core.runtime, + org.eclipse.core.resources, + org.jboss.tools.common.model, + org.jboss.tools.common.verification, + org.jboss.tools.jsf, + org.jboss.tools.jsf.verification, + org.jboss.tools.common.model.ui, + org.jboss.tools.common.test, + org.jboss.tools.common.verification.test +Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 --===============8001395795974363666==-- From jbosstools-commits at lists.jboss.org Tue May 18 11:58:32 2010 Content-Type: multipart/mixed; boundary="===============1291805122115419673==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22181 - trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF. Date: Tue, 18 May 2010 11:58:31 -0400 Message-ID: <201005181558.o4IFwV0o014891@svn01.web.mwc.hst.phx2.redhat.com> --===============1291805122115419673== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 11:58:31 -0400 (Tue, 18 May 2010) New Revision: 22181 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF Log: add missing org.eclipse.ltk.core.refactoring dep Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2010-05= -18 15:54:07 UTC (rev 22180) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2010-05= -18 15:58:31 UTC (rev 22181) @@ -17,9 +17,9 @@ org.eclipse.wst.validation, org.jboss.tools.jst.web.kb, org.jboss.tools.common.el.core, + org.eclipse.ltk.core.refactoring, org.eclipse.jface.text, - org.eclipse.equinox.preferences, - org.eclipse.ltk.core.refactoring;bundle-version=3D"3.5.0" + org.eclipse.equinox.preferences Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: JBoss by Red Hat @@ -29,7 +29,6 @@ org.jboss.tools.cdi.internal.core.impl, org.jboss.tools.cdi.internal.core.impl.definition, org.jboss.tools.cdi.internal.core.project.facet, - org.jboss.tools.cdi.internal.core.refactoring, org.jboss.tools.cdi.internal.core.scanner, org.jboss.tools.cdi.internal.core.scanner.lib, org.jboss.tools.cdi.internal.core.validation --===============1291805122115419673==-- From jbosstools-commits at lists.jboss.org Tue May 18 12:06:25 2010 Content-Type: multipart/mixed; boundary="===============7556539282257159879==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22182 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util. Date: Tue, 18 May 2010 12:06:25 -0400 Message-ID: <201005181606.o4IG6PdS021892@svn01.web.mwc.hst.phx2.redhat.com> --===============7556539282257159879== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-18 12:06:24 -0400 (Tue, 18 May 2010) New Revision: 22182 Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/= ResourcesUtils.java Log: https://jira.jboss.org/browse/JBIDE-6241 Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tes= t/util/ResourcesUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util= /ResourcesUtils.java 2010-05-18 15:58:31 UTC (rev 22181) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util= /ResourcesUtils.java 2010-05-18 16:06:24 UTC (rev 22182) @@ -195,7 +195,7 @@ * @param path the path * @param projectName the project name */ - static public IProject importProjectIntoWorkspace(String path, String pro= jectName) { + static public IProject importProjectIntoWorkspace(String path, String pro= jectName) throws IOException { = IProject project =3D null; = @@ -219,10 +219,16 @@ unimportedFiles.add(".svn"); //$NON-NLS-1$ = importProvider.setUnimportedFiles(unimportedFiles); + = + File file =3D new File(path); + = + if(!file.isDirectory()) { + throw new IOException("Cannot import test project from " + file); + } = // create import operation ImportOperation importOp =3D new ImportOperation(project - .getFullPath(), new File(path), importProvider, overwrite); + .getFullPath(), file, importProvider, overwrite); = // import files just to project folder ( without old structure ) importOp.setCreateContainerStructure(false); --===============7556539282257159879==-- From jbosstools-commits at lists.jboss.org Tue May 18 12:10:23 2010 Content-Type: multipart/mixed; boundary="===============5470539060327200672==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22183 - in trunk: birt and 220 other directories. Date: Tue, 18 May 2010 12:10:22 -0400 Message-ID: <201005181610.o4IGAMiN022951@svn01.web.mwc.hst.phx2.redhat.com> --===============5470539060327200672== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 12:10:08 -0400 (Tue, 18 May 2010) New Revision: 22183 Added: trunk/birt/features/org.jboss.tools.birt.feature/pom.xml trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml trunk/birt/features/pom.xml trunk/birt/plugins/org.jboss.tools.birt.core/pom.xml trunk/birt/plugins/org.jboss.tools.birt.oda.ui/pom.xml trunk/birt/plugins/org.jboss.tools.birt.oda/pom.xml trunk/birt/plugins/pom.xml trunk/birt/pom.xml trunk/birt/tests/org.jboss.tools.birt.core.test/pom.xml trunk/birt/tests/pom.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml trunk/cdi/features/org.jboss.tools.cdi.feature/pom.xml trunk/cdi/features/pom.xml trunk/cdi/plugins/org.jboss.tools.cdi.core/pom.xml trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml trunk/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml trunk/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml trunk/cdi/plugins/pom.xml trunk/cdi/pom.xml trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml trunk/cdi/tests/pom.xml trunk/esb/features/org.jboss.tools.esb.feature/pom.xml trunk/esb/features/org.jboss.tools.esb.test.feature/pom.xml trunk/esb/features/pom.xml trunk/esb/plugins/org.jboss.tools.esb.core/pom.xml trunk/esb/plugins/org.jboss.tools.esb.project.core/pom.xml trunk/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml trunk/esb/plugins/org.jboss.tools.esb.ui/pom.xml trunk/esb/plugins/org.jboss.tools.esb.validator/pom.xml trunk/esb/plugins/pom.xml trunk/esb/pom.xml trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml trunk/esb/tests/pom.xml trunk/examples/features/org.jboss.tools.community.project.examples.featu= re/pom.xml trunk/examples/features/org.jboss.tools.project.examples.feature/pom.xml trunk/examples/features/org.jboss.tools.project.examples.test.feature/po= m.xml trunk/examples/features/pom.xml trunk/examples/plugins/org.jboss.tools.community.project.examples/pom.xml trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/pom.x= ml trunk/examples/plugins/org.jboss.tools.project.examples/pom.xml trunk/examples/plugins/pom.xml trunk/examples/pom.xml trunk/examples/tests/org.jboss.tools.project.examples.test/pom.xml trunk/examples/tests/pom.xml trunk/hibernatetools/features/org.hibernate.eclipse.feature/pom.xml trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/pom.xml trunk/hibernatetools/features/pom.xml trunk/hibernatetools/plugins/org.hibernate.eclipse.console/pom.xml trunk/hibernatetools/plugins/org.hibernate.eclipse.help/pom.xml trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/pom.xml trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/pom.xml trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/pom.xml trunk/hibernatetools/plugins/org.hibernate.eclipse/pom.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/pom.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/pom.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/pom.xml trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/pom.xml trunk/hibernatetools/plugins/pom.xml trunk/hibernatetools/pom.xml trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.x= ml trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/pom.xml trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/pom.xml trunk/hibernatetools/tests/pom.xml trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/pom.xml trunk/labs/features/pom.xml trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/pom.xml trunk/labs/plugins/pom.xml trunk/labs/tests/pom.xml trunk/maven/features/org.jboss.tools.maven.feature/pom.xml trunk/maven/features/org.jboss.tools.maven.seam.feature/pom.xml trunk/maven/features/pom.xml trunk/maven/plugins/org.jboss.tools.maven.core/pom.xml trunk/maven/plugins/org.jboss.tools.maven.seam/pom.xml trunk/maven/plugins/org.jboss.tools.maven.ui/pom.xml trunk/maven/plugins/pom.xml trunk/maven/pom.xml trunk/maven/tests/pom.xml trunk/seam/features/org.jboss.tools.seam.feature/pom.xml trunk/seam/features/org.jboss.tools.seam.test.feature/pom.xml trunk/seam/features/pom.xml trunk/seam/plugins/org.jboss.tools.seam.core/pom.xml trunk/seam/plugins/org.jboss.tools.seam.doc.user/pom.xml trunk/seam/plugins/org.jboss.tools.seam.pages.xml/pom.xml trunk/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml trunk/seam/plugins/org.jboss.tools.seam.ui.pages/pom.xml trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml trunk/seam/plugins/org.jboss.tools.seam.xml.ui/pom.xml trunk/seam/plugins/org.jboss.tools.seam.xml/pom.xml trunk/seam/plugins/pom.xml trunk/seam/pom.xml trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.text.ext.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/pom.xml trunk/seam/tests/pom.xml trunk/struts/features/org.jboss.tools.struts.feature/pom.xml trunk/struts/features/pom.xml trunk/struts/plugins/org.jboss.tools.struts.text.ext/pom.xml trunk/struts/plugins/org.jboss.tools.struts.ui/pom.xml trunk/struts/plugins/org.jboss.tools.struts.validator.ui/pom.xml trunk/struts/plugins/org.jboss.tools.struts.verification/pom.xml trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/pom.xml trunk/struts/plugins/org.jboss.tools.struts/pom.xml trunk/struts/plugins/pom.xml trunk/struts/pom.xml trunk/struts/tests/org.jboss.tools.struts.text.ext.test/pom.xml trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml trunk/struts/tests/pom.xml trunk/tptp/features/org.jboss.tools.tptp.feature/pom.xml trunk/tptp/features/pom.xml trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/pom.xml trunk/tptp/plugins/pom.xml trunk/tptp/pom.xml trunk/workingset/features/org.jboss.tools.workingset.feature/pom.xml trunk/workingset/features/pom.xml trunk/workingset/plugins/org.jboss.tools.workingset.core/pom.xml trunk/workingset/plugins/org.jboss.tools.workingset.ui/pom.xml trunk/workingset/plugins/pom.xml trunk/workingset/pom.xml trunk/workingset/tests/org.jboss.tools.workingset.core.test/pom.xml trunk/workingset/tests/pom.xml Modified: trunk/archives/pom.xml trunk/bpel/pom.xml trunk/flow/pom.xml trunk/flow/tests/org.jboss.tools.flow.common.test/pom.xml trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature/= pom.xml trunk/freemarker/pom.xml trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml trunk/jmx/pom.xml trunk/jsf/features/org.jboss.tools.richfaces.feature/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.ui/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.verification/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/pom.xml trunk/jsf/plugins/org.jboss.tools.jsf/pom.xml trunk/jsf/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml trunk/jst/plugins/org.jboss.tools.jst.css/pom.xml trunk/jst/plugins/org.jboss.tools.jst.firstrun/pom.xml trunk/jst/plugins/org.jboss.tools.jst.jsp/pom.xml trunk/jst/plugins/org.jboss.tools.jst.text.ext/pom.xml trunk/jst/plugins/org.jboss.tools.jst.web.kb/pom.xml trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/pom.xml trunk/jst/plugins/org.jboss.tools.jst.web.tiles/pom.xml trunk/jst/plugins/org.jboss.tools.jst.web.ui/pom.xml trunk/jst/plugins/org.jboss.tools.jst.web.verification/pom.xml trunk/jst/plugins/org.jboss.tools.jst.web/pom.xml trunk/jst/pom.xml trunk/jst/tests/org.jboss.tools.jst.css.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.jsp.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml trunk/jst/tests/org.jboss.tools.ui.bot.ext/pom.xml trunk/jst/tests/pom.xml trunk/portlet/pom.xml trunk/profiler/pom.xml trunk/smooks/features/org.jboss.tools.smooks.feature/pom.xml trunk/smooks/features/org.jboss.tools.smooks.test.feature/pom.xml trunk/smooks/pom.xml trunk/smooks/tests/org.jboss.tools.smooks.core.test/pom.xml trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.docbook/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.html/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.jsp/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.resref/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/pom.xml trunk/vpe/plugins/org.jboss.tools.vpe/pom.xml trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/pom.xml trunk/vpe/plugins/org.jboss.tools.xulrunner/pom.xml trunk/vpe/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml trunk/ws/features/org.jboss.tools.ws.feature/pom.xml trunk/ws/plugins/org.jboss.tools.ws.core/pom.xml trunk/ws/plugins/org.jboss.tools.ws.creation.ui/pom.xml trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml trunk/ws/pom.xml trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml trunk/ws/tests/pom.xml Log: add poms JBDS-1212 Modified: trunk/archives/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/archives/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - archives + archives.all 0.0.1-SNAPSHOT pom Added: trunk/birt/features/org.jboss.tools.birt.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/birt/features/org.jboss.tools.birt.feature/pom.xml = (rev 0) +++ trunk/birt/features/org.jboss.tools.birt.feature/pom.xml 2010-05-18 16:= 10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.birt.feature = + 1.1.0-SNAPSHOT + eclipse-feature + Added: trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml = (rev 0) +++ trunk/birt/features/org.jboss.tools.birt.test.feature/pom.xml 2010-05-1= 8 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.birt.test.feature = + 1.1.0-SNAPSHOT + eclipse-feature + Added: trunk/birt/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/birt/features/pom.xml (rev 0) +++ trunk/birt/features/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + birt.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.birt.feature + org.jboss.tools.birt.test.feature + + + = \ No newline at end of file Added: trunk/birt/plugins/org.jboss.tools.birt.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/birt/plugins/org.jboss.tools.birt.core/pom.xml = (rev 0) +++ trunk/birt/plugins/org.jboss.tools.birt.core/pom.xml 2010-05-18 16:10:0= 8 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.birt.core = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/birt/plugins/org.jboss.tools.birt.oda/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/birt/plugins/org.jboss.tools.birt.oda/pom.xml = (rev 0) +++ trunk/birt/plugins/org.jboss.tools.birt.oda/pom.xml 2010-05-18 16:10:08= UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.birt.oda = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/birt/plugins/org.jboss.tools.birt.oda.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/birt/plugins/org.jboss.tools.birt.oda.ui/pom.xml = (rev 0) +++ trunk/birt/plugins/org.jboss.tools.birt.oda.ui/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.birt.oda.ui = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/birt/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/birt/plugins/pom.xml (rev 0) +++ trunk/birt/plugins/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + birt.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.birt.core + org.jboss.tools.birt.oda + org.jboss.tools.birt.oda.ui + + + = \ No newline at end of file Added: trunk/birt/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/birt/pom.xml (rev 0) +++ trunk/birt/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + birt.all + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/birt/tests/org.jboss.tools.birt.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/birt/tests/org.jboss.tools.birt.core.test/pom.xml = (rev 0) +++ trunk/birt/tests/org.jboss.tools.birt.core.test/pom.xml 2010-05-18 16:1= 0:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.birt.core.test = + 1.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/birt/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/birt/tests/pom.xml (rev 0) +++ trunk/birt/tests/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + birt.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.birt.core.test + + + = \ No newline at end of file Modified: trunk/bpel/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/bpel/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - bpel + bpel.all 0.0.1-SNAPSHOT pom Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml = (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.test/pom.xml 2010-05-18 16:10:= 08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.bpel.ui.test = + 1.0.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/cdi/features/org.jboss.tools.cdi.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/features/org.jboss.tools.cdi.feature/pom.xml = (rev 0) +++ trunk/cdi/features/org.jboss.tools.cdi.feature/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.cdi.feature = + 1.0.0-SNAPSHOT + eclipse-feature + Added: trunk/cdi/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/features/pom.xml (rev 0) +++ trunk/cdi/features/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + cdi.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.cdi.feature + + + = \ No newline at end of file Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/pom.xml = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/pom.xml 2010-05-18 16:10:08 = UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.cdi.core = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.cdi.text.ext = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/pom.xml 2010-05-18 16:10:08 UT= C (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.cdi.ui = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml/pom.xml 2010-05-18 16:10:08 U= TC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.cdi.xml = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml = (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.xml.ui/pom.xml 2010-05-18 16:10:0= 8 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.cdi.xml.ui = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/cdi/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/pom.xml (rev 0) +++ trunk/cdi/plugins/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,22 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + cdi.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.cdi.core + org.jboss.tools.cdi.text.ext + org.jboss.tools.cdi.ui + org.jboss.tools.cdi.xml + org.jboss.tools.cdi.xml.ui + + + = \ No newline at end of file Added: trunk/cdi/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/pom.xml (rev 0) +++ trunk/cdi/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + cdi.all + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/pom.xml 2010-05-18 16:10:= 08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.cdi.core.test = + 1.0.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/pom.xml 2010-05-18 16= :10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.cdi.text.ext.test = + 1.0.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/pom.xml 2010-05-18 16:10:08= UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.cdi.ui.test = + 1.0.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/cdi/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/pom.xml (rev 0) +++ trunk/cdi/tests/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + cdi.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.cdi.core.test + org.jboss.tools.cdi.text.ext.test + org.jboss.tools.cdi.ui.test + + + = \ No newline at end of file Added: trunk/esb/features/org.jboss.tools.esb.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/features/org.jboss.tools.esb.feature/pom.xml = (rev 0) +++ trunk/esb/features/org.jboss.tools.esb.feature/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.esb.feature = + 1.3.0-SNAPSHOT + eclipse-feature + Added: trunk/esb/features/org.jboss.tools.esb.test.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/features/org.jboss.tools.esb.test.feature/pom.xml = (rev 0) +++ trunk/esb/features/org.jboss.tools.esb.test.feature/pom.xml 2010-05-18 = 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.esb.test.feature = + 1.3.0-SNAPSHOT + eclipse-feature + Added: trunk/esb/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/features/pom.xml (rev 0) +++ trunk/esb/features/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + esb.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.esb.feature + org.jboss.tools.esb.test.feature + + + = \ No newline at end of file Added: trunk/esb/plugins/org.jboss.tools.esb.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.core/pom.xml = (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.core/pom.xml 2010-05-18 16:10:08 = UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.esb.core = + 1.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/esb/plugins/org.jboss.tools.esb.project.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.core/pom.xml = (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.project.core/pom.xml 2010-05-18 1= 6:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.esb.project.core = + 1.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml = (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/pom.xml 2010-05-18 16:= 10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.esb.project.ui = + 1.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/esb/plugins/org.jboss.tools.esb.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.ui/pom.xml = (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.ui/pom.xml 2010-05-18 16:10:08 UT= C (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.esb.ui = + 1.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/esb/plugins/org.jboss.tools.esb.validator/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.validator/pom.xml = (rev 0) +++ trunk/esb/plugins/org.jboss.tools.esb.validator/pom.xml 2010-05-18 16:1= 0:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.esb.validator = + 2.0.0 + eclipse-plugin + Added: trunk/esb/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/pom.xml (rev 0) +++ trunk/esb/plugins/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,21 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + esb.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.esb.core + org.jboss.tools.esb.project.core + org.jboss.tools.esb.project.ui + org.jboss.tools.esb.ui + + + = \ No newline at end of file Added: trunk/esb/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/pom.xml (rev 0) +++ trunk/esb/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + esb.all + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml = (rev 0) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/pom.xml 2010-05-18 16:10:= 08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.esb.core.test = + 1.3.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml = (rev 0) +++ trunk/esb/tests/org.jboss.tools.esb.project.core.test/pom.xml 2010-05-1= 8 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.esb.project.core.test = + 1.3.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml = (rev 0) +++ trunk/esb/tests/org.jboss.tools.esb.validator.test/pom.xml 2010-05-18 1= 6:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.esb.validator.test = + 1.0.0 + eclipse-test-plugin + Added: trunk/esb/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/tests/pom.xml (rev 0) +++ trunk/esb/tests/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + esb.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.esb.core.test + org.jboss.tools.esb.project.core.test + + + = \ No newline at end of file Added: trunk/examples/features/org.jboss.tools.community.project.examples.f= eature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/features/org.jboss.tools.community.project.examples.feat= ure/pom.xml (rev 0) +++ trunk/examples/features/org.jboss.tools.community.project.examples.feat= ure/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.community.project.examples.feature = + 1.1.0-SNAPSHOT + eclipse-feature + Added: trunk/examples/features/org.jboss.tools.project.examples.feature/pom= .xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/features/org.jboss.tools.project.examples.feature/pom.xm= l (rev 0) +++ trunk/examples/features/org.jboss.tools.project.examples.feature/pom.xm= l 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.project.examples.feature = + 1.1.0-SNAPSHOT + eclipse-feature + Added: trunk/examples/features/org.jboss.tools.project.examples.test.featur= e/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/features/org.jboss.tools.project.examples.test.feature/p= om.xml (rev 0) +++ trunk/examples/features/org.jboss.tools.project.examples.test.feature/p= om.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.project.examples.test.feature = + 1.1.0-SNAPSHOT + eclipse-feature + Added: trunk/examples/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/features/pom.xml (rev 0) +++ trunk/examples/features/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + examples.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.community.project.examples.feature + org.jboss.tools.project.examples.feature + org.jboss.tools.project.examples.test.feature + + + = \ No newline at end of file Added: trunk/examples/plugins/org.jboss.tools.community.project.examples/po= m.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/plugins/org.jboss.tools.community.project.examples/pom.x= ml (rev 0) +++ trunk/examples/plugins/org.jboss.tools.community.project.examples/pom.x= ml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.community.project.examples = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/examples/plugins/org.jboss.tools.project.examples/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/plugins/org.jboss.tools.project.examples/pom.xml = (rev 0) +++ trunk/examples/plugins/org.jboss.tools.project.examples/pom.xml 2010-05= -18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.project.examples = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/p= om.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/pom.= xml (rev 0) +++ trunk/examples/plugins/org.jboss.tools.project.examples.cheatsheet/pom.= xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.project.examples.cheatsheet = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/examples/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/plugins/pom.xml (rev 0) +++ trunk/examples/plugins/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + examples.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.community.project.examples + org.jboss.tools.project.examples + org.jboss.tools.project.examples.cheatsheet + + + = \ No newline at end of file Added: trunk/examples/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/pom.xml (rev 0) +++ trunk/examples/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + examples.all + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/examples/tests/org.jboss.tools.project.examples.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/tests/org.jboss.tools.project.examples.test/pom.xml = (rev 0) +++ trunk/examples/tests/org.jboss.tools.project.examples.test/pom.xml 2010= -05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.project.examples.test = + 1.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/examples/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/tests/pom.xml (rev 0) +++ trunk/examples/tests/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + examples.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.project.examples.test + + + = \ No newline at end of file Modified: trunk/flow/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/flow/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/flow/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - flow.all + flow 0.0.1-SNAPSHOT pom Modified: trunk/flow/tests/org.jboss.tools.flow.common.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/flow/tests/org.jboss.tools.flow.common.test/pom.xml 2010-05-18 16= :06:24 UTC (rev 22182) +++ trunk/flow/tests/org.jboss.tools.flow.common.test/pom.xml 2010-05-18 16= :10:08 UTC (rev 22183) @@ -10,5 +10,5 @@ org.jboss.tools org.jboss.tools.flow.common.test = 4.0.0-SNAPSHOT - eclipse-test-plugin + eclipse-plugin Modified: trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.f= eature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature= /pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/freemarker/features/org.jboss.ide.eclipse.freemarker.test.feature= /pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.ide.eclipse.freemarker.test.feature = - 1.0.0 + 1.1.0-SNAPSHOT eclipse-feature Modified: trunk/freemarker/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/freemarker/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/freemarker/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - freemarker + freemarker.all 0.0.1-SNAPSHOT pom Added: trunk/hibernatetools/features/org.hibernate.eclipse.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/features/org.hibernate.eclipse.feature/pom.xml = (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.feature/pom.xml 201= 0-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.hibernate.eclipse.feature = + 3.3.0-SNAPSHOT + eclipse-feature + Added: trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/pom= .xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/pom.xm= l (rev 0) +++ trunk/hibernatetools/features/org.hibernate.eclipse.test.feature/pom.xm= l 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.hibernate.eclipse.test.feature = + 3.3.0-SNAPSHOT + eclipse-feature + Added: trunk/hibernatetools/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/features/pom.xml (rev 0) +++ trunk/hibernatetools/features/pom.xml 2010-05-18 16:10:08 UTC (rev 2218= 3) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + hibernatetools.features + 0.0.1-SNAPSHOT + pom + + org.hibernate.eclipse.feature + org.hibernate.eclipse.test.feature + + + = \ No newline at end of file Added: trunk/hibernatetools/plugins/org.hibernate.eclipse/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse/pom.xml = (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/pom.xml 2010-05-18 1= 6:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.hibernate.eclipse = + 3.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/pom.xml = (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/pom.xml 2010= -05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.hibernate.eclipse.console = + 3.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.help/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.help/pom.xml = (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.help/pom.xml 2010-05= -18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.hibernate.eclipse.help = + 3.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/pom.xml = (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.apt.ui/pom.xml 2= 010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.hibernate.eclipse.jdt.apt.ui = + 3.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/pom.xml = (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/pom.xml 2010-= 05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.hibernate.eclipse.jdt.ui = + 3.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/pom.xml = (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/pom.xml 2010-= 05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.hibernate.eclipse.mapper = + 3.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml= (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/pom.xml= 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.hibernate.jpt.core = + 3.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/pom.xml = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/pom.xml 2= 010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.hibernate.jpt.ui = + 3.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/pom.xml = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/pom.xml 2010-= 05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.hibernate.ui = + 3.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/pom.xml = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml/pom.xml 2010= -05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.hibernate.xml = + 3.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/pom.xml = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/pom.xml 2= 010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.hibernate.xml.ui = + 3.3.0-SNAPSHOT + eclipse-plugin + Added: trunk/hibernatetools/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/pom.xml (rev 0) +++ trunk/hibernatetools/plugins/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,28 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + hibernatetools.plugins + 0.0.1-SNAPSHOT + pom + + org.hibernate.eclipse + org.hibernate.eclipse.console + org.hibernate.eclipse.help + org.hibernate.eclipse.jdt.apt.ui + org.hibernate.eclipse.jdt.ui + org.hibernate.eclipse.mapper + org.jboss.tools.hibernate.jpt.core + org.jboss.tools.hibernate.jpt.ui + org.jboss.tools.hibernate.ui + org.jboss.tools.hibernate.xml + org.jboss.tools.hibernate.xml.ui + + + = \ No newline at end of file Added: trunk/hibernatetools/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/pom.xml (rev 0) +++ trunk/hibernatetools/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + hibernatetools.all + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml = (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/pom.xml 2= 010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.hibernate.eclipse.console.test = + 3.3.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml = (rev 0) +++ trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/pom.xml 20= 10-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.hibernate.eclipse.jdt.ui.test = + 3.3.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/p= om.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.= xml (rev 0) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test/pom.= xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.hibernate.jpt.core.test = + 3.3.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/pom= .xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/pom.xm= l (rev 0) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/pom.xm= l 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.hibernate.ui.bot.test = + 3.3.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/pom.xml = (rev 0) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.test/pom.xml 20= 10-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.hibernate.ui.test = + 3.3.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/hibernatetools/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/tests/pom.xml (rev 0) +++ trunk/hibernatetools/tests/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,22 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + hibernatetools.tests + 0.0.1-SNAPSHOT + pom + + org.hibernate.eclipse.console.test + org.hibernate.eclipse.jdt.ui.test + org.jboss.tools.hibernate.jpt.core.test + org.jboss.tools.hibernate.ui.bot.test + org.jboss.tools.hibernate.ui.test + + + = \ No newline at end of file Modified: trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml 2010-05-18 16:= 06:24 UTC (rev 22182) +++ trunk/jbpm/tests/org.jboss.tools.flow.jpdl4.test/pom.xml 2010-05-18 16:= 10:08 UTC (rev 22183) @@ -10,5 +10,5 @@ org.jboss.tools org.jboss.tools.flow.jpdl4.test = 4.3.0-SNAPSHOT - eclipse-test-plugin + eclipse-plugin Modified: trunk/jmx/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/jmx/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - jmx + jmx.all 0.0.1-SNAPSHOT pom Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/features/org.jboss.tools.richfaces.feature/pom.xml 2010-05-18= 16:06:24 UTC (rev 22182) +++ trunk/jsf/features/org.jboss.tools.richfaces.feature/pom.xml 2010-05-18= 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.richfaces.feature = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-feature Modified: trunk/jsf/plugins/org.jboss.tools.jsf/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/pom.xml 2010-05-18 16:06:24 UTC (= rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf/pom.xml 2010-05-18 16:10:08 UTC (= rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/pom.xml 2010-05-18 16:06= :24 UTC (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.doc.user = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/pom.xml 2010-05-18 16:06= :24 UTC (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.text.ext = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/pom.xml 2010-05= -18 16:06:24 UTC (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.facelets/pom.xml 2010-05= -18 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.text.ext.facelets = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/pom.xml 2010-0= 5-18 16:06:24 UTC (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.text.ext.richfaces/pom.xml 2010-0= 5-18 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.text.ext.richfaces = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.ui/pom.xml 2010-05-18 16:06:24 UT= C (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/pom.xml 2010-05-18 16:10:08 UT= C (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.ui = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.verification/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.verification/pom.xml 2010-05-18 1= 6:06:24 UTC (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.verification/pom.xml 2010-05-18 1= 6:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.verification = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/pom.xml 2010-05-18 1= 6:06:24 UTC (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.ajax4jsf/pom.xml 2010-05-18 1= 6:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.ajax4jsf = - 2.1.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/pom.xml 2010-05-18 1= 6:06:24 UTC (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.facelets/pom.xml 2010-05-18 1= 6:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.facelets = - 2.1.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/pom.xml 2010-05-18 16:06:= 24 UTC (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jsf/pom.xml 2010-05-18 16:10:= 08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.jsf = - 2.1.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/pom.xml 2010-05-18 16:06= :24 UTC (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.jstl/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.jstl = - 2.1.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/pom.xml 2010-05-18 16= :06:24 UTC (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.myfaces/pom.xml 2010-05-18 16= :10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.myfaces = - 2.1.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/pom.xml 2010-05-18 = 16:06:24 UTC (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/pom.xml 2010-05-18 = 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.richfaces = - 2.1.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/pom.xml 2010-05-18 16:06= :24 UTC (rev 22182) +++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.seam/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.seam = - 2.1.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jsf/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/jsf/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - jsf + jsf.all 0.0.1-SNAPSHOT pom Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2010-05-18 16:06:24 UT= C (rev 22182) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/pom.xml 2010-05-18 16:10:08 UT= C (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.test = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml 2010-05-18 16= :06:24 UTC (rev 22182) +++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/pom.xml 2010-05-18 16= :10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.text.ext.test = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml 2010-05-18 16:06:24= UTC (rev 22182) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/pom.xml 2010-05-18 16:10:08= UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.ui.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml 2010-05-1= 8 16:06:24 UTC (rev 22182) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/pom.xml 2010-05-1= 8 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.verification.test = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2010-05-1= 8 16:06:24 UTC (rev 22182) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.ajax4jsf.test/pom.xml 2010-05-1= 8 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.ajax4jsf.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml 2010-05-1= 8 16:06:24 UTC (rev 22182) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.facelets.test/pom.xml 2010-05-1= 8 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.facelets.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2010-05-18 16:= 06:24 UTC (rev 22182) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/pom.xml 2010-05-18 16:= 10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.jsf.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml 2010-05-18 16= :06:24 UTC (rev 22182) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jstl.test/pom.xml 2010-05-18 16= :10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.jstl.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml 2010-05-18= 16:06:24 UTC (rev 22182) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.myfaces.test/pom.xml 2010-05-18= 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.myfaces.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2010-05-= 18 16:06:24 UTC (rev 22182) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.richfaces.test/pom.xml 2010-05-= 18 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.richfaces.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2010-05-18 16= :06:24 UTC (rev 22182) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.seam.test/pom.xml 2010-05-18 16= :10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jsf.vpe.seam.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.css/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.css/pom.xml 2010-05-18 16:06:24 U= TC (rev 22182) +++ trunk/jst/plugins/org.jboss.tools.jst.css/pom.xml 2010-05-18 16:10:08 U= TC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.css = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.firstrun/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.firstrun/pom.xml 2010-05-18 16:06= :24 UTC (rev 22182) +++ trunk/jst/plugins/org.jboss.tools.jst.firstrun/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.firstrun = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/pom.xml 2010-05-18 16:06:24 U= TC (rev 22182) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/pom.xml 2010-05-18 16:10:08 U= TC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.jsp = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.text.ext/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.text.ext/pom.xml 2010-05-18 16:06= :24 UTC (rev 22182) +++ trunk/jst/plugins/org.jboss.tools.jst.text.ext/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.text.ext = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.web/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/pom.xml 2010-05-18 16:06:24 U= TC (rev 22182) +++ trunk/jst/plugins/org.jboss.tools.jst.web/pom.xml 2010-05-18 16:10:08 U= TC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.web = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/pom.xml 2010-05-18 16:06:2= 4 UTC (rev 22182) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/pom.xml 2010-05-18 16:10:0= 8 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.web.kb = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles/pom.xml 2010-05-18 16:0= 6:24 UTC (rev 22182) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles/pom.xml 2010-05-18 16:1= 0:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.web.tiles = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/pom.xml 2010-05-18 1= 6:06:24 UTC (rev 22182) +++ trunk/jst/plugins/org.jboss.tools.jst.web.tiles.ui/pom.xml 2010-05-18 1= 6:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.web.tiles.ui = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/pom.xml 2010-05-18 16:06:2= 4 UTC (rev 22182) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/pom.xml 2010-05-18 16:10:0= 8 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.web.ui = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jst/plugins/org.jboss.tools.jst.web.verification/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.verification/pom.xml 2010-05-= 18 16:06:24 UTC (rev 22182) +++ trunk/jst/plugins/org.jboss.tools.jst.web.verification/pom.xml 2010-05-= 18 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.web.verification = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/jst/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/jst/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - jst + jst.all 0.0.1-SNAPSHOT pom Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/pom.xml 2010-05-18 16:06:2= 4 UTC (rev 22182) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/pom.xml 2010-05-18 16:10:0= 8 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.css.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/pom.xml 2010-05-18 16:06:2= 4 UTC (rev 22182) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/pom.xml 2010-05-18 16:10:0= 8 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.jsp.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml = (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml 2010-05-18 16= :10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.jsp.text.ext.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml 2010-05-18 16:0= 6:24 UTC (rev 22182) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml 2010-05-18 16:1= 0:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.ui.bot.test = - 1.0.0 - eclipse-plugin + 3.1.0-SNAPSHOT + eclipse-test-plugin Modified: trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml 2010-0= 5-18 16:06:24 UTC (rev 22182) +++ trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml 2010-0= 5-18 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.ui.firstrun.bot.test = - 1.0.0 - eclipse-plugin + 3.1.0-SNAPSHOT + eclipse-test-plugin Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml 2010-05-18 16:0= 6:24 UTC (rev 22182) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/pom.xml 2010-05-18 16:1= 0:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.web.kb.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml 2010-05-18 16:06:2= 4 UTC (rev 22182) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/pom.xml 2010-05-18 16:10:0= 8 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.web.test = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml 2010-05-18 16:0= 6:24 UTC (rev 22182) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/pom.xml 2010-05-18 16:1= 0:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.jst.web.ui.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/pom.xml 2010-05-18 16:06:24 = UTC (rev 22182) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/pom.xml 2010-05-18 16:10:08 = UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.ui.bot.ext = - 1.0.0-SNAPSHOT - eclipse-plugin + 3.1.0-SNAPSHOT + eclipse-test-plugin Added: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/pom.xml = (rev 0) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/pom.xml 2010-05-18 16:1= 0:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.ws.ui.bot.test = + 1.0.0-SNAPSHOT + eclipse-plugin + Modified: trunk/jst/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/jst/tests/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -14,6 +14,7 @@ org.jboss.tools.jst.css.test org.jboss.tools.jst.jsp.test + org.jboss.tools.jst.text.ext.test org.jboss.tools.jst.ui.bot.test org.jboss.tools.jst.ui.firstrun.bot.test org.jboss.tools.jst.web.kb.test Added: trunk/labs/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/labs/features/pom.xml (rev 0) +++ trunk/labs/features/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,17 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + labs.features + 0.0.1-SNAPSHOT + pom + + + + = \ No newline at end of file Added: trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/pom.xml = (rev 0) +++ trunk/labs/plugins/org.jboss.tools.labs.pde.sourceprovider/pom.xml 2010= -05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.labs.pde.sourceprovider = + 1.0.0 + eclipse-plugin + Added: trunk/labs/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/labs/plugins/pom.xml (rev 0) +++ trunk/labs/plugins/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + labs.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.labs.pde.sourceprovider + + + = \ No newline at end of file Added: trunk/labs/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/labs/tests/pom.xml (rev 0) +++ trunk/labs/tests/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,17 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + labs.tests + 0.0.1-SNAPSHOT + pom + + + + = \ No newline at end of file Added: trunk/maven/features/org.jboss.tools.maven.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/features/org.jboss.tools.maven.feature/pom.xml = (rev 0) +++ trunk/maven/features/org.jboss.tools.maven.feature/pom.xml 2010-05-18 1= 6:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.maven.feature = + 1.0.0-SNAPSHOT + eclipse-feature + Added: trunk/maven/features/org.jboss.tools.maven.seam.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/features/org.jboss.tools.maven.seam.feature/pom.xml = (rev 0) +++ trunk/maven/features/org.jboss.tools.maven.seam.feature/pom.xml 2010-05= -18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.maven.seam.feature = + 1.0.0-SNAPSHOT + eclipse-feature + Added: trunk/maven/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/features/pom.xml (rev 0) +++ trunk/maven/features/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + maven.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.maven.feature + org.jboss.tools.maven.seam.feature + + + = \ No newline at end of file Added: trunk/maven/plugins/org.jboss.tools.maven.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.core/pom.xml = (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.core/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.maven.core = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/maven/plugins/org.jboss.tools.maven.seam/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.seam/pom.xml = (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.seam/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.maven.seam = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/maven/plugins/org.jboss.tools.maven.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/org.jboss.tools.maven.ui/pom.xml = (rev 0) +++ trunk/maven/plugins/org.jboss.tools.maven.ui/pom.xml 2010-05-18 16:10:0= 8 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.maven.ui = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/maven/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/plugins/pom.xml (rev 0) +++ trunk/maven/plugins/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + maven.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.maven.core + org.jboss.tools.maven.seam + org.jboss.tools.maven.ui + + + = \ No newline at end of file Added: trunk/maven/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/pom.xml (rev 0) +++ trunk/maven/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + maven.all + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/maven/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/tests/pom.xml (rev 0) +++ trunk/maven/tests/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,17 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + maven.tests + 0.0.1-SNAPSHOT + pom + + + + = \ No newline at end of file Modified: trunk/portlet/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/portlet/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - portlet + portlet.all 0.0.1-SNAPSHOT pom Modified: trunk/profiler/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/profiler/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/profiler/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - profiler + profiler.all 0.0.1-SNAPSHOT pom Added: trunk/seam/features/org.jboss.tools.seam.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/features/org.jboss.tools.seam.feature/pom.xml = (rev 0) +++ trunk/seam/features/org.jboss.tools.seam.feature/pom.xml 2010-05-18 16:= 10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.feature = + 1.0.0-SNAPSHOT + eclipse-feature + Added: trunk/seam/features/org.jboss.tools.seam.test.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/features/org.jboss.tools.seam.test.feature/pom.xml = (rev 0) +++ trunk/seam/features/org.jboss.tools.seam.test.feature/pom.xml 2010-05-1= 8 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.test.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/seam/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/features/pom.xml (rev 0) +++ trunk/seam/features/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + seam.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.seam.feature + org.jboss.tools.seam.test.feature + + + = \ No newline at end of file Added: trunk/seam/plugins/org.jboss.tools.seam.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/pom.xml = (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.core/pom.xml 2010-05-18 16:10:0= 8 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.core = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/seam/plugins/org.jboss.tools.seam.doc.user/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.doc.user/pom.xml = (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.doc.user/pom.xml 2010-05-18 16:= 10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.doc.user = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/seam/plugins/org.jboss.tools.seam.pages.xml/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.pages.xml/pom.xml = (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.pages.xml/pom.xml 2010-05-18 16= :10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.pages.xml = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml = (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/pom.xml 2010-05-18 16:= 10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.text.ext = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml = (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml 2010-05-18 16:10:08 = UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.ui = + 2.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/pom.xml = (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/pom.xml 2010-05-18 16:= 10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.ui.pages = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/seam/plugins/org.jboss.tools.seam.xml/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.xml/pom.xml = (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.xml/pom.xml 2010-05-18 16:10:08= UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.xml = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/seam/plugins/org.jboss.tools.seam.xml.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.xml.ui/pom.xml = (rev 0) +++ trunk/seam/plugins/org.jboss.tools.seam.xml.ui/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.xml.ui = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/seam/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/pom.xml (rev 0) +++ trunk/seam/plugins/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,25 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + seam.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.seam.core + org.jboss.tools.seam.doc.user + org.jboss.tools.seam.pages.xml + org.jboss.tools.seam.text.ext + org.jboss.tools.seam.ui + org.jboss.tools.seam.ui.pages + org.jboss.tools.seam.xml + org.jboss.tools.seam.xml.ui + + + = \ No newline at end of file Added: trunk/seam/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/pom.xml (rev 0) +++ trunk/seam/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + seam.all + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml = (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/pom.xml 2010-05-18 16:1= 0:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.core.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml = (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.pages.xml.test/pom.xml 2010-05-18= 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.pages.xml.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/seam/tests/org.jboss.tools.seam.text.ext.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.text.ext.test/pom.xml = (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.text.ext.test/pom.xml 2010-05-18 = 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.text.ext.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml = (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml 2010-05-18 16= :10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.ui.bot.test = + 1.0.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/pom.xml = (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.pages.test/pom.xml 2010-05-18 = 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.ui.pages.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml = (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/pom.xml 2010-05-18 16:10:= 08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.ui.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml = (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.xml.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/pom.xml = (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.xml.ui.test/pom.xml 2010-05-18 16= :10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.seam.xml.ui.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/seam/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/pom.xml (rev 0) +++ trunk/seam/tests/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,25 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + seam.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.seam.core.test + org.jboss.tools.seam.pages.xml.test + org.jboss.tools.seam.text.ext.test + org.jboss.tools.seam.ui.bot.test + org.jboss.tools.seam.ui.pages.test + org.jboss.tools.seam.ui.test + org.jboss.tools.seam.xml.test + org.jboss.tools.seam.xml.ui.test + + + = \ No newline at end of file Modified: trunk/smooks/features/org.jboss.tools.smooks.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/features/org.jboss.tools.smooks.feature/pom.xml 2010-05-18= 16:06:24 UTC (rev 22182) +++ trunk/smooks/features/org.jboss.tools.smooks.feature/pom.xml 2010-05-18= 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.smooks.feature = - 1.0.0 + 1.1.0-SNAPSHOT eclipse-feature Modified: trunk/smooks/features/org.jboss.tools.smooks.test.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/features/org.jboss.tools.smooks.test.feature/pom.xml 2010-= 05-18 16:06:24 UTC (rev 22182) +++ trunk/smooks/features/org.jboss.tools.smooks.test.feature/pom.xml 2010-= 05-18 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.smooks.test.feature = - 1.0.0 + 1.1.0-SNAPSHOT eclipse-feature Modified: trunk/smooks/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/smooks/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - smooks + smooks.all 0.0.1-SNAPSHOT pom Modified: trunk/smooks/tests/org.jboss.tools.smooks.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/tests/org.jboss.tools.smooks.core.test/pom.xml 2010-05-18 = 16:06:24 UTC (rev 22182) +++ trunk/smooks/tests/org.jboss.tools.smooks.core.test/pom.xml 2010-05-18 = 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.smooks.core.test = - 1.0.0 + 1.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml 2010-= 05-18 16:06:24 UTC (rev 22182) +++ trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml 2010-= 05-18 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.smooks.templating.test = - 1.0.0 - eclipse-plugin + 1.1.0-SNAPSHOT + eclipse-test-plugin Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml 2010-05-18 16= :06:24 UTC (rev 22182) +++ trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml 2010-05-18 16= :10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.smooks.ui.test = - 1.0.0 - eclipse-plugin + 1.1.0-SNAPSHOT + eclipse-test-plugin Added: trunk/struts/features/org.jboss.tools.struts.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/features/org.jboss.tools.struts.feature/pom.xml = (rev 0) +++ trunk/struts/features/org.jboss.tools.struts.feature/pom.xml 2010-05-18= 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.struts.feature = + 3.1.0-SNAPSHOT + eclipse-feature + Added: trunk/struts/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/features/pom.xml (rev 0) +++ trunk/struts/features/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + struts.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.struts.feature + + + = \ No newline at end of file Added: trunk/struts/plugins/org.jboss.tools.struts/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts/pom.xml = (rev 0) +++ trunk/struts/plugins/org.jboss.tools.struts/pom.xml 2010-05-18 16:10:08= UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.struts = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/struts/plugins/org.jboss.tools.struts.text.ext/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.text.ext/pom.xml = (rev 0) +++ trunk/struts/plugins/org.jboss.tools.struts.text.ext/pom.xml 2010-05-18= 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.struts.text.ext = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/struts/plugins/org.jboss.tools.struts.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.ui/pom.xml = (rev 0) +++ trunk/struts/plugins/org.jboss.tools.struts.ui/pom.xml 2010-05-18 16:10= :08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.struts.ui = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/struts/plugins/org.jboss.tools.struts.validator.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.validator.ui/pom.xml = (rev 0) +++ trunk/struts/plugins/org.jboss.tools.struts.validator.ui/pom.xml 2010-0= 5-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.struts.validator.ui = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/struts/plugins/org.jboss.tools.struts.verification/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.verification/pom.xml = (rev 0) +++ trunk/struts/plugins/org.jboss.tools.struts.verification/pom.xml 2010-0= 5-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.struts.verification = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/pom.xml = (rev 0) +++ trunk/struts/plugins/org.jboss.tools.struts.vpe.struts/pom.xml 2010-05-= 18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.struts.vpe.struts = + 3.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/struts/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/plugins/pom.xml (rev 0) +++ trunk/struts/plugins/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,23 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + struts.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.struts + org.jboss.tools.struts.text.ext + org.jboss.tools.struts.ui + org.jboss.tools.struts.validator.ui + org.jboss.tools.struts.verification + org.jboss.tools.struts.vpe.struts + + + = \ No newline at end of file Added: trunk/struts/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/pom.xml (rev 0) +++ trunk/struts/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + struts.all + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/struts/tests/org.jboss.tools.struts.text.ext.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/tests/org.jboss.tools.struts.text.ext.test/pom.xml = (rev 0) +++ trunk/struts/tests/org.jboss.tools.struts.text.ext.test/pom.xml 2010-05= -18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.struts.text.ext.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml = (rev 0) +++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml 2010-05-1= 8 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.struts.ui.bot.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml = (rev 0) +++ trunk/struts/tests/org.jboss.tools.struts.vpe.struts.test/pom.xml 2010-= 05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.struts.vpe.struts.test = + 3.1.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/struts/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/tests/pom.xml (rev 0) +++ trunk/struts/tests/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + struts.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.struts.text.ext.test + org.jboss.tools.struts.ui.bot.test + org.jboss.tools.struts.vpe.struts.test + + + = \ No newline at end of file Added: trunk/tptp/features/org.jboss.tools.tptp.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tptp/features/org.jboss.tools.tptp.feature/pom.xml = (rev 0) +++ trunk/tptp/features/org.jboss.tools.tptp.feature/pom.xml 2010-05-18 16:= 10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.tptp.feature = + 1.1.0-SNAPSHOT + eclipse-feature + Added: trunk/tptp/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tptp/features/pom.xml (rev 0) +++ trunk/tptp/features/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + tptp.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.tptp.feature + + + = \ No newline at end of file Added: trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/pom.xml = (rev 0) +++ trunk/tptp/plugins/org.jboss.tools.eclipse.as.tptp/pom.xml 2010-05-18 1= 6:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.eclipse.as.tptp = + 1.1.0-SNAPSHOT + eclipse-plugin + Added: trunk/tptp/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tptp/plugins/pom.xml (rev 0) +++ trunk/tptp/plugins/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + tptp.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.eclipse.as.tptp + + + = \ No newline at end of file Added: trunk/tptp/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tptp/pom.xml (rev 0) +++ trunk/tptp/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + tptp.all + 0.0.1-SNAPSHOT + pom + + features + plugins + + + = \ No newline at end of file Modified: trunk/vpe/plugins/org.jboss.tools.vpe/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/pom.xml 2010-05-18 16:06:24 UTC (= rev 22182) +++ trunk/vpe/plugins/org.jboss.tools.vpe/pom.xml 2010-05-18 16:10:08 UTC (= rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe = - 2.1.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/vpe/plugins/org.jboss.tools.vpe.docbook/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.docbook/pom.xml 2010-05-18 16:06:= 24 UTC (rev 22182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.docbook/pom.xml 2010-05-18 16:10:= 08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe.docbook = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/vpe/plugins/org.jboss.tools.vpe.html/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.html/pom.xml 2010-05-18 16:06:24 = UTC (rev 22182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.html/pom.xml 2010-05-18 16:10:08 = UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe.html = - 2.1.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/vpe/plugins/org.jboss.tools.vpe.jsp/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.jsp/pom.xml 2010-05-18 16:06:24 U= TC (rev 22182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.jsp/pom.xml 2010-05-18 16:10:08 U= TC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe.jsp = - 2.1.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/vpe/plugins/org.jboss.tools.vpe.resref/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.resref/pom.xml 2010-05-18 16:06:2= 4 UTC (rev 22182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.resref/pom.xml 2010-05-18 16:10:0= 8 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe.resref = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/pom.xml 2010-05-18 16:= 06:24 UTC (rev 22182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.ui.palette/pom.xml 2010-05-18 16:= 10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe.ui.palette = - 2.1.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/pom.xml 2010-05-18 16:0= 6:24 UTC (rev 22182) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/pom.xml 2010-05-18 16:1= 0:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe.xulrunner = - 2.1.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/vpe/plugins/org.jboss.tools.xulrunner/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.xulrunner/pom.xml 2010-05-18 16:06:24= UTC (rev 22182) +++ trunk/vpe/plugins/org.jboss.tools.xulrunner/pom.xml 2010-05-18 16:10:08= UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.xulrunner = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/pom.xml 2010-05= -18 16:06:24 UTC (rev 22182) +++ trunk/vpe/plugins/org.jboss.tools.xulrunner.initializer/pom.xml 2010-05= -18 16:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.xulrunner.initializer = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-plugin Modified: trunk/vpe/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/vpe/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - vpe + vpe.all 0.0.1-SNAPSHOT pom Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2010-05-18 16:06:= 24 UTC (rev 22182) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/pom.xml 2010-05-18 16:10:= 08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe.html.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2010-05-18 16:06:2= 4 UTC (rev 22182) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/pom.xml 2010-05-18 16:10:0= 8 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe.jsp.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml 2010-05-18 16:06:24 UT= C (rev 22182) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml 2010-05-18 16:10:08 UT= C (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe.test = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml 2010-05-18 16:0= 6:24 UTC (rev 22182) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml 2010-05-18 16:1= 0:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe.ui.bot.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2010-05-18 16:06:24= UTC (rev 22182) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2010-05-18 16:10:08= UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe.ui.test = - 1.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2010-05-18 1= 6:06:24 UTC (rev 22182) +++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/pom.xml 2010-05-18 1= 6:10:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.vpe.xulrunner.test = - 2.0.0 + 3.1.0-SNAPSHOT eclipse-test-plugin Added: trunk/workingset/features/org.jboss.tools.workingset.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/workingset/features/org.jboss.tools.workingset.feature/pom.xml = (rev 0) +++ trunk/workingset/features/org.jboss.tools.workingset.feature/pom.xml 20= 10-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.workingset.feature = + 1.0.0-SNAPSHOT + eclipse-feature + Added: trunk/workingset/features/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/workingset/features/pom.xml (rev 0) +++ trunk/workingset/features/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + workingset.features + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.workingset.feature + + + = \ No newline at end of file Added: trunk/workingset/plugins/org.jboss.tools.workingset.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/workingset/plugins/org.jboss.tools.workingset.core/pom.xml = (rev 0) +++ trunk/workingset/plugins/org.jboss.tools.workingset.core/pom.xml 2010-0= 5-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.workingset.core = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/workingset/plugins/org.jboss.tools.workingset.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/workingset/plugins/org.jboss.tools.workingset.ui/pom.xml = (rev 0) +++ trunk/workingset/plugins/org.jboss.tools.workingset.ui/pom.xml 2010-05-= 18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.workingset.ui = + 1.0.0-SNAPSHOT + eclipse-plugin + Added: trunk/workingset/plugins/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/workingset/plugins/pom.xml (rev 0) +++ trunk/workingset/plugins/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + workingset.plugins + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.workingset.core + org.jboss.tools.workingset.ui + + + = \ No newline at end of file Added: trunk/workingset/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/workingset/pom.xml (rev 0) +++ trunk/workingset/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,20 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + workingset.all + 0.0.1-SNAPSHOT + pom + + features + plugins + tests + + + = \ No newline at end of file Added: trunk/workingset/tests/org.jboss.tools.workingset.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/workingset/tests/org.jboss.tools.workingset.core.test/pom.xml = (rev 0) +++ trunk/workingset/tests/org.jboss.tools.workingset.core.test/pom.xml 201= 0-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.workingset.core.test = + 1.0.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/workingset/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/workingset/tests/pom.xml (rev 0) +++ trunk/workingset/tests/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -0,0 +1,18 @@ + + 4.0.0 + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + workingset.tests + 0.0.1-SNAPSHOT + pom + + org.jboss.tools.workingset.core.test + + + = \ No newline at end of file Modified: trunk/ws/features/org.jboss.tools.ws.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/features/org.jboss.tools.ws.feature/pom.xml 2010-05-18 16:06:2= 4 UTC (rev 22182) +++ trunk/ws/features/org.jboss.tools.ws.feature/pom.xml 2010-05-18 16:10:0= 8 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.ws.feature = - 1.0.0 + 1.1.0-SNAPSHOT eclipse-feature Modified: trunk/ws/plugins/org.jboss.tools.ws.core/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.core/pom.xml 2010-05-18 16:06:24 UT= C (rev 22182) +++ trunk/ws/plugins/org.jboss.tools.ws.core/pom.xml 2010-05-18 16:10:08 UT= C (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.ws.core = - 1.0.0 + 1.1.0-SNAPSHOT eclipse-plugin Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/pom.xml 2010-05-18 16:0= 6:24 UTC (rev 22182) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/pom.xml 2010-05-18 16:1= 0:08 UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.ws.creation.ui = - 1.0.0 + 1.1.0-SNAPSHOT eclipse-plugin Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml 2010-05-18 16:06:24 UTC = (rev 22182) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/pom.xml 2010-05-18 16:10:08 UTC = (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.ws.ui = - 1.0.0 + 1.1.0-SNAPSHOT eclipse-plugin Modified: trunk/ws/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/ws/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - ws + ws.all 0.0.1-SNAPSHOT pom Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml 2010-05-18 16:06:24= UTC (rev 22182) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/pom.xml 2010-05-18 16:10:08= UTC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.ws.core.test = - 1.0.0 + 1.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml 2010-05-18 16:06:24 U= TC (rev 22182) +++ trunk/ws/tests/org.jboss.tools.ws.ui.test/pom.xml 2010-05-18 16:10:08 U= TC (rev 22183) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.ws.ui.test = - 1.0.0 + 1.1.0-SNAPSHOT eclipse-test-plugin Modified: trunk/ws/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/pom.xml 2010-05-18 16:06:24 UTC (rev 22182) +++ trunk/ws/tests/pom.xml 2010-05-18 16:10:08 UTC (rev 22183) @@ -13,8 +13,6 @@ pom org.jboss.tools.ws.core.test - org.jboss.tools.ws.creation.core.test - org.jboss.tools.ws.ui.bot.test org.jboss.tools.ws.ui.test --===============5470539060327200672==-- From jbosstools-commits at lists.jboss.org Tue May 18 12:13:23 2010 Content-Type: multipart/mixed; boundary="===============8291608274317061848==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22184 - trunk/build. Date: Tue, 18 May 2010 12:13:22 -0400 Message-ID: <201005181613.o4IGDMj3023030@svn01.web.mwc.hst.phx2.redhat.com> --===============8291608274317061848== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 12:13:22 -0400 (Tue, 18 May 2010) New Revision: 22184 Modified: trunk/build/build.xml Log: Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-18 16:10:08 UTC (rev 22183) +++ trunk/build/build.xml 2010-05-18 16:13:22 UTC (rev 22184) @@ -11,7 +11,7 @@ jmx,archives,as; bpel,smooks,freemarker,profiler,portlet,modeshape; xulrunner,jst,vpe,jsf; - drools,esb,tptp,ws; + drools,esb,tptp,ws; cdi,struts,hibernatetools,seam; examples,birt; maven" --===============8291608274317061848==-- From jbosstools-commits at lists.jboss.org Tue May 18 12:24:58 2010 Content-Type: multipart/mixed; boundary="===============7524140514177245091==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22185 - trunk/bpel/docs/reference/en-US/images. Date: Tue, 18 May 2010 12:24:58 -0400 Message-ID: <201005181624.o4IGOwZw024107@svn01.web.mwc.hst.phx2.redhat.com> --===============7524140514177245091== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-18 12:24:58 -0400 (Tue, 18 May 2010) New Revision: 22185 Added: trunk/bpel/docs/reference/en-US/images/reference/ Log:

https://jira.jboss.org/browse/TOOLSDOC-48 - Added reference subsection. =

--===============7524140514177245091==-- From jbosstools-commits at lists.jboss.org Tue May 18 12:26:20 2010 Content-Type: multipart/mixed; boundary="===============8192324624925149786==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22186 - in trunk/bpel/docs/reference/en-US: images/reference and 1 other directories. Date: Tue, 18 May 2010 12:26:20 -0400 Message-ID: <201005181626.o4IGQKIQ024551@svn01.web.mwc.hst.phx2.redhat.com> --===============8192324624925149786== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-18 12:26:19 -0400 (Tue, 18 May 2010) New Revision: 22186 Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_1.png trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_2.png trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_3.png trunk/bpel/docs/reference/en-US/modules/reference.xml Modified: trunk/bpel/docs/reference/en-US/master.xml Log:

https://jira.jboss.org/browse/TOOLSDOC-48 - Added reference subsection t= o BPEL guide.

Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_1.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_2.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_3.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/bpel/docs/reference/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/docs/reference/en-US/master.xml 2010-05-18 16:24:58 UTC (rev= 22185) +++ trunk/bpel/docs/reference/en-US/master.xml 2010-05-18 16:26:19 UTC (rev= 22186) @@ -6,8 +6,8 @@ + = - ]> = @@ -50,4 +50,5 @@ &install; &detail; &deploy; + &reference; = Added: trunk/bpel/docs/reference/en-US/modules/reference.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/docs/reference/en-US/modules/reference.xml = (rev 0) +++ trunk/bpel/docs/reference/en-US/modules/reference.xml 2010-05-18 16:26:= 19 UTC (rev 22186) @@ -0,0 +1,119 @@ + + + + + + JBoss Tools + BPEL + JBT + + + Reference + This chapter includes detailed reference information about all B= PEL tools Wizards and editors. +
+ Wizards +
+ New BPEL project Wizard + This wizard helps to create new BPEL project.It is avail= able with clicking + File->New->Other->BPEL project in the= menu bar. +
+ New BPEL Project Wizard + + + + + +
+ The wizard consists of only one page: + + On the page you can adjust the name of the= project and the directory where it will be created. + If "Use default" option is = checked the output directory will be the workspace, + othervise the user should specify it by himself us= ing Browse button. +
+ New BPEL Project Wizard + + + + + +
+ + +
+
+ New BPEL Process file Wizard + Using New BPEL Process file Wizard user can create BPEL = process file and WSDL file if it is necessary. + The wizard includes several pages: + + The first page has the following options t= o set: + + New BPEL Process file Wizard. First Page Op= tions. = + + + + + = + + + Option = + Description + Default + + + + + Name + Enter the process name. + no default value + = + = + = + + Namespace + Enter the namespace url here + no default value + = + = + + Template + Select one of the provided temp= lates: = + + Asyn= chronous BPEL Process - = + generates the basis of orc= hestration logic: receive and reply activities + are included into the proc= ess;client WSDL is generated, = + service is defined in the = parentlink of the process. + The caller is notified asy= nchronously when the process completes. + + Empt= y BPEL Process - list of services participating in this BPEL pr= ocess together + with the one of messages u= sed within the process is empty.There are no any orchestration logic. + Sync= hronous BPEL Process - = + similar to Asynchronous BP= EL Process temlate except the fact that here + the caller is notified asy= nchronously when the process completes. + + Asynchronous BPEL Process + + + Abstract Process + Specifies the created process a= s an abstract one -partially + specified processes that are not i= ntended to be executed. + unchecked + + + +
+ New BPEL Process file Wizard + + + + + +
+ = + + +
+ = +
+ = + + --===============8192324624925149786==-- From jbosstools-commits at lists.jboss.org Tue May 18 12:37:55 2010 Content-Type: multipart/mixed; boundary="===============4399607146987698059==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22187 - trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF. Date: Tue, 18 May 2010 12:37:55 -0400 Message-ID: <201005181637.o4IGbtF7025978@svn01.web.mwc.hst.phx2.redhat.com> --===============4399607146987698059== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 12:37:55 -0400 (Tue, 18 May 2010) New Revision: 22187 Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.= MF Log: freaking missing comma Modified: trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MA= NIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST= .MF 2010-05-18 16:26:19 UTC (rev 22186) +++ trunk/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST= .MF 2010-05-18 16:37:55 UTC (rev 22187) @@ -8,7 +8,7 @@ Export-Package: org.jboss.tools.jsf.verification.test Require-Bundle: = org.junit, - org.jboss.tools.tests + org.jboss.tools.tests, org.eclipse.core.runtime, org.eclipse.core.resources, org.jboss.tools.common.model, --===============4399607146987698059==-- From jbosstools-commits at lists.jboss.org Tue May 18 12:40:49 2010 Content-Type: multipart/mixed; boundary="===============5541961559561714019==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22188 - trunk/build. Date: Tue, 18 May 2010 12:40:48 -0400 Message-ID: <201005181640.o4IGem4v027084@svn01.web.mwc.hst.phx2.redhat.com> --===============5541961559561714019== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 12:40:48 -0400 (Tue, 18 May 2010) New Revision: 22188 Modified: trunk/build/build.xml Log: remove surefire flag Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-18 16:37:55 UTC (rev 22187) +++ trunk/build/build.xml 2010-05-18 16:40:48 UTC (rev 22188) @@ -553,7 +553,7 @@ = - + = --===============5541961559561714019==-- From jbosstools-commits at lists.jboss.org Tue May 18 12:56:14 2010 Content-Type: multipart/mixed; boundary="===============8688361172634761637==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22189 - trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/test. Date: Tue, 18 May 2010 12:56:14 -0400 Message-ID: <201005181656.o4IGuEas028750@svn01.web.mwc.hst.phx2.redhat.com> --===============8688361172634761637== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 12:56:14 -0400 (Tue, 18 May 2010) New Revision: 22189 Modified: trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/to= ols/common/model/ui/test/ModelUiAllTests.java Log: disable ReportProblemWizardTest because it won't run in Tycho builds Modified: trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/j= boss/tools/common/model/ui/test/ModelUiAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/t= ools/common/model/ui/test/ModelUiAllTests.java 2010-05-18 16:40:48 UTC (rev= 22188) +++ trunk/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/t= ools/common/model/ui/test/ModelUiAllTests.java 2010-05-18 16:56:14 UTC (rev= 22189) @@ -36,7 +36,13 @@ suite.addTestSuite(FavoritesClassControllerTest.class); suite.addTestSuite(ErrorDialogTest.class); suite.addTestSuite(MessageAndCheckboxDialogTest.class); - suite.addTestSuite(ReportProblemWizardTest.class); + //suite.addTestSuite(ReportProblemWizardTest.class); = + // FIXME does not run in Tycho-based build: = + // ERROR in ../common/tests/org.jboss.tools.common.model.ui.test/ + // src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizard= Test.java (at line 17) + // [exec] import junit.extensions.ExceptionTestCase; + // [exec] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + // [exec] The import junit.extensions.ExceptionTestCase cannot be re= solved suite.addTestSuite(JarPropertiesTest.class); return suite; } --===============8688361172634761637==-- From jbosstools-commits at lists.jboss.org Tue May 18 14:11:35 2010 Content-Type: multipart/mixed; boundary="===============1678071322293036115==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22190 - in trunk: site and 1 other directories. Date: Tue, 18 May 2010 14:11:35 -0400 Message-ID: <201005181811.o4IIBZ7d017618@svn01.web.mwc.hst.phx2.redhat.com> --===============1678071322293036115== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 14:11:35 -0400 (Tue, 18 May 2010) New Revision: 22190 Added: trunk/site/ trunk/site/README-HOWTO-BUILD.txt trunk/site/category.JBDS.xml trunk/site/category.JBossTools.xml trunk/site/index.html trunk/site/pom.xml trunk/site/site.xml trunk/site/web/ trunk/site/web/site.css Log: add site/ Added: trunk/site/README-HOWTO-BUILD.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/site/README-HOWTO-BUILD.txt (rev 0) +++ trunk/site/README-HOWTO-BUILD.txt 2010-05-18 18:11:35 UTC (rev 22190) @@ -0,0 +1,13 @@ +To build this update site: + + cd /tmp; \ + svn co http://anonsvn.jboss.org/repos/jbosstools/branches/modular_build/= build/; \ + cd build; \ + ant + +To build just the update site (assuming you've previously built the compon= ents): + + cd /tmp/build; + ant create.overall.update.site -Dbuild.if.sources.unchanged=3Dtrue + + Added: trunk/site/category.JBDS.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/site/category.JBDS.xml (rev 0) +++ trunk/site/category.JBDS.xml 2010-05-18 18:11:35 UTC (rev 22190) @@ -0,0 +1,273 @@ + + + + This is the ${update.site.description} Update Site for ${product.name} $= {product.version}. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${product.name} SDK contains plugins where an SDK package + exists. These contain both source and runtimes. Use these if you want + to debug and/or provide patches to ${product.name} plugins. + + + + + + Contains ALL the plugins that are available from + ${product.name} except those + related to integration with 3rd party + plugins. Selecting this + category will give you all tools needed for + both Web, Seam and SOA + Development. + + + + + + Tools to help create SOA applications. Use these if you + work with jBPM, + Drools, JBoss ESB, JBoss WebServices or Smooks. + + + + + + Tools to help create web and enterprise applications, + using JSF, Facelets, + Seam, Hibernate/JPA, CSS, Webservices and more. + + + + + Tools for general application development. + + + + Tools related to data services such as persistence and + transformation. + + + + + + + + + + Tools used to improve testing and performance. + + + + Added: trunk/site/category.JBossTools.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/site/category.JBossTools.xml (rev 0) +++ trunk/site/category.JBossTools.xml 2010-05-18 18:11:35 UTC (rev 22190) @@ -0,0 +1,271 @@ + + + + This is the ${update.site.description} Update Site for ${product.name} $= {product.version}. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${product.name} SDK contains plugins where an SDK package + exists. These contain both source and runtimes. Use these if you want + to debug and/or provide patches to ${product.name} plugins. + + + + + + Contains ALL the plugins that are available from + ${product.name} except those + related to integration with 3rd party + plugins. Selecting this + category will give you all tools needed for + both Web, Seam and SOA + Development. + + + + + + Tools to help create SOA applications. Use these if you + work with jBPM, + Drools, JBoss ESB, JBoss WebServices or Smooks. + + + + + + Tools to help create web and enterprise applications, + using JSF, Facelets, + Seam, Hibernate/JPA, CSS, Webservices and more. + + + + + Tools for general application development. + + + + Tools related to data services such as persistence and + transformation. + + + + + Plugins related to Maven and m2eclipse support. Use these + to enable use of Maven. + + + + + Business Intelligence, Reporting and Charting. Use these + if you plan to integrate Hibernate or Seam with Eclipse BIRT. + + + + + Tools used to improve testing and performance. + + + + Added: trunk/site/index.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/site/index.html (rev 0) +++ trunk/site/index.html 2010-05-18 18:11:35 UTC (rev 22190) @@ -0,0 +1,135 @@ + + +JBoss Tools ${update.site.description} Update Site: ${product.versi= onTag} + + + + + + + + + + + + + + + + + + +
  
   +

JBoss Tools ${update.site.description} Update Site + + + + + + + + + + + + + + + + + + + + + + + + +
Latest Build: + ${product.versionTag}
+

This is the ${update.site.description} + Update Site for JBoss Tools. See Installation + Instructions.

+
+

NOTE= : Some + features (such as BIRT and Maven) require additional third-party + prerequisites not available from Eclipse.org or JBoss.org. These can + be installed from the following update sites, which may already be + listed - but not enabled - in your Eclipse's list of Available + Software Sites:

+ +
+

You can also download JBoss Tools as + individual zips for offline installation. See JBoss Tools + Downloads.

+
+

For more information, see Installation + methods.

+

+
+
+

+ + + + + + + + + + + + + + + + + + + +
Installation + Types
+

Depending on how close to the bleeding edge + you like to be, there are several types of releases available.

+
+ +
+

Stable Releases

+ +

Stable + releases are - as indicated by their name - stable.


+ +
+

Development Milestones

+ +

Developme= nt + builds, released once per milestone and only a few times a year, a= re + fairly stable, but there may be some things which do not yet work. + If you would like to try one of these milestones, we'd greatly + appreciate the assistance in testing and reporting of + issues in our issue tracker.


+ +
+

Nightly Builds

+ +

The bleeding + edge contains the latest and greatest new features, but nothing is + stable or guaranteed - yet. If you're using a Milestone and need a + fix, you can update to the latest Nightly, or wait for the next + Milestone.


+
+
+ Added: trunk/site/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/site/pom.xml (rev 0) +++ trunk/site/pom.xml 2010-05-18 18:11:35 UTC (rev 22190) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../site/../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + site = + 0.0.1-SNAPSHOT + eclipse-update-site + Added: trunk/site/site.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/site/site.xml (rev 0) +++ trunk/site/site.xml 2010-05-18 18:11:35 UTC (rev 22190) @@ -0,0 +1,271 @@ + + + + This is the Nightly Build Update Site for JBoss Tools 3.2.0-beta-1. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JBoss Tools SDK contains plugins where an SDK package + exists. These contain both source and runtimes. Use these if you want + to debug and/or provide patches to JBoss Tools plugins. + + + + + + Contains ALL the plugins that are available from + JBoss Tools except those + related to integration with 3rd party + plugins. Selecting this + category will give you all tools needed for + both Web, Seam and SOA + Development. + + + + + + Tools to help create SOA applications. Use these if you + work with jBPM, + Drools, JBoss ESB, JBoss WebServices or Smooks. + + + + + + Tools to help create web and enterprise applications, + using JSF, Facelets, + Seam, Hibernate/JPA, CSS, Webservices and more. + + + + + Tools for general application development. + + + + Tools related to data services such as persistence and + transformation. + + + + + Plugins related to Maven and m2eclipse support. Use these + to enable use of Maven. + + + + + Business Intelligence, Reporting and Charting. Use these + if you plan to integrate Hibernate or Seam with Eclipse BIRT. + + + + + Tools used to improve testing and performance. + + + + Added: trunk/site/web/site.css =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/site/web/site.css (rev 0) +++ trunk/site/web/site.css 2010-05-18 18:11:35 UTC (rev 22190) @@ -0,0 +1,66 @@ +< +STYLE type =3D"text/css">td.spacer { + padding-bottom: 10px; + padding-top: 10px; +} + +.title { + font-family: sans-serif; + color: #1778be; +} + +.bodyText { + font-family: sans-serif; + font-size: 9pt; + color: #000000; +} + +.sub-header { + font-family: sans-serif; + font-style: normal; + font-weight: bold; + font-size: 9pt; + color: white; +} + +.log-text { + font-family: sans-serif; + font-style: normal; + font-weight: lighter; + font-size: 8pt; + color: black; +} + +.big-header { + font-family: sans-serif; + font-style: normal; + font-weight: bold; + font-size: 9pt; + color: white; + border-top: 10px solid white; +} + +.light-row { + background: #FFFFFF +} + +.dark-row { + background: #EEEEEE +} + +.header { + background: #445562 +} + +#indent { + word-wrap: break-word; + width: 300px; + text-indent: 10px; +} + +.link { + color: #187dc6; +} + \ No newline at end of file --===============1678071322293036115==-- From jbosstools-commits at lists.jboss.org Tue May 18 15:00:39 2010 Content-Type: multipart/mixed; boundary="===============2214524929699538959==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22191 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: META-INF and 1 other directory. Date: Tue, 18 May 2010 15:00:39 -0400 Message-ID: <201005181900.o4IJ0dFM023123@svn01.web.mwc.hst.phx2.redhat.com> --===============2214524929699538959== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 15:00:39 -0400 (Tue, 18 May 2010) New Revision: 22191 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.ui/build.properties Log: add more transient deps from o.e.jdt.internal.debug.ui; move jem.util from = build.properties into manifest Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2010-= 05-18 18:11:35 UTC (rev 22190) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/META-INF/MANIFEST.MF 2010-= 05-18 19:00:39 UTC (rev 22191) @@ -4,33 +4,40 @@ Bundle-SymbolicName: org.jboss.ide.eclipse.as.ui;singleton:=3Dtrue Bundle-Version: 2.1.0.qualifier Bundle-Localization: plugin -Require-Bundle: org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.ui, - org.eclipse.ui.forms, +Require-Bundle: org.eclipse.ui.ide;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.jface.text;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.ui.workbench.texteditor;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.ui.editors;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.ui;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.core.filebuffers;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.core.variables;bundle-version=3D"[3.2.0,4.0.0)", + org.eclipse.core.expressions;bundle-version=3D"[3.4.0,4.0.0)", + org.eclipse.jdt.core;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.debug.ui;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.jdt.debug;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.jdt.launching;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.jdt.ui;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.core.runtime;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.ltk.core.refactoring;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.ui.console;bundle-version=3D"[3.4.0,4.0.0)", + org.eclipse.jdt.core.manipulation;bundle-version=3D"[1.3.0,2.0.0)", + org.eclipse.search;bundle-version=3D"[3.5.0,4.0.0)", + org.eclipse.ui.forms;bundle-version=3D"[3.4.0,4.0.0)", + org.eclipse.core.resources, + com.ibm.icu, org.eclipse.jst.server.ui, - org.eclipse.jdt.launching, org.eclipse.wst.server.core, org.eclipse.wst.server.ui, org.eclipse.wst.server.ui.doc.user, - org.eclipse.jdt.debug, org.eclipse.jdt.debug.ui, - org.eclipse.ui.console, org.eclipse.text, - org.eclipse.jface.text, org.eclipse.debug.core, - org.eclipse.debug.ui, org.eclipse.ui.views, - org.eclipse.ui.editors, - org.eclipse.ui.workbench.texteditor, org.eclipse.wst.xml.ui, org.eclipse.wst.sse.ui, org.eclipse.wst.sse.core, org.eclipse.wst.xml.core, - org.eclipse.jdt.core, - org.eclipse.jdt.ui, org.eclipse.core.filesystem, - org.eclipse.ui.ide, org.eclipse.jst.server.core, org.eclipse.wst.common.project.facet.core, org.eclipse.jst.servlet.ui, @@ -38,8 +45,7 @@ org.eclipse.jst.j2ee.ui, org.eclipse.wst.web.ui, org.eclipse.wst.common.frameworks.ui, - org.eclipse.core.variables, - org.eclipse.search, + org.eclipse.jem.util, org.apache.ant, org.jboss.ide.eclipse.as.core, org.eclipse.ui.navigator, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/build.properties 2010-05-1= 8 18:11:35 UTC (rev 22190) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/build.properties 2010-05-1= 8 19:00:39 UTC (rev 22191) @@ -11,4 +11,3 @@ about.html,\ about.properties,\ jboss_about.png -additional.bundles =3D org.eclipse.jem.util --===============2214524929699538959==-- From jbosstools-commits at lists.jboss.org Tue May 18 15:13:35 2010 Content-Type: multipart/mixed; boundary="===============6648077300454688898==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22192 - trunk/as/plugins/org.jboss.ide.eclipse.as.ssh. Date: Tue, 18 May 2010 15:13:35 -0400 Message-ID: <201005181913.o4IJDZBE030643@svn01.web.mwc.hst.phx2.redhat.com> --===============6648077300454688898== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 15:13:34 -0400 (Tue, 18 May 2010) New Revision: 22192 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/pom.xml Log: fix pom.xml Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/pom.xml 2010-05-18 19:00:= 39 UTC (rev 22191) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ssh/pom.xml 2010-05-18 19:13:= 34 UTC (rev 22192) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.ide.eclipse.as.ssh = - 1.0.0-SNAPSHOT + 2.1.0-SNAPSHOT eclipse-plugin --===============6648077300454688898==-- From jbosstools-commits at lists.jboss.org Tue May 18 15:33:35 2010 Content-Type: multipart/mixed; boundary="===============1349520986824658509==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22193 - trunk/smooks/plugins/org.jboss.tools.smooks.templating. Date: Tue, 18 May 2010 15:33:35 -0400 Message-ID: <201005181933.o4IJXZOa032731@svn01.web.mwc.hst.phx2.redhat.com> --===============1349520986824658509== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 15:33:34 -0400 (Tue, 18 May 2010) New Revision: 22193 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.templating/pom.xml Log: fix pom version Modified: trunk/smooks/plugins/org.jboss.tools.smooks.templating/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/plugins/org.jboss.tools.smooks.templating/pom.xml 2010-05-= 18 19:13:34 UTC (rev 22192) +++ trunk/smooks/plugins/org.jboss.tools.smooks.templating/pom.xml 2010-05-= 18 19:33:34 UTC (rev 22193) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.smooks.templating = - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT eclipse-plugin --===============1349520986824658509==-- From jbosstools-commits at lists.jboss.org Tue May 18 15:35:30 2010 Content-Type: multipart/mixed; boundary="===============3439758373897886338==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22194 - in trunk/smooks: plugins/org.jboss.tools.smooks.ui and 2 other directories. Date: Tue, 18 May 2010 15:35:30 -0400 Message-ID: <201005181935.o4IJZUOf000684@svn01.web.mwc.hst.phx2.redhat.com> --===============3439758373897886338== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-18 15:35:29 -0400 (Tue, 18 May 2010) New Revision: 22194 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/pom.xml trunk/smooks/pom.xml trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml Log: fix pom.xml Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/pom.xml 2010-05-18 19:33= :34 UTC (rev 22193) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/pom.xml 2010-05-18 19:35= :29 UTC (rev 22194) @@ -9,6 +9,6 @@ org.jboss.tools org.jboss.tools.smooks.ui = - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT eclipse-plugin Modified: trunk/smooks/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/pom.xml 2010-05-18 19:33:34 UTC (rev 22193) +++ trunk/smooks/pom.xml 2010-05-18 19:35:29 UTC (rev 22194) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - smooks.all + smooks 0.0.1-SNAPSHOT pom @@ -17,4 +17,4 @@ tests - = \ No newline at end of file + = Modified: trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml 2010-= 05-18 19:33:34 UTC (rev 22193) +++ trunk/smooks/tests/org.jboss.tools.smooks.templating.test/pom.xml 2010-= 05-18 19:35:29 UTC (rev 22194) @@ -10,5 +10,5 @@ org.jboss.tools org.jboss.tools.smooks.templating.test = 1.1.0-SNAPSHOT - eclipse-test-plugin + eclipse-plugin Modified: trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml 2010-05-18 19= :33:34 UTC (rev 22193) +++ trunk/smooks/tests/org.jboss.tools.smooks.ui.test/pom.xml 2010-05-18 19= :35:29 UTC (rev 22194) @@ -10,5 +10,5 @@ org.jboss.tools org.jboss.tools.smooks.ui.test = 1.1.0-SNAPSHOT - eclipse-test-plugin + eclipse-plugin --===============3439758373897886338==-- From jbosstools-commits at lists.jboss.org Tue May 18 17:26:04 2010 Content-Type: multipart/mixed; boundary="===============8566308899662429033==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22195 - trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard. Date: Tue, 18 May 2010 17:26:04 -0400 Message-ID: <201005182126.o4ILQ4AB025991@svn01.web.mwc.hst.phx2.redhat.com> --===============8566308899662429033== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-18 17:26:04 -0400 (Tue, 18 May 2010) New Revision: 22195 Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/to= ols/project/examples/wizard/NewProjectExamplesWizardPage.java Log: https://jira.jboss.org/browse/JBIDE-6273 Example details disappear when wiz= ard page is resized Modified: trunk/examples/plugins/org.jboss.tools.project.examples/src/org/j= boss/tools/project/examples/wizard/NewProjectExamplesWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/t= ools/project/examples/wizard/NewProjectExamplesWizardPage.java 2010-05-18 1= 9:35:29 UTC (rev 22194) +++ trunk/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/t= ools/project/examples/wizard/NewProjectExamplesWizardPage.java 2010-05-18 2= 1:26:04 UTC (rev 22195) @@ -128,7 +128,9 @@ SWT.COLOR_WIDGET_BACKGROUND)); final TreeViewer viewer =3D filteredTree.getViewer(); Tree tree =3D viewer.getTree(); - tree.setLayoutData(new GridData(GridData.FILL_BOTH)); + gd =3D new GridData(GridData.FILL_HORIZONTAL); + gd.heightHint=3D75; = + tree.setLayoutData(gd); tree.setFont(parent.getFont()); = viewer.setLabelProvider(new ProjectLabelProvider()); --===============8566308899662429033==-- From jbosstools-commits at lists.jboss.org Wed May 19 02:52:31 2010 Content-Type: multipart/mixed; boundary="===============4225912600854512145==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22196 - in trunk: hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org/jboss/tools/hibernate/ui/bot/testcase and 2 other directories. Date: Wed, 19 May 2010 02:52:31 -0400 Message-ID: <201005190652.o4J6qVR5016613@svn01.web.mwc.hst.phx2.redhat.com> --===============4225912600854512145== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vpakan(a)redhat.com Date: 2010-05-19 02:52:30 -0400 (Wed, 19 May 2010) New Revision: 22196 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/RuleFlowTest.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/org= /jboss/tools/hibernate/ui/bot/testcase/ConsoleTest.java trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ex= t/helper/DragAndDropHelper.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/= ui/bot/test/VPEAutoTestCase.java Log: Fix warnings. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-18 21:26:04 UTC (rev = 22195) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-19 06:52:30 UTC (rev = 22196) @@ -28,7 +28,6 @@ import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor; import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable; import org.eclipse.swtbot.swt.finder.results.Result; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.drools.ui.bot.test.DroolsAllBotTests; Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/= src/org/jboss/tools/hibernate/ui/bot/testcase/ConsoleTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/or= g/jboss/tools/hibernate/ui/bot/testcase/ConsoleTest.java 2010-05-18 21:26:0= 4 UTC (rev 22195) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.bot.test/src/or= g/jboss/tools/hibernate/ui/bot/testcase/ConsoleTest.java 2010-05-19 06:52:3= 0 UTC (rev 22196) @@ -16,6 +16,7 @@ import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem; import org.jboss.tools.hibernate.ui.bot.testsuite.HibernateTest; import org.jboss.tools.hibernate.ui.bot.testsuite.Project; +import org.jboss.tools.ui.bot.ext.SWTEclipseExt; import org.jboss.tools.ui.bot.ext.gen.ActionItem; import org.jboss.tools.ui.bot.ext.types.EntityType; import org.jboss.tools.ui.bot.ext.types.IDELabel; @@ -192,7 +193,7 @@ = private void openConsoleConfiguration() { SWTBot viewBot =3D open.viewOpen(ActionItem.View.HibernateHibernateConfi= gurations.LABEL).bot(); - SWTBotTreeItem item =3D eclipse.selectTreeLocation(viewBot, Project.PROJ= ECT_NAME); + SWTBotTreeItem item =3D SWTEclipseExt.selectTreeLocation(viewBot, Projec= t.PROJECT_NAME); item.doubleClick(); = } } Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui= /bot/ext/helper/DragAndDropHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/helper/DragAndDropHelper.java 2010-05-18 21:26:04 UTC (rev 22195) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/e= xt/helper/DragAndDropHelper.java 2010-05-19 06:52:30 UTC (rev 22196) @@ -40,6 +40,7 @@ * @param targetWidget */ public static void dragAndDropOnTo(Widget sourceWidget, Widget targetWid= get){ + log.info("Drag and Drop from " + sourceWidget + " to " + targetWidget); try { if (DragAndDropHelper.robot =3D=3D null){ DragAndDropHelper.robot =3D new Robot(); Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/too= ls/vpe/ui/bot/test/VPEAutoTestCase.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/VPEAutoTestCase.java 2010-05-18 21:26:04 UTC (rev 22195) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/VPEAutoTestCase.java 2010-05-19 06:52:30 UTC (rev 22196) @@ -325,6 +325,7 @@ * For debug purposes. Displays formatted node * @param node */ + @SuppressWarnings("unused") private void displaynsIDOMNode(nsIDOMNode node) { System.out.println(""); System.out.print("<" + node.getNodeName() + " "); --===============4225912600854512145==-- From jbosstools-commits at lists.jboss.org Wed May 19 05:13:43 2010 Content-Type: multipart/mixed; boundary="===============8129052894249328773==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22197 - trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF. Date: Wed, 19 May 2010 05:13:43 -0400 Message-ID: <201005190913.o4J9Dh1p019013@svn01.web.mwc.hst.phx2.redhat.com> --===============8129052894249328773== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-19 05:13:43 -0400 (Wed, 19 May 2010) New Revision: 22197 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF Log: add missing export-package: org.jboss.tools.cdi.internal.core.refactoring Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2010-05= -19 06:52:30 UTC (rev 22196) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/META-INF/MANIFEST.MF 2010-05= -19 09:13:43 UTC (rev 22197) @@ -29,6 +29,7 @@ org.jboss.tools.cdi.internal.core.impl, org.jboss.tools.cdi.internal.core.impl.definition, org.jboss.tools.cdi.internal.core.project.facet, + org.jboss.tools.cdi.internal.core.refactoring, org.jboss.tools.cdi.internal.core.scanner, org.jboss.tools.cdi.internal.core.scanner.lib, org.jboss.tools.cdi.internal.core.validation --===============8129052894249328773==-- From jbosstools-commits at lists.jboss.org Wed May 19 05:52:48 2010 Content-Type: multipart/mixed; boundary="===============0459443843792094603==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22198 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages and 1 other directory. Date: Wed, 19 May 2010 05:52:48 -0400 Message-ID: <201005190952.o4J9qmaM023634@svn01.web.mwc.hst.phx2.redhat.com> --===============0459443843792094603== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-19 05:52:48 -0400 (Wed, 19 May 2010) New Revision: 22198 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/m= essages.properties Log: https://jira.jboss.org/browse/JBIDE-6301 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties 2010-05-= 19 09:13:43 UTC (rev 22197) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.properties 2010-05-= 19 09:52:48 UTC (rev 22198) @@ -42,7 +42,7 @@ = ViewName_WebProjects=3DWeb Projects ViewCategory_JBossToolsWeb=3DJBoss Tools Web -VPE_Templates=3DTemplates +VPE_Templates=3DCode Templates = All_XHTML_context_type_Extension_Element.name=3DAll XHTML XHTML_New_context_type_Extension_Element.name=3DNew XHTML Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-19 09:13:43 UTC (rev 22197) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-19 09:52:48 UTC (rev 22198) @@ -16,7 +16,7 @@ GENERAL=3DGeneral = # Unknown tags templates dialog messages -TEMPLATES=3DTemplates +TEMPLATES=3DVisual Templates TEMPLATE=3DUnknown tag template UNKNOWN_TAGS_DIALOG_DESCRIPTION=3DSet up parameters for the unknown tag TAG_ATTRIBUTES=3DSet up tag attributes @@ -87,7 +87,7 @@ BaseActionManager_InsertBefore=3DInsert Before BaseActionManager_InsertTag=3DInsert Tag BaseActionManager_ReplaceWith=3DReplace With -SETUP_TEMPLATE_FOR_MENU=3DSetup Template for <{0}>... +SETUP_TEMPLATE_FOR_MENU=3DSetup Visual Template for <{0}>... INSERT_AROUND=3DInsert around INSERT_BEFORE=3DInsert before INSERT_AFTER=3DInsert after --===============0459443843792094603==-- From jbosstools-commits at lists.jboss.org Wed May 19 08:32:31 2010 Content-Type: multipart/mixed; boundary="===============0829535237449243570==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22199 - trunk/jst/plugins/org.jboss.tools.jst.web.ui. Date: Wed, 19 May 2010 08:32:31 -0400 Message-ID: <201005191232.o4JCWVeg027825@svn01.web.mwc.hst.phx2.redhat.com> --===============0829535237449243570== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-19 08:32:30 -0400 (Wed, 19 May 2010) New Revision: 22199 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml Log: https://jira.jboss.org/browse/JBIDE-6309 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-19 09:5= 2:48 UTC (rev 22198) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-19 12:3= 2:30 UTC (rev 22199) @@ -745,8 +745,8 @@ id=3D"xhtml_attribute_value"> + file=3D"/src/templates/xhtmldefault-templates.xml" + translations=3D"/src/templates/xhtmldefault-templates.properties"> = --===============0829535237449243570==-- From jbosstools-commits at lists.jboss.org Wed May 19 09:50:48 2010 Content-Type: multipart/mixed; boundary="===============3310466096328898184==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22200 - trunk/jst/plugins/org.jboss.tools.jst.web.ui. Date: Wed, 19 May 2010 09:50:48 -0400 Message-ID: <201005191350.o4JDomxO011159@svn01.web.mwc.hst.phx2.redhat.com> --===============3310466096328898184== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-19 09:50:47 -0400 (Wed, 19 May 2010) New Revision: 22200 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml Log: https://jira.jboss.org/browse/JBIDE-6309 Modified: trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-19 12:3= 2:30 UTC (rev 22199) +++ trunk/jst/plugins/org.jboss.tools.jst.web.ui/plugin.xml 2010-05-19 13:5= 0:47 UTC (rev 22200) @@ -745,8 +745,8 @@ id=3D"xhtml_attribute_value"> + file=3D"templates/xhtmldefault-templates.xml" + translations=3D"$nl$/templates/xhtmldefault-templates.properties"> = --===============3310466096328898184==-- From jbosstools-commits at lists.jboss.org Wed May 19 10:56:49 2010 Content-Type: multipart/mixed; boundary="===============5320262985864942923==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22201 - in trunk/bpel/docs/reference/en-US: modules and 1 other directory. Date: Wed, 19 May 2010 10:56:48 -0400 Message-ID: <201005191456.o4JEum7u024909@svn01.web.mwc.hst.phx2.redhat.com> --===============5320262985864942923== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-19 10:56:48 -0400 (Wed, 19 May 2010) New Revision: 22201 Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_10.png trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_11.png trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_12.png trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_4.png trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_5.png trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_6.png trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_7.png trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_8.png trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_9.png Modified: trunk/bpel/docs/reference/en-US/modules/reference.xml Log:

https://jira.jboss.org/browse/TOOLSDOC-23 - Described creating wizards a= nd Business Process Editor in the reference section.

Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_10.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_10.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_11.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_11.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_12.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_12.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_4.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_4.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_5.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_5.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_6.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_6.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_7.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_7.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_8.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_8.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_9.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_9.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/bpel/docs/reference/en-US/modules/reference.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/docs/reference/en-US/modules/reference.xml 2010-05-19 13:50:= 47 UTC (rev 22200) +++ trunk/bpel/docs/reference/en-US/modules/reference.xml 2010-05-19 14:56:= 48 UTC (rev 22201) @@ -9,7 +9,7 @@ Reference - This chapter includes detailed reference information about all B= PEL tools Wizards and editors. + This chapter includes detailed reference information about all B= PEL tools wizards and editors.
Wizards
@@ -24,7 +24,7 @@
- The wizard consists of only one page: + It consists of only one page: On the page you can adjust the name of the= project and the directory where it will be created. If "Use default" option is = checked the output directory will be the workspace, @@ -42,7 +42,8 @@
New BPEL Process file Wizard - Using New BPEL Process file Wizard user can create BPEL = process file and WSDL file if it is necessary. + Using New BPEL Process file Wizard + user can create BPEL process file and WSDL file if it is n= ecessary. The wizard includes several pages: The first page has the following options t= o set: @@ -88,7 +89,7 @@ with the one of messages u= sed within the process is empty.There are no any orchestration logic. Sync= hronous BPEL Process - = similar to Asynchronous BP= EL Process temlate except the fact that here - the caller is notified asy= nchronously when the process completes. + the caller is notified syn= chronously when the process completes. Asynchronous BPEL Process @@ -100,7 +101,8 @@ -
+ = +
New BPEL Process file Wizard @@ -110,10 +112,135 @@
= + On the second page the user should select = the BPEL project = + and folder where the process file will be created: +
+ New BPEL Process file Wizard + + + + + +
+ + + Process files that are used in the BPEL project must= be under the bpelContent folder. Only in this case = + these files can be deployed to JBoss server. + +
+ +
+ Editors +
+ Business Process Editor + Business Process Editor is intended to facilitate the pr= ocess of changing and = + adding new logic to BPEL process file.You can open .bpel = + in this editor by right click the file in the project expl= orer and selecting = + Open With...->Business Process Editor + +
+ Business Process Editor + + + + + +
+ The editor consists of two tabs:Design tab and Source tab. +
+ Design tab + Design tab is the main part of Business Process Editor.It= consists of 3 parts: + + Visual Pane: +
+ Visual Pane of Business Process Editor</titl= e> + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/reference/bpel= _ref_6.png"/> + </imageobject> + </mediaobject> + </figure> + <para>The Visual Pane graphically displays the order in= which the activities are executed.</para> + </listitem> + <listitem><para>Palette:</para> + <figure> + <title>Palette of Business Process Editor + + + + + +
+ The Palette represents diff= erent elements of the BPEL activities + organized into functional categories. + Using it the user can easily add new elements to th= e sequence activity. + To do this,he should just click the required elemen= t and then drug + and drop it to the place on the Visual Pane where i= t should be added. + + Behavior Components View: +
+ Behavior Components View of Business Process = Editor + + + + + +
+ Execution behavior components are grouped into th= e + Behavior Components View. + The view is also fully syncronized with Properties = view where you can customize all + the properties of the component. +
+ Process Structure View of Business Process E= ditor + + + + + +
= + To add an element to some component group click p= lus( + + + + ) icon, + for its deleting you should click the element and + use its Delete option in the p= opup menu. = + + = + + = + = +
+
+ Source tab + Source tab can be used for editing BPEL process file= directly. + The validation of file structure is also available. + +
+ Validation error in Source tab + + + + + +
+ If the user wants to disable/unable validation he ca= n do it by following + Window->Preferences->Validation.<= /para> +
+ Validation error in Source tab + + + + + +
= +
+
=
= + = = --===============5320262985864942923==-- From jbosstools-commits at lists.jboss.org Wed May 19 12:15:56 2010 Content-Type: multipart/mixed; boundary="===============7666705847652321944==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22202 - in trunk/cdi: plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 1 other directories. Date: Wed, 19 May 2010 12:15:56 -0400 Message-ID: <201005191615.o4JGFuoe013672@svn01.web.mwc.hst.phx2.redhat.com> --===============7666705847652321944== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-19 12:15:55 -0400 (Wed, 19 May 2010) New Revision: 22202 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : If a producer method is annotated @Inject, the container automatically de= tects the problem and treats it as a definition error. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-19 14:56:48 UTC (rev 222= 01) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-19 16:15:55 UTC (rev 222= 02) @@ -551,6 +551,15 @@ } } = + /* + * 3.3.2. Declaring a producer method + * - producer method is annotated @Inject + */ + IAnnotationDeclaration inject =3D producer.getAnnotation(CDIConstants.I= NJECT_ANNOTATION_TYPE_NAME); + if(inject!=3Dnull) { + addError(CDIValidationMessages.PRODUCER_ANNOTATED_INJECT, CDIPreferenc= es.PRODUCER_ANNOTATED_INJECT, inject, producer.getResource()); + } + String[] typeVariables =3D producer.getBeanClass().getTypeParameterSign= atures(); = if (producer instanceof IProducerField) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-19 14:56:48 UTC (rev 22201) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-19 16:15:55 UTC (rev 22202) @@ -51,17 +51,15 @@ - session bean class annotated @Specializes does not directly extend = the bean class of another session bean = - - - - - 3.3. Producer methods = - producer method return type contains a wildcard type parameter - producer method with a parameterized return type with a type variable de= clares = any scope other than @Dependent - producer method return type is a type variable = + + + 3.3.2. Declaring a producer method - producer method is annotated @Inject - producer method has a parameter annotated @Disposes @@ -70,6 +68,9 @@ is not a business method of the session bean - interceptor or decorator has a method annotated @Produces = + + + 3.3.3. Specializing a producer method - method annotated @Specializes is static or does not directly override an= other producer method = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-19 14:56:48 UTC (rev 22201) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-19 16:15:55 UTC (rev 22202) @@ -76,7 +76,7 @@ private static SectionDescription SECTION_MEMBER =3D new SectionDescripti= on( CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_member, new String[][]{ -// {CDIPreferences.PRODUCER_ANNOTATED_INJECT, CDIPreferencesMessages.CDI= ValidatorConfigurationBlock_pb_producerAnnotatedInject_label}, + {CDIPreferences.PRODUCER_ANNOTATED_INJECT, CDIPreferencesMessages.CDIVa= lidatorConfigurationBlock_pb_producerAnnotatedInject_label}, {CDIPreferences.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferencesM= essages.CDIValidatorConfigurationBlock_pb_producerParameterIllegallyAnnotat= ed_label}, // {CDIPreferences.OBSERVER_ANNOTATED_INJECT, CDIPreferencesMessages.CDI= ValidatorConfigurationBlock_pb_observerAnnotatedInject_label}, {CDIPreferences.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferencesM= essages.CDIValidatorConfigurationBlock_pb_observerParameterIllegallyAnnotat= ed_label}, Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-19 14:56:48 UTC (rev 22201) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-19 16:15:55 UTC (rev 22202) @@ -415,8 +415,85 @@ IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /inheritance/specialization/enterprise/broken/directlyExtendsNothing/Cow_Br= oken.java"); AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_B= EAN, 22); } - = + /** + * 3.3. Producer methods + * - producer method return type contains a wildcard type parameter + * = + * 2.2.1 - Legal bean types + * - a parameterized type that contains a wildcard type parameter is not= a legal bean type. + * = + * @throws Exception + */ + public void testParameterizedReturnTypeWithWildcard() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/parameterizedTypeWithWildcard/Spider= Producer.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_HA= S_WILDCARD, 24); + } + + /** + * 3.3. Producer methods + * - producer method return type is a type variable + * = + * 2.2.1 - Legal bean types + * - a type variable is not a legal bean type + * = + * @throws Exception + */ + public void testParameterizedType() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/= TProducer.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_IS= _VARIABLE, 25); + file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/v= alidation/producers/SpiderProducerVariableType_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_IS= _VARIABLE, 13); + } + + /** + * 3.3. Producer methods + * - producer method with a parameterized return type with a type variab= le declares any scope other than @Dependent + * = + * @throws Exception + */ + public void testParameterizedReturnTypeWithWrongScope() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/ParameterizedTypeWithWrongScope_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_MET= HOD, 25, 39); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 21); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 35); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 31); + } + + /** + * 3.3.2. Declaring a producer method + * - producer method is annotated @Inject + * = + * @throws Exception + */ + public void testInitializerMethodAnnotatedProduces() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/initializer/broken/methodAnnotatedProduces/Pheasant_Broken.= java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_ANNOTATED_INJECT, 25); + } + + /** + * 3.3.2. Declaring a producer method + * - a producer method has a parameter annotated @Disposes + * = + * @throws Exception + */ + public void testProducerMethodWithParameterAnnotatedDisposes() throws Exc= eption { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/parameterAnnotatedDisposes/SpiderPro= ducer_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_A= NNOTATED, 25, 26); + } + + /** + * 3.3.2. Declaring a producer method + * - a producer method has a parameter annotated @Observers + * = + * @throws Exception + */ + public void testProducerMethodWithParameterAnnotatedObserves() throws Exc= eption { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/parameterAnnotatedObserves/SpiderPro= ducer_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_A= NNOTATED, 25, 26); + } + + /** * 3.5.1. Declaring a resource * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) * = @@ -541,20 +618,6 @@ } = /** - * 3.3. Producer methods - * - producer method return type contains a wildcard type parameter - * = - * 2.2.1 - Legal bean types - * - a parameterized type that contains a wildcard type parameter is not= a legal bean type. - * = - * @throws Exception - */ - public void testParameterizedReturnTypeWithWildcard() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/parameterizedTypeWithWildcard/Spider= Producer.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_HA= S_WILDCARD, 24); - } - - /** * 3.4. Producer fields * - producer field type contains a wildcard type parameter * = @@ -567,22 +630,6 @@ } = /** - * 3.3. Producer methods - * - producer method return type is a type variable - * = - * 2.2.1 - Legal bean types - * - a type variable is not a legal bean type - * = - * @throws Exception - */ - public void testParameterizedType() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/parameterizedTypeWithTypeParameter2/= TProducer.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_IS= _VARIABLE, 25); - file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/v= alidation/producers/SpiderProducerVariableType_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_IS= _VARIABLE, 13); - } - - /** * 3.4. Producer fields. * - producer field type is a type variable * = @@ -594,20 +641,6 @@ } = /** - * 3.3. Producer methods - * - producer method with a parameterized return type with a type variab= le declares any scope other than @Dependent - * = - * @throws Exception - */ - public void testParameterizedReturnTypeWithWrongScope() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/ParameterizedTypeWithWrongScope_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_MET= HOD, 25, 39); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 21); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 35); - AbstractResourceMarkerTest.assertMarkerIsNotCreated(file, AbstractResour= ceMarkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_= METHOD, 31); - } - - /** * 3.4. Producer fields * - producer field with a parameterized type with a type variable decla= res any scope other than @Dependent * = @@ -634,28 +667,6 @@ } = /** - * 3.3.2. Declaring a producer method - * - a producer method has a parameter annotated @Disposes - * = - * @throws Exception - */ - public void testProducerMethodWithParameterAnnotatedDisposes() throws Exc= eption { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/parameterAnnotatedDisposes/SpiderPro= ducer_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_A= NNOTATED, 25, 26); - } - - /** - * 3.3.2. Declaring a producer method - * - a producer method has a parameter annotated @Observers - * = - * @throws Exception - */ - public void testProducerMethodWithParameterAnnotatedObserves() throws Exc= eption { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/parameterAnnotatedObserves/SpiderPro= ducer_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_A= NNOTATED, 25, 26); - } - - /** * 10.4.2. Declaring an observer method * - an observer method is annotated @Produces * = --===============7666705847652321944==-- From jbosstools-commits at lists.jboss.org Wed May 19 12:39:54 2010 Content-Type: multipart/mixed; boundary="===============0586047467220418705==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22203 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test: tck and 1 other directory. Date: Wed, 19 May 2010 12:39:54 -0400 Message-ID: <201005191639.o4JGdsoY015764@svn01.web.mwc.hst.phx2.redhat.com> --===============0586047467220418705== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-19 12:39:54 -0400 (Wed, 19 May 2010) New Revision: 22203 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ProducerMethodDefinitionTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/CDICoreTestSuite.java Log: https://jira.jboss.org/browse/JBIDE-5808 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/CDICoreTestSuite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/CDICoreTestSuite.java 2010-05-19 16:15:55 UTC (rev 22202) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/CDICoreTestSuite.java 2010-05-19 16:39:54 UTC (rev 22203) @@ -19,6 +19,7 @@ import org.jboss.tools.cdi.core.test.tck.EnterpriseScopeDefinitionTest; import org.jboss.tools.cdi.core.test.tck.EnterpriseStereotypeDefinitionTes= t; import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest; import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest; import org.jboss.tools.cdi.core.test.tck.ScopeDefinitionTest; import org.jboss.tools.cdi.core.test.tck.StereotypeDefinitionTest; @@ -42,6 +43,7 @@ suite.addTestSuite(DefaultNamedTest.class); suite.addTestSuite(EnterpriseStereotypeDefinitionTest.class); suite.addTestSuite(StereotypeInheritenceTest.class); + suite.addTestSuite(ProducerMethodDefinitionTest.class); suite.addTestSuite(ValidationTest.class); return suite; } Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cd= i/core/test/tck/ProducerMethodDefinitionTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ProducerMethodDefinitionTest.java (rev= 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ProducerMethodDefinitionTest.java 2010-05-19 16:39:54 UTC (rev= 22203) @@ -0,0 +1,41 @@ +/*************************************************************************= ****** = + * 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.cdi.core.test.tck; + +import java.util.Set; + +import org.eclipse.jdt.core.JavaModelException; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.IInjectionPoint; + +/** + * @author Alexey Kazakov + */ +public class ProducerMethodDefinitionTest extends TCKTest { + + /** + * Section 3.3.2 - Declaring a producer method + * i) All producer method parameters are injection points. + * + * @throws JavaModelException = + */ + public void testBindingTypesAppliedToProducerMethodParameters() throws Ja= vaModelException { + Set beans =3D cdiProject.getBeans(true, "org.jboss.jsr299.tck.tes= ts.implementation.producer.method.definition.Tarantula", "org.jboss.jsr299.= tck.tests.implementation.producer.method.definition.Deadliest"); + IBean bean =3D beans.iterator().next(); + Set injections =3D bean.getInjectionPoints(); + assertEquals("Wrong number of injection points in the producer.", 2, inj= ections.size()); + // TODO use real location for injection points. + assertLocationEquals(injections, 0, 0); + assertLocationEquals(injections, 0, 0); + } + + // TODO continue implementing producer tests. +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/= jboss/tools/cdi/core/test/tck/ProducerMethodDefinitionTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============0586047467220418705==-- From jbosstools-commits at lists.jboss.org Wed May 19 15:41:03 2010 Content-Type: multipart/mixed; boundary="===============8333840660457165526==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22204 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 3 other directories. Date: Wed, 19 May 2010 15:41:02 -0400 Message-ID: <201005191941.o4JJf2lS021235@svn01.web.mwc.hst.phx2.redhat.com> --===============8333840660457165526== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-19 15:41:00 -0400 (Wed, 19 May 2010) New Revision: 22204 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/producers/DecoratorHasProducerFieldBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/producers/DecoratorHasProducerMethodBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/producers/InterceptorHasProducerFieldBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/producers/InterceptorHasProducerMethodBroken.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDIValidationMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : 1. Producer method or fiels is annotated @Inject; 2. Non-static method= of a session bean class is annotated @Produces, and the method is not a bu= siness method of the session bean; 3. Interceptor declares has a producer = field or method.; 4. Decorator declares has a producer field or method. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDIUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-19 16:39:54 UTC (rev 22203) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-19 19:41:00 UTC (rev 22204) @@ -17,11 +17,16 @@ = import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.Flags; +import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.JavaModelException; import org.eclipse.wst.validation.internal.plugin.ValidationPlugin; import org.jboss.tools.common.EclipseUtil; +import org.jboss.tools.common.model.util.EclipseJavaUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.jst.web.kb.IKbProject; @@ -303,4 +308,55 @@ public static boolean isInterceptor(IBean bean) { return bean instanceof IInterceptor || (bean instanceof IClassBean && be= an.getAnnotation(CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME)!=3Dnull); } + + /** + * Returns false if the method is a non-static method of the session bean= class, and the method is not a business method of the session bean. + * = + * @param bean + * @param method + * @return + */ + public static boolean isBusinessMethod(ISessionBean bean, IBeanMethod met= hod) { + return getBusinessMethodDeclaration(bean, method)!=3Dnull; + } + + /** + * Returns IMethod of @Local interface which is implemented by given busi= ness method. + * Returns null if the method is a non-static method of the session bean = class, and the method is not a business method of the session bean. + * If the method is a static one then returns this method. + * = + * @param bean + * @param method + * @return + */ + public static IMethod getBusinessMethodDeclaration(ISessionBean bean, IBe= anMethod method) { + try { + if (!Flags.isStatic(method.getMethod().getFlags())) { + Set types =3D bean.getLegalTypes(); + for (IParametedType type : types) { + IType sourceType =3D type.getType(); + if (sourceType =3D=3D null) { + continue; + } + IAnnotation annotation =3D sourceType.getAnnotation(CDIConstants.LOCA= L_ANNOTATION_TYPE_NAME); + if (annotation =3D=3D null) { + annotation =3D sourceType.getAnnotation("Local"); //$NON-NLS-N1 + } + if (annotation !=3D null && CDIConstants.LOCAL_ANNOTATION_TYPE_NAME.e= quals(EclipseJavaUtil.resolveType(sourceType, "Local"))) { //$NON-NLS-N1 + IMethod[] methods =3D sourceType.getMethods(); + for (IMethod iMethod : methods) { + if (method.getMethod().isSimilar(iMethod)) { + return iMethod; + } + } + break; + } + } + return null; + } + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + return method.getMethod(); + } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-19 16:39:54 UTC (rev 222= 03) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-19 19:41:00 UTC (rev 222= 04) @@ -7,7 +7,7 @@ * = * Contributors: = * Red Hat, Inc. - initial API and implementation = - *************************************************************************= *****/ = + *************************************************************************= *****/ package org.jboss.tools.cdi.internal.core.validation; = import java.util.ArrayList; @@ -27,7 +27,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.Flags; -import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IMemberValuePair; import org.eclipse.jdt.core.IMethod; @@ -63,7 +62,7 @@ import org.jboss.tools.cdi.core.IStereotypeDeclaration; import org.jboss.tools.cdi.core.ITypeDeclaration; import org.jboss.tools.cdi.core.preferences.CDIPreferences; -import org.jboss.tools.common.model.util.EclipseJavaUtil; +import org.jboss.tools.cdi.internal.core.impl.SessionBean; import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.jst.web.kb.IKbProject; import org.jboss.tools.jst.web.kb.KbProjectFactory; @@ -87,6 +86,7 @@ = /* * (non-Javadoc) + * = * @see org.jboss.tools.jst.web.kb.validation.IValidator#getId() */ public String getId() { @@ -95,44 +95,50 @@ = /* * (non-Javadoc) - * @see org.jboss.tools.jst.web.kb.validation.IValidator#getValidatingPro= jects(org.eclipse.core.resources.IProject) + * = + * @see + * org.jboss.tools.jst.web.kb.validation.IValidator#getValidatingProjects + * (org.eclipse.core.resources.IProject) */ public IValidatingProjectSet getValidatingProjects(IProject project) { IValidationContext rootContext =3D null; - IProject war =3D null; //TODO get war ? - if(war !=3D null && war.isAccessible()) { + IProject war =3D null; // TODO get war ? + if (war !=3D null && war.isAccessible()) { IKbProject kbProject =3D KbProjectFactory.getKbProject(war, false); - if(kbProject!=3Dnull) { + if (kbProject !=3D null) { rootContext =3D kbProject.getValidationContext(); } else { KbProject.checkKBBuilderInstalled(war); CDICoreNature cdiProject =3D CDICorePlugin.getCDI(project, false); - if(cdiProject !=3D null) { - rootContext =3D null; //cdiProject.getDelegate().getValidationContext= (); + if (cdiProject !=3D null) { + rootContext =3D null; // cdiProject.getDelegate().getValidationContex= t(); } } } - if(rootContext =3D=3D null) { + if (rootContext =3D=3D null) { CDICoreNature cdiProject =3D CDICorePlugin.getCDI(project, false); - if(cdiProject !=3D null) { + if (cdiProject !=3D null) { rootContext =3D cdiProject.getValidationContext(); } } = List projects =3D new ArrayList(); projects.add(project); -// IProject[] array =3D set.getAllProjects(); -// for (int i =3D 0; i < array.length; i++) { -// if(array[i].isAccessible()) { -// projects.add(array[i]); -// } -// } + // IProject[] array =3D set.getAllProjects(); + // for (int i =3D 0; i < array.length; i++) { + // if(array[i].isAccessible()) { + // projects.add(array[i]); + // } + // } return new ValidatingProjectSet(project, projects, rootContext); } = /* * (non-Javadoc) - * @see org.jboss.tools.jst.web.kb.validation.IValidator#shouldValidate(o= rg.eclipse.core.resources.IProject) + * = + * @see + * org.jboss.tools.jst.web.kb.validation.IValidator#shouldValidate(org.ec= lipse + * .core.resources.IProject) */ public boolean shouldValidate(IProject project) { try { @@ -146,10 +152,18 @@ = /* * (non-Javadoc) - * @see org.jboss.tools.jst.web.kb.internal.validation.ValidationErrorMan= ager#init(org.eclipse.core.resources.IProject, org.jboss.tools.jst.web.kb.i= nternal.validation.ContextValidationHelper, org.jboss.tools.jst.web.kb.inte= rnal.validation.ValidatorManager, org.eclipse.wst.validation.internal.provi= sional.core.IReporter, org.jboss.tools.jst.web.kb.validation.IValidationCon= text) + * = + * @see + * org.jboss.tools.jst.web.kb.internal.validation.ValidationErrorManager + * #init(org.eclipse.core.resources.IProject, + * org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper, + * org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager, + * org.eclipse.wst.validation.internal.provisional.core.IReporter, + * org.jboss.tools.jst.web.kb.validation.IValidationContext) */ @Override - public void init(IProject project, ContextValidationHelper validationHelp= er, org.eclipse.wst.validation.internal.provisional.core.IValidator manager= , IReporter reporter) { + public void init(IProject project, ContextValidationHelper validationHelp= er, org.eclipse.wst.validation.internal.provisional.core.IValidator manager, + IReporter reporter) { super.init(project, validationHelper, manager, reporter); cdiProject =3D CDICorePlugin.getCDIProject(project, false); projectName =3D project.getName(); @@ -157,29 +171,36 @@ = /* * (non-Javadoc) - * @see org.jboss.tools.jst.web.kb.validation.IValidator#validate(java.ut= il.Set, org.eclipse.core.resources.IProject, org.jboss.tools.jst.web.kb.int= ernal.validation.ContextValidationHelper, org.jboss.tools.jst.web.kb.intern= al.validation.ValidatorManager, org.eclipse.wst.validation.internal.provisi= onal.core.IReporter) + * = + * @see + * org.jboss.tools.jst.web.kb.validation.IValidator#validate(java.util.Se= t, + * org.eclipse.core.resources.IProject, + * org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper, + * org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager, + * org.eclipse.wst.validation.internal.provisional.core.IReporter) */ - public IStatus validate(Set changedFiles, IProject project, - ContextValidationHelper validationHelper, ValidatorManager manager, - IReporter reporter) throws ValidationException { + public IStatus validate(Set changedFiles, IProject project, Contex= tValidationHelper validationHelper, ValidatorManager manager, IReporter rep= orter) + throws ValidationException { init(project, validationHelper, manager, reporter); displaySubtask(CDIValidationMessages.SEARCHING_RESOURCES); = - if(cdiProject =3D=3D null) { + if (cdiProject =3D=3D null) { return OK_STATUS; } IWorkspaceRoot root =3D ResourcesPlugin.getWorkspace().getRoot(); - Set resources =3D new HashSet(); // Resources which we hav= e to validate. - for(IFile currentFile : changedFiles) { - if(reporter.isCancelled()) { + Set resources =3D new HashSet(); // Resources which we have + // to validate. + for (IFile currentFile : changedFiles) { + if (reporter.isCancelled()) { break; } if (ValidationUtil.checkFileExtensionForJavaAndXml(currentFile)) { resources.add(currentFile.getFullPath()); = - // Get all the paths of related resources for given file. These links = were saved in previous validation process. + // Get all the paths of related resources for given file. These + // links were saved in previous validation process. Set oldReletedResources =3D validationContext.getVariableNames= ByCoreResource(currentFile.getFullPath(), false); - if(oldReletedResources!=3Dnull) { + if (oldReletedResources !=3D null) { for (String resourcePath : oldReletedResources) { resources.add(Path.fromOSString(resourcePath)); } @@ -187,7 +208,8 @@ } } // Validate all collected linked resources. - // Remove all links between collected resources because they will be lin= ked again during validation. + // Remove all links between collected resources because they will be + // linked again during validation. validationContext.removeLinkedCoreResources(resources); = IFile[] filesToValidate =3D new IFile[resources.size()]; @@ -208,16 +230,21 @@ = /* * (non-Javadoc) - * @see org.jboss.tools.jst.web.kb.validation.IValidator#validateAll(org.= eclipse.core.resources.IProject, org.jboss.tools.jst.web.kb.internal.valida= tion.ContextValidationHelper, org.jboss.tools.jst.web.kb.internal.validatio= n.ValidatorManager, org.eclipse.wst.validation.internal.provisional.core.IR= eporter) + * = + * @see + * org.jboss.tools.jst.web.kb.validation.IValidator#validateAll(org.eclip= se + * .core.resources.IProject, + * org.jboss.tools.jst.web.kb.internal.validation.ContextValidationHelper, + * org.jboss.tools.jst.web.kb.internal.validation.ValidatorManager, + * org.eclipse.wst.validation.internal.provisional.core.IReporter) */ - public IStatus validateAll(IProject project, - ContextValidationHelper validationHelper, ValidatorManager manager, - IReporter reporter) throws ValidationException { + public IStatus validateAll(IProject project, ContextValidationHelper vali= dationHelper, ValidatorManager manager, IReporter reporter) + throws ValidationException { init(project, validationHelper, manager, reporter); - if(cdiProject =3D=3D null) { + if (cdiProject =3D=3D null) { return OK_STATUS; } - displaySubtask(CDIValidationMessages.VALIDATING_PROJECT, new String[]{pr= ojectName}); + displaySubtask(CDIValidationMessages.VALIDATING_PROJECT, new String[] { = projectName }); removeAllMessagesFromResource(cdiProject.getNature().getProject()); IBean[] beans =3D cdiProject.getBeans(); for (IBean bean : beans) { @@ -225,7 +252,7 @@ } = IStereotype[] stereoTypes =3D cdiProject.getStereotypes(); - for (IStereotype type: stereoTypes) { + for (IStereotype type : stereoTypes) { validateStereotype(type); } = @@ -238,7 +265,7 @@ * @param file */ private void validateResource(IFile file) { - if(reporter.isCancelled() || file=3D=3Dnull || !file.isAccessible()) { + if (reporter.isCancelled() || file =3D=3D null || !file.isAccessible()) { return; } Set beans =3D cdiProject.getBeans(file.getFullPath()); @@ -255,26 +282,26 @@ * @param bean */ private void validateBean(IBean bean) { - if(reporter.isCancelled()) { + if (reporter.isCancelled()) { return; } // Collect all relations between the bean and other CDI elements. String name =3D bean.getName(); - if(name!=3Dnull) { + if (name !=3D null) { validationContext.addVariableNameForELValidation(name); } String beanPath =3D bean.getResource().getFullPath().toOSString(); Set scopeDeclarations =3D bean.getScopeDeclarations(); for (IScopeDeclaration scopeDeclaration : scopeDeclarations) { IScope scope =3D scopeDeclaration.getScope(); - if(!scope.getSourceType().isReadOnly()) { + if (!scope.getSourceType().isReadOnly()) { validationContext.addLinkedCoreResource(beanPath, scope.getResource().= getFullPath(), false); } } Set stereotypeDeclarations =3D bean.getStereotyp= eDeclarations(); for (IStereotypeDeclaration stereotypeDeclaration : stereotypeDeclaratio= ns) { IStereotype stereotype =3D stereotypeDeclaration.getStereotype(); - if(!stereotype.getSourceType().isReadOnly()) { + if (!stereotype.getSourceType().isReadOnly()) { validationContext.addLinkedCoreResource(beanPath, stereotype.getResour= ce().getFullPath(), false); } } @@ -283,8 +310,8 @@ validateTyped(bean); validateBeanScope(bean); = - if(bean instanceof IProducer) { - validateProducer((IProducer)bean); + if (bean instanceof IProducer) { + validateProducer((IProducer) bean); } = Set points =3D bean.getInjectionPoints(); @@ -292,51 +319,53 @@ validateInjectionPoint(point); } = - if(bean instanceof IInterceptor) { - validateInterceptor((IInterceptor)bean); + if (bean instanceof IInterceptor) { + validateInterceptor((IInterceptor) bean); } = - if(bean instanceof IDecorator) { - validateDecorator((IDecorator)bean); + if (bean instanceof IDecorator) { + validateDecorator((IDecorator) bean); } = - if(bean instanceof IClassBean) { - validateClassBean((IClassBean)bean); + if (bean instanceof IClassBean) { + validateClassBean((IClassBean) bean); } } = private void validateClassBean(IClassBean bean) { validateDisposers(bean); - if(!(bean instanceof ISessionBean)) { + if (!(bean instanceof ISessionBean)) { validateManagedBean(bean); } else { - validateSessionBean((ISessionBean)bean); + validateSessionBean((ISessionBean) bean); } validateMixedClassBean(bean); } = private void validateDisposers(IClassBean bean) { Set disposers =3D bean.getDisposers(); - if(disposers.isEmpty()) { + if (disposers.isEmpty()) { return; } = Set boundDisposers =3D new HashSet(); Set producers =3D bean.getProducers(); for (IProducer producer : producers) { - if(producer instanceof IProducerMethod) { - IProducerMethod producerMethod =3D (IProducerMethod)producer; - Set disposerMethods =3D producer.getCDIProject().resolve= Disposers(producerMethod); + if (producer instanceof IProducerMethod) { + IProducerMethod producerMethod =3D (IProducerMethod) producer; + Set disposerMethods =3D producer.getCDIProject().resolveD= isposers(producerMethod); boundDisposers.addAll(disposerMethods); - if(disposerMethods.size()>1) { + if (disposerMethods.size() > 1) { /* - * 3.3.7. Disposer method resolution - * - there are multiple disposer methods for a single producer method + * 3.3.7. Disposer method resolution - there are multiple + * disposer methods for a single producer method */ for (IBeanMethod disposerMethod : disposerMethods) { - Set disposerDeclarations =3D CDIUtil.getAnnota= tionPossitions(disposerMethod, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); + Set disposerDeclarations =3D CDIUtil.getAnnota= tionPossitions(disposerMethod, + CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); for (ITextSourceReference declaration : disposerDeclarations) { - addError(CDIValidationMessages.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDI= Preferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, declaration, bean.getResource(= )); + addError(CDIValidationMessages.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDI= Preferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, declaration, bean + .getResource()); } } } @@ -347,54 +376,55 @@ List params =3D disposer.getParameters(); = /* - * 3.3.6. Declaring a disposer method - * - method has more than one parameter annotated @Disposes + * 3.3.6. Declaring a disposer method - method has more than one + * parameter annotated @Disposes */ Set disposerDeclarations =3D new HashSet(); for (IParameter param : params) { ITextSourceReference declaration =3D param.getAnnotationPosition(CDICo= nstants.DISPOSES_ANNOTATION_TYPE_NAME); - if(declaration!=3Dnull) { + if (declaration !=3D null) { disposerDeclarations.add(declaration); } } - if(disposerDeclarations.size()>1) { + if (disposerDeclarations.size() > 1) { for (ITextSourceReference declaration : disposerDeclarations) { addError(CDIValidationMessages.MULTIPLE_DISPOSING_PARAMETERS, CDIPref= erences.MULTIPLE_DISPOSING_PARAMETERS, declaration, bean.getResource()); } } = /* - * 3.3.6. Declaring a disposer method - * - a disposer method has a parameter annotated @Observes. - * = - * 10.4.2. Declaring an observer method - * - a observer method has a parameter annotated @Disposes. + * 3.3.6. Declaring a disposer method - a disposer method has a + * parameter annotated @Observes. + * = + * 10.4.2. Declaring an observer method - a observer method has a + * parameter annotated @Disposes. */ Set declarations =3D new HashSet(); boolean observesExists =3D false; declarations.addAll(disposerDeclarations); for (IParameter param : params) { ITextSourceReference declaration =3D param.getAnnotationPosition(CDICo= nstants.OBSERVERS_ANNOTATION_TYPE_NAME); - if(declaration!=3Dnull) { + if (declaration !=3D null) { declarations.add(declaration); observesExists =3D true; } } - if(observesExists) { + if (observesExists) { for (ITextSourceReference declaration : declarations) { - addError(CDIValidationMessages.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED= , CDIPreferences.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED, declaration, bean.= getResource()); + addError(CDIValidationMessages.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED= , CDIPreferences.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED, declaration, + bean.getResource()); } } = /* - * 3.3.6. Declaring a disposer method - * - a disposer method is annotated @Inject. - * = - * 3.9.1. Declaring an initializer method - * - an initializer method has a parameter annotated @Disposes + * 3.3.6. Declaring a disposer method - a disposer method is + * annotated @Inject. + * = + * 3.9.1. Declaring an initializer method - an initializer method + * has a parameter annotated @Disposes */ IAnnotationDeclaration injectDeclaration =3D disposer.getAnnotation(CDI= Constants.INJECT_ANNOTATION_TYPE_NAME); - if(injectDeclaration!=3Dnull) { + if (injectDeclaration !=3D null) { addError(CDIValidationMessages.DISPOSER_ANNOTATED_INJECT, CDIPreferenc= es.DISPOSER_ANNOTATED_INJECT, injectDeclaration, bean.getResource()); for (ITextSourceReference declaration : disposerDeclarations) { addError(CDIValidationMessages.DISPOSER_ANNOTATED_INJECT, CDIPreferen= ces.DISPOSER_ANNOTATED_INJECT, declaration, bean.getResource()); @@ -402,42 +432,48 @@ } = /* - * 3.3.6. Declaring a disposer method - * - a non-static method of a session bean class has a parameter annot= ated @Disposes, and the method is not a business method of the session bean + * 3.3.6. Declaring a disposer method - a non-static method of a + * session bean class has a parameter annotated @Disposes, and the + * method is not a business method of the session bean */ - validateSessionBeanMethod(bean, disposer, disposerDeclarations, CDIVali= dationMessages.ILLEGAL_DISPOSER_IN_SESSION_BEAN, CDIPreferences.ILLEGAL_DIS= POSER_IN_SESSION_BEAN); + validateSessionBeanMethod(bean, disposer, disposerDeclarations, CDIVali= dationMessages.ILLEGAL_DISPOSER_IN_SESSION_BEAN, + CDIPreferences.ILLEGAL_DISPOSER_IN_SESSION_BEAN); = /* - * 3.3.6. Declaring a disposer method - * - decorators may not declare disposer methods + * 3.3.6. Declaring a disposer method - decorators may not declare + * disposer methods */ - if(bean instanceof IDecorator) { - IDecorator decorator =3D (IDecorator)bean; + if (bean instanceof IDecorator) { + IDecorator decorator =3D (IDecorator) bean; IAnnotationDeclaration decoratorDeclaration =3D decorator.getDecorator= Annotation(); - addError(CDIValidationMessages.DISPOSER_IN_DECORATOR, CDIPreferences.D= ISPOSER_IN_INTERCEPTOR_OR_DECORATOR, decoratorDeclaration, bean.getResource= ()); + addError(CDIValidationMessages.DISPOSER_IN_DECORATOR, CDIPreferences.D= ISPOSER_IN_INTERCEPTOR_OR_DECORATOR, decoratorDeclaration, bean + .getResource()); for (ITextSourceReference declaration : disposerDeclarations) { addError(CDIValidationMessages.DISPOSER_IN_DECORATOR, CDIPreferences.= DISPOSER_IN_INTERCEPTOR_OR_DECORATOR, declaration, bean.getResource()); } } = /* - * 3.3.6. Declaring a disposer method - * - interceptors may not declare disposer methods + * 3.3.6. Declaring a disposer method - interceptors may not declare + * disposer methods */ - if(bean instanceof IInterceptor) { - IInterceptor interceptor =3D (IInterceptor)bean; + if (bean instanceof IInterceptor) { + IInterceptor interceptor =3D (IInterceptor) bean; IAnnotationDeclaration interceptorDeclaration =3D interceptor.getInter= ceptorAnnotation(); - addError(CDIValidationMessages.DISPOSER_IN_INTERCEPTOR, CDIPreferences= .DISPOSER_IN_INTERCEPTOR_OR_DECORATOR, interceptorDeclaration, bean.getReso= urce()); + addError(CDIValidationMessages.DISPOSER_IN_INTERCEPTOR, CDIPreferences= .DISPOSER_IN_INTERCEPTOR_OR_DECORATOR, interceptorDeclaration, bean + .getResource()); for (ITextSourceReference declaration : disposerDeclarations) { - addError(CDIValidationMessages.DISPOSER_IN_INTERCEPTOR, CDIPreference= s.DISPOSER_IN_INTERCEPTOR_OR_DECORATOR, declaration, bean.getResource()); + addError(CDIValidationMessages.DISPOSER_IN_INTERCEPTOR, CDIPreference= s.DISPOSER_IN_INTERCEPTOR_OR_DECORATOR, declaration, bean + .getResource()); } } = /* - * 3.3.7. Disposer method resolution - * - there is no producer method declared by the (same) bean class tha= t is assignable to the disposed parameter of a disposer method + * 3.3.7. Disposer method resolution - there is no producer method + * declared by the (same) bean class that is assignable to the + * disposed parameter of a disposer method */ - if(!boundDisposers.contains(disposer)) { + if (!boundDisposers.contains(disposer)) { for (ITextSourceReference declaration : disposerDeclarations) { addError(CDIValidationMessages.NO_PRODUCER_MATCHING_DISPOSER, CDIPref= erences.NO_PRODUCER_MATCHING_DISPOSER, declaration, bean.getResource()); } @@ -446,7 +482,8 @@ } = /** - * If the method is not a static method and is not a business method of t= he session bean and is observer or disposer then mark it as incorrect. + * If the method is not a static method and is not a business method of t= he + * session bean and is observer or disposer then mark it as incorrect. * = * @param bean * @param method @@ -454,109 +491,75 @@ * @param errorKey */ private void validateSessionBeanMethod(IClassBean bean, IBeanMethod metho= d, Set annotatedParams, String errorMessageKey, Strin= g preferencesKey) { - if(bean instanceof ISessionBean) { - if(annotatedParams!=3Dnull) { - try { - if(!Flags.isStatic(method.getMethod().getFlags())) { - ISessionBean sessionBean =3D (ISessionBean)bean; - Set types =3D sessionBean.getLegalTypes(); - boolean businessMethod =3D false; - for (IParametedType type : types) { - IType sourceType =3D type.getType(); - if(sourceType=3D=3Dnull) { - continue; - } - IAnnotation annotation =3D sourceType.getAnnotation(CDIConstants.LO= CAL_ANNOTATION_TYPE_NAME); - if(annotation=3D=3Dnull) { - annotation =3D sourceType.getAnnotation("Local"); //$NON-NLS-N1 - } - if(annotation!=3Dnull && CDIConstants.LOCAL_ANNOTATION_TYPE_NAME.eq= uals(EclipseJavaUtil.resolveType(sourceType, "Local"))) { //$NON-NLS-N1 - IMethod[] methods =3D sourceType.getMethods(); - for (IMethod iMethod : methods) { - if(method.getMethod().isSimilar(iMethod)) { - businessMethod =3D true; - break; - } - } - break; - } - } - if(!businessMethod) { - for (ITextSourceReference declaration : annotatedParams) { - addError(errorMessageKey, preferencesKey, declaration, bean.getRes= ource()); - } - } - } - } catch (JavaModelException e) { - CDICorePlugin.getDefault().logError(e); + if (bean instanceof ISessionBean && annotatedParams !=3D null) { + IMethod iMethod =3D CDIUtil.getBusinessMethodDeclaration((SessionBean)b= ean, method); + if(iMethod=3D=3Dnull) { + saveAllSuperTypesAsLinkedResources(bean); + for (ITextSourceReference declaration : annotatedParams) { + addError(errorMessageKey, preferencesKey, declaration, bean.getResour= ce()); } + } else { + validationContext.addLinkedCoreResource(bean.getSourcePath().toOSStrin= g(), iMethod.getResource().getFullPath(), false); } } } = - private static final String[] RESOURCE_ANNOTATIONS =3D {CDIConstants.RESO= URCE_ANNOTATION_TYPE_NAME, CDIConstants.WEB_SERVICE_REF_ANNOTATION_TYPE_NAM= E, CDIConstants.EJB_ANNOTATION_TYPE_NAME, CDIConstants.PERSISTENCE_CONTEXT_= ANNOTATION_TYPE_NAME, CDIConstants.PERSISTENCE_UNIT_ANNOTATION_TYPE_NAME}; + private static final String[] RESOURCE_ANNOTATIONS =3D { CDIConstants.RES= OURCE_ANNOTATION_TYPE_NAME, CDIConstants.WEB_SERVICE_REF_ANNOTATION_TYPE_NA= ME, CDIConstants.EJB_ANNOTATION_TYPE_NAME, CDIConstants.PERSISTENCE_CONTEXT= _ANNOTATION_TYPE_NAME, CDIConstants.PERSISTENCE_UNIT_ANNOTATION_TYPE_NAME }; = private void validateProducer(IProducer producer) { try { - Set typeDeclarations =3D producer - .getAllTypeDeclarations(); + Set typeDeclarations =3D producer.getAllTypeDeclarati= ons(); ITypeDeclaration typeDeclaration =3D null; if (!typeDeclarations.isEmpty()) { /* - * 3.3. Producer methods - * - producer method return type contains a wildcard type parameter + * 3.3. Producer methods - producer method return type contains + * a wildcard type parameter * = - * 2.2.1 Legal bean types - * - a parameterized type that contains a wildcard type parameter is = not a legal bean type. + * 2.2.1 Legal bean types - a parameterized type that contains a + * wildcard type parameter is not a legal bean type. * = - * 3.4. Producer fields - * - producer field type contains a wildcard type parameter + * 3.4. Producer fields - producer field type contains a + * wildcard type parameter */ - typeDeclaration =3D typeDeclarations.iterator() - .next(); - String[] paramTypes =3D Signature - .getTypeArguments(typeDeclaration.getSignature()); + typeDeclaration =3D typeDeclarations.iterator().next(); + String[] paramTypes =3D Signature.getTypeArguments(typeDeclaration.get= Signature()); for (String paramType : paramTypes) { if (Signature.getTypeSignatureKind(paramType) =3D=3D Signature.WILDCA= RD_TYPE_SIGNATURE) { if (producer instanceof IProducerField) { - addError( - CDIValidationMessages.PRODUCER_FIELD_TYPE_HAS_WILDCARD, - CDIPreferences.PRODUCER_FIELD_TYPE_HAS_WILDCARD, - typeDeclaration, producer.getResource()); + addError(CDIValidationMessages.PRODUCER_FIELD_TYPE_HAS_WILDCARD, CD= IPreferences.PRODUCER_FIELD_TYPE_HAS_WILDCARD, typeDeclaration, + producer.getResource()); } else { - addError( - CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, - CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, + addError(CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_HAS_WILD= CARD, CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, typeDeclaration, producer.getResource()); } } } = /** - * 3.3. Producer methods - * - producer method with a parameterized return type with a type var= iable declares any scope other than @Dependent - * = - * 3.4. Producer fields - * - producer field with a parameterized type with a type variable de= clares any scope other than @Dependent + * 3.3. Producer methods - producer method with a parameterized + * return type with a type variable declares any scope other + * than @Dependent + * = + * 3.4. Producer fields - producer field with a parameterized + * type with a type variable declares any scope other than @Dependent */ - if(paramTypes.length>0) { + if (paramTypes.length > 0) { IAnnotationDeclaration scopeOrStereotypeDeclaration =3D CDIUtil.getDi= fferentScopeDeclarationThanDepentend(producer); - if(scopeOrStereotypeDeclaration!=3Dnull) { + if (scopeOrStereotypeDeclaration !=3D null) { boolean field =3D producer instanceof IProducerField; - addError( - field?CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD:CDIVa= lidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, - field?CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD:CDIPreferenc= es.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, + addError(field ? CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_FI= ELD : CDIValidationMessages.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, + field ? CDIPreferences.ILLEGAL_SCOPE_FOR_PRODUCER_FIELD : CDIPrefe= rences.ILLEGAL_SCOPE_FOR_PRODUCER_METHOD, scopeOrStereotypeDeclaration, producer.getResource()); } } } = /* - * 3.3.2. Declaring a producer method - * - producer method is annotated @Inject + * 3.3.2. Declaring a producer method - producer method is annotated + * @Inject */ IAnnotationDeclaration inject =3D producer.getAnnotation(CDIConstants.I= NJECT_ANNOTATION_TYPE_NAME); - if(inject!=3Dnull) { + if (inject !=3D null) { addError(CDIValidationMessages.PRODUCER_ANNOTATED_INJECT, CDIPreferenc= es.PRODUCER_ANNOTATED_INJECT, inject, producer.getResource()); } = @@ -564,93 +567,89 @@ = if (producer instanceof IProducerField) { /* - * 3.5.1. Declaring a resource - * - producer field declaration specifies an EL name (together with o= ne of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRe= f) + * 3.5.1. Declaring a resource - producer field declaration + * specifies an EL name (together with one of @Resource, + * @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) */ IProducerField producerField =3D (IProducerField) producer; if (producerField.getName() !=3D null) { IAnnotationDeclaration declaration; for (String annotationType : RESOURCE_ANNOTATIONS) { - declaration =3D producerField - .getAnnotation(annotationType); + declaration =3D producerField.getAnnotation(annotationType); if (declaration !=3D null) { - IAnnotationDeclaration nameDeclaration =3D producerField - .getAnnotation(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); + IAnnotationDeclaration nameDeclaration =3D producerField.getAnnotat= ion(CDIConstants.NAMED_QUALIFIER_TYPE_NAME); if (nameDeclaration !=3D null) { declaration =3D nameDeclaration; } - addError( - CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, - CDIPreferences.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, + addError(CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME= , CDIPreferences.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, declaration, producer.getResource()); } } } /* - * 3.4. Producer fields - * - producer field type is a type variable + * 3.4. Producer fields - producer field type is a type variable */ - if(typeVariables.length>0) { + if (typeVariables.length > 0) { String typeSign =3D producerField.getField().getTypeSignature(); String typeString =3D Signature.toString(typeSign); for (String variableSig : typeVariables) { String variableName =3D Signature.getTypeVariable(variableSig); - if(typeString.equals(variableName)) { - addError( - CDIValidationMessages.PRODUCER_FIELD_TYPE_IS_VARIABLE, - CDIPreferences.PRODUCER_FIELD_TYPE_IS_VARIABLE, - typeDeclaration!=3Dnull?typeDeclaration:producer, producer.getRes= ource()); + if (typeString.equals(variableName)) { + addError(CDIValidationMessages.PRODUCER_FIELD_TYPE_IS_VARIABLE, CDI= Preferences.PRODUCER_FIELD_TYPE_IS_VARIABLE, + typeDeclaration !=3D null ? typeDeclaration : producer, producer.= getResource()); } } } } else { IProducerMethod producerMethod =3D (IProducerMethod) producer; List params =3D producerMethod.getParameters(); - Set declarations =3D new HashSet(); - declarations - .add(producerMethod - .getAnnotation(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME)); + Set observesDeclarations =3D new HashSet(); + Set disposalDeclarations =3D new HashSet(); + observesDeclarations.add(producerMethod.getAnnotation(CDIConstants.PRO= DUCES_ANNOTATION_TYPE_NAME)); + disposalDeclarations.add(producerMethod.getAnnotation(CDIConstants.PRO= DUCES_ANNOTATION_TYPE_NAME)); for (IParameter param : params) { /* - * 3.3.6. Declaring a disposer method - * - a disposer method is annotated @Produces. + * 3.3.6. Declaring a disposer method - a disposer method is + * annotated @Produces. * = - * 3.3.2. Declaring a producer method - * - a has a parameter annotated @Disposes + * 3.3.2. Declaring a producer method - a has a parameter + * annotated @Disposes */ - ITextSourceReference declaration =3D param - .getAnnotationPosition(CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); + ITextSourceReference declaration =3D param.getAnnotationPosition(CDIC= onstants.DISPOSES_ANNOTATION_TYPE_NAME); if (declaration !=3D null) { - declarations.add(declaration); + disposalDeclarations.add(declaration); } /* - * 3.3.2. Declaring a producer method - * - a has a parameter annotated @Observers + * 3.3.2. Declaring a producer method - a has a parameter + * annotated @Observers * = - * 10.4.2. Declaring an observer method - * - an observer method is annotated @Produces + * 10.4.2. Declaring an observer method - an observer method + * is annotated @Produces */ - declaration =3D param - .getAnnotationPosition(CDIConstants.OBSERVERS_ANNOTATION_TYPE_NAME); + declaration =3D param.getAnnotationPosition(CDIConstants.OBSERVERS_AN= NOTATION_TYPE_NAME); if (declaration !=3D null) { - declarations.add(declaration); + observesDeclarations.add(declaration); } } - if (declarations.size() > 1) { - for (ITextSourceReference declaration : declarations) { - addError( - CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED, - CDIPreferences.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED, + if (observesDeclarations.size() > 1) { + for (ITextSourceReference declaration : observesDeclarations) { + addError(CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATE= D_OBSERVES, CDIPreferences.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED, declaration, producer.getResource()); } } + if (disposalDeclarations.size() > 1) { + for (ITextSourceReference declaration : disposalDeclarations) { + addError(CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATE= D_DISPOSES, CDIPreferences.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED, + declaration, producer.getResource()); + } + } = /* - * 3.3. Producer methods - * - producer method return type is a type variable + * 3.3. Producer methods - producer method return type is a type + * variable * = - * 2.2.1 - Legal bean types - * - a type variable is not a legal bean type + * 2.2.1 - Legal bean types - a type variable is not a legal + * bean type */ String typeSign =3D producerMethod.getMethod().getReturnType(); String typeString =3D Signature.toString(typeSign); @@ -658,50 +657,72 @@ boolean marked =3D false; for (ITypeParameter param : paramTypes) { String variableName =3D param.getElementName(); - if(variableName.equals(typeString)) { - addError( - CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, - CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, - typeDeclaration!=3Dnull?typeDeclaration:producer, producer.getReso= urce()); + if (variableName.equals(typeString)) { + addError(CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_IS_VARIAB= LE, CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, + typeDeclaration !=3D null ? typeDeclaration : producer, producer.g= etResource()); marked =3D true; } } - if(!marked && typeVariables.length>0) { + if (!marked && typeVariables.length > 0) { for (String variableSig : typeVariables) { String variableName =3D Signature.getTypeVariable(variableSig); - if(typeString.equals(variableName)) { - addError( - CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, - CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, - typeDeclaration!=3Dnull?typeDeclaration:producer, producer.getRes= ource()); + if (typeString.equals(variableName)) { + addError(CDIValidationMessages.PRODUCER_METHOD_RETURN_TYPE_IS_VARIA= BLE, CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, + typeDeclaration !=3D null ? typeDeclaration : producer, producer.= getResource()); } } } + /* + * 3.3.2. Declaring a producer method + * - non-static method of a session bean class is annotated @Produces= , and the method is not a business method of the session bean + */ + IClassBean classBean =3D producer.getClassBean(); + if(classBean instanceof ISessionBean) { + IMethod method =3D CDIUtil.getBusinessMethodDeclaration((SessionBean)= classBean, producerMethod); + if(method=3D=3Dnull) { + addError(CDIValidationMessages.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BE= AN, CDIPreferences.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, producer.getPro= ducesAnnotation(), producer.getResource()); + saveAllSuperTypesAsLinkedResources(classBean); + } else { + validationContext.addLinkedCoreResource(classBean.getSourcePath().to= OSString(), method.getResource().getFullPath(), false); + } + } } } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); } } = + private void saveAllSuperTypesAsLinkedResources(IClassBean bean) { + Set types =3D bean.getAllTypes(); + for (IParametedType type : types) { + IType superType =3D type.getType(); + if(superType!=3Dnull && !superType.isBinary() && superType.getResource(= )!=3Dnull && superType!=3Dbean.getBeanClass()) { + validationContext.addLinkedCoreResource(bean.getSourcePath().toOSStrin= g(), superType.getResource().getFullPath(), false); + } + } + } + private void validateInjectionPoint(IInjectionPoint injection) { /* - * 3.11. The qualifier @Named at injection points - * - injection point other than injected field declares a @Named annota= tion that does not specify the value member + * 3.11. The qualifier @Named at injection points - injection point + * other than injected field declares a @Named annotation that does not + * specify the value member */ - if(!(injection instanceof IInjectionPointField)) { + if (!(injection instanceof IInjectionPointField)) { IAnnotationDeclaration named =3D injection.getAnnotation(CDIConstants.N= AMED_QUALIFIER_TYPE_NAME); - if(named!=3Dnull) { + if (named !=3D null) { try { IMemberValuePair[] values =3D named.getDeclaration().getMemberValuePa= irs(); boolean valueExists =3D false; for (IMemberValuePair pair : values) { - if("value".equals(pair.getMemberName())) { + if ("value".equals(pair.getMemberName())) { valueExists =3D true; break; } } - if(!valueExists) { - addError(CDIValidationMessages.PARAM_INJECTION_DECLARES_EMPTY_NAME, = CDIPreferences.PARAM_INJECTION_DECLARES_EMPTY_NAME, named, injection.getRes= ource()); + if (!valueExists) { + addError(CDIValidationMessages.PARAM_INJECTION_DECLARES_EMPTY_NAME, = CDIPreferences.PARAM_INJECTION_DECLARES_EMPTY_NAME, named, + injection.getResource()); } } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); @@ -711,8 +732,9 @@ } = /** - * Validates class bean which may be both a session and decorator (or int= erceptor). - * = + * Validates class bean which may be both a session and decorator (or + * interceptor). + * = * @param bean */ private void validateMixedClassBean(IClassBean bean) { @@ -720,59 +742,67 @@ ITextSourceReference decoratorDeclaration =3D bean.getAnnotation(CDICons= tants.DECORATOR_STEREOTYPE_TYPE_NAME); ITextSourceReference interceptorDeclaration =3D bean.getAnnotation(CDICo= nstants.INTERCEPTOR_ANNOTATION_TYPE_NAME); = - if(sessionDeclaration!=3Dnull) { + if (sessionDeclaration !=3D null) { /* - * 3.2. Session beans - * - bean class of a session bean is annotated @Decorator = + * 3.2. Session beans - bean class of a session bean is annotated + * @Decorator */ - if(decoratorDeclaration!=3Dnull) { - addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_DECORATOR, CDIPr= eferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, sessionDeclarati= on, bean.getResource()); - addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_DECORATOR, CDIPr= eferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, decoratorDeclara= tion, bean.getResource()); + if (decoratorDeclaration !=3D null) { + addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_DECORATOR, CDIPr= eferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, + sessionDeclaration, bean.getResource()); + addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_DECORATOR, CDIPr= eferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, + decoratorDeclaration, bean.getResource()); } /* - * 3.2. Session beans - * - bean class of a session bean is annotated @Interceptor = + * 3.2. Session beans - bean class of a session bean is annotated + * @Interceptor */ - if(interceptorDeclaration!=3Dnull) { - addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_INTERCEPTOR, CDI= Preferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, sessionDeclara= tion, bean.getResource()); - addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_INTERCEPTOR, CDI= Preferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, interceptorDec= laration, bean.getResource()); + if (interceptorDeclaration !=3D null) { + addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_INTERCEPTOR, CDI= Preferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, + sessionDeclaration, bean.getResource()); + addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_INTERCEPTOR, CDI= Preferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, + interceptorDeclaration, bean.getResource()); } } } = private void validateSessionBean(ISessionBean bean) { IAnnotationDeclaration declaration =3D CDIUtil.getDifferentScopeDeclarat= ionThanDepentend(bean); - if(declaration!=3Dnull) { + if (declaration !=3D null) { IType type =3D bean.getBeanClass(); try { /* - * 3.2. Session beans - * - session bean with a parameterized bean class declares any scope = other than @Dependent = + * 3.2. Session beans - session bean with a parameterized bean + * class declares any scope other than @Dependent */ String[] typeVariables =3D type.getTypeParameterSignatures(); - if(typeVariables.length>0) { - addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_SESSION_BEAN_WITH_GE= NERIC_TYPE, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, declaration, bea= n.getResource()); + if (typeVariables.length > 0) { + addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_SESSION_BEAN_WITH_GE= NERIC_TYPE, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, + declaration, bean.getResource()); } else { - if(bean.isStateless()) { + if (bean.isStateless()) { /* - * 3.2. Session beans - * - session bean specifies an illegal scope - * (a stateless session bean must belong to the @Dependent pseudo-= scope) = + * 3.2. Session beans - session bean specifies an + * illegal scope (a stateless session bean must belong + * to the @Dependent pseudo-scope) */ - if(declaration!=3Dnull) { - addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_STATELESS_SESSION_= BEAN, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, declaration, bean.getR= esource()); + if (declaration !=3D null) { + addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_STATELESS_SESSION_= BEAN, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, + declaration, bean.getResource()); } - } else if(bean.isSingleton()) { + } else if (bean.isSingleton()) { /* - * 3.2. Session beans - * - session bean specifies an illegal scope - * (a singleton bean must belong to either the @ApplicationScoped = scope or to the @Dependent pseudo-scope) = + * 3.2. Session beans - session bean specifies an + * illegal scope (a singleton bean must belong to either + * the @ApplicationScoped scope or to the @Dependent + * pseudo-scope) */ - if(declaration!=3Dnull) { + if (declaration !=3D null) { declaration =3D CDIUtil.getDifferentScopeDeclarationThanApplication= Scoped(bean); } - if(declaration!=3Dnull) { - addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_SINGLETON_SESSION_= BEAN, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, declaration, bean.getR= esource()); + if (declaration !=3D null) { + addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_SINGLETON_SESSION_= BEAN, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, + declaration, bean.getResource()); } } } @@ -781,93 +811,101 @@ } } /* - * 3.2.4. Specializing a session bean - * - session bean class annotated @Specializes does not directly extend= the bean class of another session bean = + * 3.2.4. Specializing a session bean - session bean class annotated + * @Specializes does not directly extend the bean class of another + * session bean */ IAnnotationDeclaration specializesDeclaration =3D bean.getSpecializesAnn= otationDeclaration(); - if(specializesDeclaration!=3Dnull) { + if (specializesDeclaration !=3D null) { + saveAllSuperTypesAsLinkedResources(bean); IBean sBean =3D bean.getSpecializedBean(); - if(sBean=3D=3Dnull) { + if (sBean =3D=3D null) { // The specializing bean extends nothing - addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIP= references.ILLEGAL_SPECIALIZING_SESSION_BEAN, specializesDeclaration, bean.= getResource()); - } else if(!CDIUtil.isSessionBean(sBean)) { - // The specializing bean directly extends a non-session bean class - addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIP= references.ILLEGAL_SPECIALIZING_SESSION_BEAN, specializesDeclaration, bean.= getResource()); + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIP= references.ILLEGAL_SPECIALIZING_SESSION_BEAN, specializesDeclaration, + bean.getResource()); + } else if (!CDIUtil.isSessionBean(sBean)) { + // The specializing bean directly extends a non-session bean + // class + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIP= references.ILLEGAL_SPECIALIZING_SESSION_BEAN, specializesDeclaration, + bean.getResource()); } } } = private void validateManagedBean(IClassBean bean) { /* - * 3.1. Managed beans - * - the bean class of a managed bean is annotated with both the @Inter= ceptor and @Decorator stereotypes = + * 3.1. Managed beans - the bean class of a managed bean is annotated wi= th both the @Interceptor and @Decorator stereotypes */ IAnnotationDeclaration decorator =3D bean.getAnnotation(CDIConstants.DEC= ORATOR_STEREOTYPE_TYPE_NAME); IAnnotationDeclaration interceptor =3D bean.getAnnotation(CDIConstants.I= NTERCEPTOR_ANNOTATION_TYPE_NAME); - if(decorator!=3Dnull && interceptor!=3Dnull) { + if (decorator !=3D null && interceptor !=3D null) { addError(CDIValidationMessages.BOTH_INTERCEPTOR_AND_DECORATOR, CDIPrefe= rences.BOTH_INTERCEPTOR_AND_DECORATOR, decorator, bean.getResource()); addError(CDIValidationMessages.BOTH_INTERCEPTOR_AND_DECORATOR, CDIPrefe= rences.BOTH_INTERCEPTOR_AND_DECORATOR, interceptor, bean.getResource()); } = IAnnotationDeclaration declaration =3D CDIUtil.getDifferentScopeDeclarat= ionThanDepentend(bean); - if(declaration!=3Dnull) { + if (declaration !=3D null) { IType type =3D bean.getBeanClass(); try { /* - * 3.1. Managed beans - * - managed bean with a public field declares any scope other than @= Dependent = + * 3.1. Managed beans - managed bean with a public field declares any = scope other than @Dependent */ IField[] fields =3D type.getFields(); for (IField field : fields) { - if(Flags.isPublic(field.getFlags()) && !Flags.isStatic(field.getFlags= ())) { - addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_P= UBLIC_FIELD, CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, declaration, be= an.getResource()); + if (Flags.isPublic(field.getFlags()) && !Flags.isStatic(field.getFlag= s())) { + addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_P= UBLIC_FIELD, CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, + declaration, bean.getResource()); break; } } /* - * 3.1. Managed beans - * - managed bean with a parameterized bean class declares any scope = other than @Dependent = + * 3.1. Managed beans - managed bean with a parameterized bean class d= eclares any scope other than @Dependent */ String[] typeVariables =3D type.getTypeParameterSignatures(); - if(typeVariables.length>0) { - addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_GE= NERIC_TYPE, CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, declaration, bea= n.getResource()); + if (typeVariables.length > 0) { + addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_MANAGED_BEAN_WITH_GE= NERIC_TYPE, CDIPreferences.ILLEGAL_SCOPE_FOR_MANAGED_BEAN, + declaration, bean.getResource()); } } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); } } /* - * 3.1.4. Specializing a managed bean - * - managed bean class annotated @Specializes does not directly extend= the bean class of another managed bean + * 3.1.4. Specializing a managed bean - managed bean class annotated @Sp= ecializes does not directly extend the bean class of another managed bean */ IAnnotationDeclaration specializesDeclaration =3D bean.getSpecializesAnn= otationDeclaration(); - if(specializesDeclaration!=3Dnull) { + if (specializesDeclaration !=3D null) { + saveAllSuperTypesAsLinkedResources(bean); try { IBean sBean =3D bean.getSpecializedBean(); - if(sBean!=3Dnull) { - if(sBean instanceof ISessionBean || sBean.getAnnotation(CDIConstants.= STATELESS_ANNOTATION_TYPE_NAME)!=3Dnull || sBean.getAnnotation(CDIConstants= .SINGLETON_ANNOTATION_TYPE_NAME)!=3Dnull) { + if (sBean !=3D null) { + if (sBean instanceof ISessionBean || sBean.getAnnotation(CDIConstants= .STATELESS_ANNOTATION_TYPE_NAME) !=3D null + || sBean.getAnnotation(CDIConstants.SINGLETON_ANNOTATION_TYPE_NAME)= !=3D null) { // The specializing bean directly extends an enterprise bean class - addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CD= IPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, specializesDeclaration, bea= n.getResource()); + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CD= IPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, + specializesDeclaration, bean.getResource()); } else { // Validate the specializing bean extends a non simple bean boolean hasDefaultConstructor =3D true; IMethod[] methods =3D sBean.getBeanClass().getMethods(); for (IMethod method : methods) { - if(method.isConstructor()) { - if(Flags.isPublic(method.getFlags()) && method.getParameterNames()= .length=3D=3D0) { + if (method.isConstructor()) { + if (Flags.isPublic(method.getFlags()) && method.getParameterNames(= ).length =3D=3D 0) { hasDefaultConstructor =3D true; break; } hasDefaultConstructor =3D false; } } - if(!hasDefaultConstructor) { - addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, C= DIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, specializesDeclaration, be= an.getResource()); + if (!hasDefaultConstructor) { + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, C= DIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, + specializesDeclaration, bean.getResource()); } } } else { // The specializing bean extends nothing - addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDI= Preferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, specializesDeclaration, bean= .getResource()); + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDI= Preferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, specializesDeclaration, + bean.getResource()); } } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); @@ -877,84 +915,103 @@ = private void validateInterceptor(IInterceptor interceptor) { /* - * 2.5.3. Beans with no EL name = - * - interceptor has a name (Non-Portable behavior) + * 2.5.3. Beans with no EL name - interceptor has a name (Non-Portable b= ehavior) */ - if(interceptor.getName()!=3Dnull) { + if (interceptor.getName() !=3D null) { ITextSourceReference declaration =3D interceptor.getAnnotation(CDIConst= ants.NAMED_QUALIFIER_TYPE_NAME); if (declaration =3D=3D null) { declaration =3D interceptor.getAnnotation(CDIConstants.INTERCEPTOR_ANN= OTATION_TYPE_NAME); } - if(declaration=3D=3Dnull) { + if (declaration =3D=3D null) { declaration =3D CDIUtil.getNamedStereotypeDeclaration(interceptor); } addError(CDIValidationMessages.INTERCEPTOR_HAS_NAME, CDIPreferences.INT= ERCEPTOR_HAS_NAME, declaration, interceptor.getResource()); } = /* - * 2.6.1. Declaring an alternative - * - interceptor is an alternative (Non-Portable behavior) + * 2.6.1. Declaring an alternative - interceptor is an alternative (Non-= Portable behavior) */ - if(interceptor.isAlternative()) { + if (interceptor.isAlternative()) { ITextSourceReference declaration =3D interceptor.getAlternativeDeclarat= ion(); - if(declaration=3D=3Dnull) { + if (declaration =3D=3D null) { declaration =3D interceptor.getInterceptorAnnotation(); } - addError(CDIValidationMessages.INTERCEPTOR_IS_ALTERNATIVE, CDIPreferenc= es.INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, declaration, interceptor.getRes= ource()); + addError(CDIValidationMessages.INTERCEPTOR_IS_ALTERNATIVE, CDIPreferenc= es.INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, declaration, interceptor + .getResource()); } + /* + * 3.3.2. Declaring a producer method + * - interceptor has a method annotated @Produces + * = + * 3.4.2. Declaring a producer field + * - interceptor has a field annotated @Produces + */ + Set producers =3D interceptor.getProducers(); + for (IProducer producer : producers) { + addError(CDIValidationMessages.PRODUCER_IN_INTERCEPTOR, CDIPreferences.= PRODUCER_IN_INTERCEPTOR_OR_DECORATOR, producer.getProducesAnnotation(), int= erceptor.getResource()); + } } = private void validateDecorator(IDecorator decorator) { /* - * 2.5.3. Beans with no EL name - * - decorator has a name (Non-Portable behavior) + * 2.5.3. Beans with no EL name - decorator has a name (Non-Portable beh= avior) */ - if(decorator.getName()!=3Dnull) { + if (decorator.getName() !=3D null) { ITextSourceReference declaration =3D decorator.getAnnotation(CDIConstan= ts.NAMED_QUALIFIER_TYPE_NAME); if (declaration =3D=3D null) { declaration =3D decorator.getAnnotation(CDIConstants.DECORATOR_STEREOT= YPE_TYPE_NAME); } - if(declaration=3D=3Dnull) { + if (declaration =3D=3D null) { declaration =3D CDIUtil.getNamedStereotypeDeclaration(decorator); } addError(CDIValidationMessages.DECORATOR_HAS_NAME, CDIPreferences.DECOR= ATOR_HAS_NAME, declaration, decorator.getResource()); } = /* - * 2.6.1. Declaring an alternative - * - decorator is an alternative (Non-Portable behavior) + * 2.6.1. Declaring an alternative - decorator is an alternative (Non-Po= rtable behavior) */ - if(decorator.isAlternative()) { + if (decorator.isAlternative()) { ITextSourceReference declaration =3D decorator.getAlternativeDeclaratio= n(); - if(declaration=3D=3Dnull) { + if (declaration =3D=3D null) { declaration =3D decorator.getDecoratorAnnotation(); } addError(CDIValidationMessages.DECORATOR_IS_ALTERNATIVE, CDIPreferences= .INTERCEPTOR_OR_DECORATOR_IS_ALTERNATIVE, declaration, decorator.getResourc= e()); } + + /* + * 3.3.2. Declaring a producer method + * - decorator has a method annotated @Produces + * = + * 3.4.2. Declaring a producer field + * - decorator has a field annotated @Produces + */ + Set producers =3D decorator.getProducers(); + for (IProducer producer : producers) { + addError(CDIValidationMessages.PRODUCER_IN_DECORATOR, CDIPreferences.PR= ODUCER_IN_INTERCEPTOR_OR_DECORATOR, producer.getProducesAnnotation(), decor= ator.getResource()); + } } = /* - * 2.2.2. Restricting the bean types of a bean - * - bean class or producer method or field specifies a @Typed anno= tation, = - * and the value member specifies a class which does not correspond to= a type = - * in the unrestricted set of bean types of a bean + * 2.2.2. Restricting the bean types of a bean - bean class or producer m= ethod or field specifies a @Typed annotation, + * and the value member specifies a class which does not correspon= d to a type in the unrestricted set of bean types of a bean */ private void validateTyped(IBean bean) { Set typedDeclarations =3D bean.getRestrictedTypeDeclar= atios(); - if(!typedDeclarations.isEmpty()) { + if (!typedDeclarations.isEmpty()) { Set allTypes =3D bean.getAllTypes(); for (ITypeDeclaration typedDeclaration : typedDeclarations) { IType typedType =3D typedDeclaration.getType(); - if(typedType!=3Dnull) { + if (typedType !=3D null) { boolean typeWasFound =3D false; for (IParametedType type : allTypes) { - if(type!=3Dnull && typedType.getFullyQualifiedName().equals(type.get= Type().getFullyQualifiedName())) { + if (type !=3D null && typedType.getFullyQualifiedName().equals(type.= getType().getFullyQualifiedName())) { typeWasFound =3D true; break; } } - if(!typeWasFound) { - addError(CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION, CD= IPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION, typedDeclaration, bean.getR= esource()); + if (!typeWasFound) { + addError(CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION, CD= IPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION, typedDeclaration, + bean.getResource()); } } } @@ -963,49 +1020,54 @@ = private void validateBeanScope(IBean bean) { Set scopes =3D bean.getScopeDeclarations(); - // 2.4.3. Declaring the bean scope - // - bean class or producer method or field specifies multiple s= cope type annotations + // 2.4.3. Declaring the bean scope + // - bean class or producer method or field specifies multiple scope t= ype annotations // - if(scopes.size()>1) { + if (scopes.size() > 1) { for (IScopeDeclaration scope : scopes) { addError(CDIValidationMessages.MULTIPLE_SCOPE_TYPE_ANNOTATIONS, CDIPre= ferences.MULTIPLE_SCOPE_TYPE_ANNOTATIONS, scope, bean.getResource()); } } = // 2.4.4. Default scope - // - bean does not explicitly declare a scope when there is no de= fault scope = - // (there are two different stereotypes declared by the bean that= declare different default scopes) + // - bean does not explicitly declare a scope when there is no default + // scope + // (there are two different stereotypes declared by the bean that + // declare different default scopes) // = - // Such bean definitions are invalid because they declares two st= ereotypes that have different default scopes and the bean does not explictl= y define a scope to resolve the conflict. + // Such bean definitions are invalid because they declares two + // stereotypes that have different default scopes and the bean does not + // explictly define a scope to resolve the conflict. Set stereotypeDeclarations =3D bean.getStereotyp= eDeclarations(); - if(!stereotypeDeclarations.isEmpty() && scopes.isEmpty()) { + if (!stereotypeDeclarations.isEmpty() && scopes.isEmpty()) { Map declarationMap =3D new HashMap(); for (IStereotypeDeclaration stereotypeDeclaration : stereotypeDeclarati= ons) { IStereotype stereotype =3D stereotypeDeclaration.getStereotype(); IScope scope =3D stereotype.getScope(); - if(scope!=3Dnull) { + if (scope !=3D null) { declarationMap.put(scope.getSourceType().getFullyQualifiedName(), ste= reotypeDeclaration); } } - if(declarationMap.size()>1) { + if (declarationMap.size() > 1) { for (IStereotypeDeclaration stereotypeDeclaration : declarationMap.val= ues()) { - addError(CDIValidationMessages.MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT= _SCOPE, CDIPreferences.MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE, stereo= typeDeclaration, bean.getResource()); + addError(CDIValidationMessages.MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT= _SCOPE, CDIPreferences.MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE, + stereotypeDeclaration, bean.getResource()); } } } = /* - * 2.4.1. Built-in scope types - * - interceptor or decorator has any scope other than @Dependent = (Non-Portable behavior) + * 2.4.1. Built-in scope types - interceptor or decorator has any scope + * other than @Dependent (Non-Portable behavior) */ boolean interceptor =3D bean instanceof IInterceptor; boolean decorator =3D bean instanceof IDecorator; - if(interceptor || decorator) { + if (interceptor || decorator) { IAnnotationDeclaration scopeOrStereotypeDeclaration =3D CDIUtil.getDiff= erentScopeDeclarationThanDepentend(bean); - if(scopeOrStereotypeDeclaration!=3Dnull) { + if (scopeOrStereotypeDeclaration !=3D null) { String key =3D CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR; String message =3D CDIValidationMessages.ILLEGAL_SCOPE_FOR_DECORATOR; - if(interceptor) { + if (interceptor) { key =3D CDIPreferences.ILLEGAL_SCOPE_FOR_INTERCEPTOR; message =3D CDIValidationMessages.ILLEGAL_SCOPE_FOR_INTERCEPTOR; } @@ -1021,59 +1083,61 @@ */ private void validateStereotype(IStereotype stereotype) { // 2.7.1.3. Declaring a @Named stereotype - // - stereotype declares a non-empty @Named annotation (Non-Por= table behavior) - // - stereotype declares any other qualifier annotation - // - stereotype is annotated @Typed + // - stereotype declares a non-empty @Named annotation (Non-Portable + // behavior) + // - stereotype declares any other qualifier annotation + // - stereotype is annotated @Typed = - if(stereotype =3D=3D null) { + if (stereotype =3D=3D null) { return; } IResource resource =3D stereotype.getResource(); - if(resource =3D=3D null || !resource.getName().toLowerCase().endsWith(".= java")) { - //validate sources only + if (resource =3D=3D null || !resource.getName().toLowerCase().endsWith("= .java")) { + // validate sources only return; } List as =3D stereotype.getAnnotationDeclarations= (); = // 1. non-empty name IAnnotationDeclaration nameDeclaration =3D stereotype.getNameDeclaration= (); - if(nameDeclaration !=3D null) { + if (nameDeclaration !=3D null) { IMemberValuePair[] ps =3D null; try { ps =3D nameDeclaration.getDeclaration().getMemberValuePairs(); } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); } - if(ps !=3D null && ps.length > 0) { + if (ps !=3D null && ps.length > 0) { Object name =3D ps[0].getValue(); - if(name !=3D null && name.toString().length() > 0) { + if (name !=3D null && name.toString().length() > 0) { ITextSourceReference location =3D nameDeclaration; addError(CDIValidationMessages.STEREOTYPE_DECLARES_NON_EMPTY_NAME, CD= IPreferences.STEREOTYPE_DECLARES_NON_EMPTY_NAME, location, resource); } } } = - // 2. typed annotation = + // 2. typed annotation IAnnotationDeclaration typedDeclaration =3D stereotype.getAnnotationDecl= aration(CDIConstants.TYPED_ANNOTATION_TYPE_NAME); - if(typedDeclaration !=3D null) { + if (typedDeclaration !=3D null) { ITextSourceReference location =3D typedDeclaration; addError(CDIValidationMessages.STEREOTYPE_IS_ANNOTATED_TYPED, CDIPrefer= ences.STEREOTYPE_IS_ANNOTATED_TYPED, location, resource); } = // 3. Qualifier other than @Named - for (IAnnotationDeclaration a: as) { - if(a instanceof IQualifierDeclaration && a !=3D nameDeclaration) { + for (IAnnotationDeclaration a : as) { + if (a instanceof IQualifierDeclaration && a !=3D nameDeclaration) { ITextSourceReference location =3D a; addError(CDIValidationMessages.ILLEGAL_QUALIFIER_IN_STEREOTYPE, CDIPre= ferences.ILLEGAL_QUALIFIER_IN_STEREOTYPE, location, resource); } } = // 2.7.1.1. Declaring the default scope for a stereotype - // - stereotype declares more than one scope + // - stereotype declares more than one scope Set scopeDeclarations =3D stereotype.getScopeDeclarat= ions(); - if(scopeDeclarations.size()>1) { + if (scopeDeclarations.size() > 1) { for (IScopeDeclaration scope : scopeDeclarations) { - addError(CDIValidationMessages.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE= , CDIPreferences.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE, scope, stereotype= .getResource()); + addError(CDIValidationMessages.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE= , CDIPreferences.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE, scope, + stereotype.getResource()); } } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDIValidationMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-19 16:39:54 UTC (re= v 22203) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-19 19:41:00 UTC (re= v 22204) @@ -53,7 +53,8 @@ public static String ILLEGAL_SCOPE_FOR_DECORATOR; = public static String PRODUCER_ANNOTATED_INJECT; - public static String PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED; + public static String PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED_DISPOSES; + public static String PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED_OBSERVES; public static String OBSERVER_ANNOTATED_INJECT; public static String OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED; public static String ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-19 16:39:54 UTC (rev 22203) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-19 19:41:00 UTC (rev 22204) @@ -57,9 +57,6 @@ any scope other than @Dependent - producer method return type is a type variable = - - - 3.3.2. Declaring a producer method - producer method is annotated @Inject - producer method has a parameter annotated @Disposes Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-19 16:39:54 UTC (rev 22203) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-19 19:41:00 UTC (rev 22204) @@ -32,7 +32,8 @@ ILLEGAL_SCOPE_FOR_DECORATOR=3DDecorator has any scope other than @Dependent = PRODUCER_ANNOTATED_INJECT=3DProducer method or field is annotated @Inject -PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED=3DProducer method has a parameter a= nnotated @Disposes or @Observes +PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED_DISPOSES=3DProducer method has a pa= rameter annotated @Disposes +PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED_OBSERVES=3DProducer method has a pa= rameter annotated @Observes OBSERVER_ANNOTATED_INJECT=3DObserver method is annotated @Inject OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED=3DObserver method has a parameter a= nnotated @Disposes ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN=3DNon-static method of a session b= ean class is annotated @Produces, and the method is not a business method o= f the session bean @@ -52,8 +53,8 @@ BOTH_INTERCEPTOR_AND_DECORATOR=3DThe bean class of a managed bean is annot= ated with both the @Interceptor and @Decorator stereotypes SESSION_BEAN_ANNOTATED_INTERCEPTOR=3DBean class of a session bean is annot= ated @Interceptor SESSION_BEAN_ANNOTATED_DECORATOR=3DBean class of a session bean is annotat= ed @Decorator -PRODUCER_IN_INTERCEPTOR=3DInterceptor has a member annotated @Produces -PRODUCER_IN_DECORATOR=3DDecorator has a member annotated @Produces +PRODUCER_IN_INTERCEPTOR=3DProducer cannot be declared in an interceptor +PRODUCER_IN_DECORATOR=3DProducer cannot be declared in a decorator DISPOSER_IN_INTERCEPTOR=3DInterceptor has a method annotated @Disposes DISPOSER_IN_DECORATOR=3DDecorator has a method annotated @Disposes MULTIPLE_DELEGATE=3DDecorator has more than one delegate injection point Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-19 16:39:54 UTC (rev 22203) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-19 19:41:00 UTC (rev 22204) @@ -80,7 +80,7 @@ {CDIPreferences.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferencesM= essages.CDIValidatorConfigurationBlock_pb_producerParameterIllegallyAnnotat= ed_label}, // {CDIPreferences.OBSERVER_ANNOTATED_INJECT, CDIPreferencesMessages.CDI= ValidatorConfigurationBlock_pb_observerAnnotatedInject_label}, {CDIPreferences.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferencesM= essages.CDIValidatorConfigurationBlock_pb_observerParameterIllegallyAnnotat= ed_label}, -// {CDIPreferences.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, CDIPreferenc= esMessages.CDIValidatorConfigurationBlock_pb_illegalProducerMethodInSession= Bean_label}, + {CDIPreferences.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, CDIPreferences= Messages.CDIValidatorConfigurationBlock_pb_illegalProducerMethodInSessionBe= an_label}, {CDIPreferences.MULTIPLE_DISPOSING_PARAMETERS, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_multipleDisposingParameters_label}, {CDIPreferences.DISPOSER_ANNOTATED_INJECT, CDIPreferencesMessages.CDIVa= lidatorConfigurationBlock_pb_disposerAnnotatedInject_label}, {CDIPreferences.ILLEGAL_DISPOSER_IN_SESSION_BEAN, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalDisposerInSessionBean_label}, @@ -102,7 +102,7 @@ new String[][]{ {CDIPreferences.BOTH_INTERCEPTOR_AND_DECORATOR, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_bothInterceptorAndDecorator_label}, {CDIPreferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, CDIPr= eferencesMessages.CDIValidatorConfigurationBlock_pb_sessionBeanAnnotatedInt= erceptorOrDecorator_label}, -// {CDIPreferences.PRODUCER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferences= Messages.CDIValidatorConfigurationBlock_pb_producerInInterceptorOrDecorator= _label}, + {CDIPreferences.PRODUCER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferencesMe= ssages.CDIValidatorConfigurationBlock_pb_producerInInterceptorOrDecorator_l= abel}, {CDIPreferences.DISPOSER_IN_INTERCEPTOR_OR_DECORATOR, CDIPreferencesMe= ssages.CDIValidatorConfigurationBlock_pb_disposerInInterceptorOrDecorator_l= abel}, // {CDIPreferences.MULTIPLE_DELEGATE, CDIPreferencesMessages.CDIValidat= orConfigurationBlock_pb_multipleDelegate_label}, // {CDIPreferences.MISSING_DELEGATE, CDIPreferencesMessages.CDIValidato= rConfigurationBlock_pb_missingDelegate_label}, Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/producers/DecoratorHasProducerFieldBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/DecoratorHasProducerFieldBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/DecoratorHasProducerFieldBroken.java 2010-05-19 19:41:0= 0 UTC (rev 22204) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.producers; + +import javax.decorator.Decorator; +import javax.enterprise.inject.Produces; + +(a)Decorator +public class DecoratorHasProducerFieldBroken { + + @Produces public FunnelWeaver getAnotherFunnelWeaver; +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/producers/DecoratorHasProducerFieldBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/producers/DecoratorHasProducerMethodBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/DecoratorHasProducerMethodBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/DecoratorHasProducerMethodBroken.java 2010-05-19 19:41:= 00 UTC (rev 22204) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.producers; + +import javax.decorator.Decorator; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.InjectionPoint; + +(a)Decorator +public class DecoratorHasProducerMethodBroken { + + @Produces + public FunnelWeaver create2(InjectionPoint point) { + return null; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/producers/DecoratorHasProducerMethodBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/producers/InterceptorHasProducerFieldBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/InterceptorHasProducerFieldBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/InterceptorHasProducerFieldBroken.java 2010-05-19 19:41= :00 UTC (rev 22204) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.producers; + +import javax.enterprise.inject.Produces; +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; + +(a)Interceptor +public class InterceptorHasProducerFieldBroken { + + @AroundInvoke + public Object alwaysReturnThis(InvocationContext ctx) throws Exception { + return ctx.proceed(); + } + + @Produces public FunnelWeaver anotherFunnelWeaver; +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/producers/InterceptorHasProducerFieldBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/producers/InterceptorHasProducerMethodBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/InterceptorHasProducerMethodBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/InterceptorHasProducerMethodBroken.java 2010-05-19 19:4= 1:00 UTC (rev 22204) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.producers; + +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.InjectionPoint; +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; + +(a)Interceptor +public class InterceptorHasProducerMethodBroken { + + @AroundInvoke + public Object alwaysReturnThis(InvocationContext ctx) throws Exception { + return ctx.proceed(); + } + + @Produces + public FunnelWeaver create2(InjectionPoint point) { + return null; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/producers/InterceptorHasProducerMethodBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-19 16:39:54 UTC (rev 22203) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-19 19:41:00 UTC (rev 22204) @@ -479,7 +479,7 @@ */ public void testProducerMethodWithParameterAnnotatedDisposes() throws Exc= eption { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/parameterAnnotatedDisposes/SpiderPro= ducer_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_A= NNOTATED, 25, 26); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_A= NNOTATED_DISPOSES, 25, 26); } = /** @@ -490,10 +490,43 @@ */ public void testProducerMethodWithParameterAnnotatedObserves() throws Exc= eption { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/parameterAnnotatedObserves/SpiderPro= ducer_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_A= NNOTATED, 25, 26); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_A= NNOTATED_OBSERVES, 25, 26); } = /** + * 3.3.2. Declaring a producer method + * - non-static method of a session bean class is annotated @Produces, a= nd the method is not a business method of the session bean + * = + * @throws Exception + */ + public void testProducerMethodOnSessionBeanMustBeBusinessMethod() throws = Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/producer/method/broken/enterprise/nonbusiness/FooProducer.j= ava"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_PRODUCER_METHOD_IN_SES= SION_BEAN, 25); + } + + /** + * 3.3.2. Declaring a producer method + * - decorator has a method annotated @Produces + * = + * @throws Exception + */ + public void testDecoratorMustNotHaveProducerMethod() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/DecoratorHasProducerMethodBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_IN_DECORATOR, 10); + } + + /** + * 3.3.2. Declaring a producer method + * - interceptor has a method annotated @Produces + * = + * @throws Exception + */ + public void testInterceptorMustNotHaveProducerMethod() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/InterceptorHasProducerMethodBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_IN_INTERCEPTOR, 17); + } + + /** * 3.5.1. Declaring a resource * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) * = @@ -534,7 +567,7 @@ */ public void testProducesUnallowed() throws Exception { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/disposal/method/definition/broken/producesUnallowed/SpiderP= roducer_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_A= NNOTATED, 30, 31); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_A= NNOTATED_DISPOSES, 30, 31); } = /** @@ -655,6 +688,28 @@ } = /** + * 3.4.2. Declaring a producer field + * - decorator has a field annotated @Produces + * = + * @throws Exception + */ + public void testDecoratorMustNotHaveProducerField() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/DecoratorHasProducerFieldBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_IN_DECORATOR, 9); + } + + /** + * 3.4.2. Declaring a producer field + * - interceptor has a field annotated @Produces + * = + * @throws Exception + */ + public void testInterceptorMustNotHaveProducerField() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/InterceptorHasProducerFieldBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_IN_INTERCEPTOR, 16); + } + + /** * 3.9.1. Declaring an initializer method * - an initializer method has a parameter annotated @Disposes * = @@ -674,7 +729,7 @@ */ public void testObserverMethodAnnotatedProducesFails() throws Exception { IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /event/broken/observer/isProducer/BorderTerrier_Broken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_A= NNOTATED, 25, 25); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_PARAMETER_ILLEGALLY_A= NNOTATED_OBSERVES, 25, 25); } = /** --===============8333840660457165526==-- From jbosstools-commits at lists.jboss.org Wed May 19 21:59:32 2010 Content-Type: multipart/mixed; boundary="===============6276618102581897985==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22205 - trunk/documentation/guides/JBDS_Release_Notes/en-US. Date: Wed, 19 May 2010 21:59:32 -0400 Message-ID: <201005200159.o4K1xWdt003835@svn01.web.mwc.hst.phx2.redhat.com> --===============6276618102581897985== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: irooskov(a)redhat.com Date: 2010-05-19 21:59:31 -0400 (Wed, 19 May 2010) New Revision: 22205 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml Log: updated release notes with new fixed issues Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-19 19:41:00 UTC (rev 22204) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-20 01:59:31 UTC (rev 22205) @@ -189,6 +189,11 @@ + JBDS-1181= : When creating a New Process Project the Configure JBoss jBPM Runtime screen included a link to Download the JBoss jBPM package if you have none available yet. that would direct users to a location that did not exist. For the pr= evious release a redirect was created after this issue was found that direc= ted a user to the sourceforge location of the files. This version of the JB= oss Developer Studio sees the removal of the link. + + + + JBDS-1168= : The JBoss Developer Studio Installer was missleading in terms of = system requirements. The consequence of this was that some users were unsur= e if the JBoss Developer Studio supported Java 6 even though it was require= d for the JBoss Enterprise Application Platform 5 and which JDK distributio= ns were supported. The text in Step 4 of installation has been updated to i= nform the user that the JBoss Developer Studio works with both Java 5 and 6= (though Java 6 is required for JBoss Enterprise Application Platform 5), h= as been tested with the OpenJDK, SunJDK and IBM JDK distributions and the m= isspelt gij Java has been corrected to gcj J= ava. --===============6276618102581897985==-- From jbosstools-commits at lists.jboss.org Thu May 20 07:40:16 2010 Content-Type: multipart/mixed; boundary="===============2892251411223263261==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22206 - in trunk: birt/docs/en-US and 15 other directories. Date: Thu, 20 May 2010 07:40:16 -0400 Message-ID: <201005201140.o4KBeGIo002726@svn01.web.mwc.hst.phx2.redhat.com> --===============2892251411223263261== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-20 07:40:13 -0400 (Thu, 20 May 2010) New Revision: 22206 Modified: trunk/as/docs/reference/en-US/master.xml trunk/birt/docs/en-US/master.xml trunk/documentation/guides/Beginners_Guide/en-US/master.xml trunk/documentation/guides/Exadel-migration/en-US/master.xml trunk/documentation/guides/GettingStartedGuide/en-US/master.xml trunk/esb/docs/esb_ref_guide/en-US/master.xml trunk/hibernatetools/docs/reference/en-US/master.xml trunk/jmx/docs/reference/en-US/master.xml trunk/jsf/docs/jsf_tools_ref_guide/en-US/master.xml trunk/jsf/docs/jsf_tools_tutorial/en-US/master.xml trunk/jsf/docs/userguide/en-US/master.xml trunk/portlet/docs/reference/en-US/master.xml trunk/seam/docs/reference/en-US/master.xml trunk/smooks/docs/reference/en-US/master.xml trunk/struts/docs/struts_tools_ref_guide/en-US/master.xml trunk/struts/docs/struts_tools_tutorial/en-US/master.xml trunk/ws/docs/reference/en-US/master.xml Log:

https://jira.jboss.org/browse/TOOLSDOC-81 -Changed JBDS and JBT versions= in master.xml files.

Modified: trunk/as/docs/reference/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/docs/reference/en-US/master.xml 2010-05-20 01:59:31 UTC (rev 2= 2205) +++ trunk/as/docs/reference/en-US/master.xml 2010-05-20 11:40:13 UTC (rev 2= 2206) @@ -52,7 +52,7 @@ JBoss by Red Hat - Version: 2.1.0.GA + Version: 2.1.1.GA Modified: trunk/birt/docs/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/birt/docs/en-US/master.xml 2010-05-20 01:59:31 UTC (rev 22205) +++ trunk/birt/docs/en-US/master.xml 2010-05-20 11:40:13 UTC (rev 22206) @@ -60,7 +60,7 @@ = = <releaseinfo> - Version: 1.1.0.GA + Version: 1.1.1.GA </releaseinfo> = = Modified: trunk/documentation/guides/Beginners_Guide/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/Beginners_Guide/en-US/master.xml 2010-05-20 = 01:59:31 UTC (rev 22205) +++ trunk/documentation/guides/Beginners_Guide/en-US/master.xml 2010-05-20 = 11:40:13 UTC (rev 22206) @@ -53,7 +53,7 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> - Version: 1.0 + Version: 3.0.1.GA </releaseinfo> <!--<abstract> <title/> Modified: trunk/documentation/guides/Exadel-migration/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/Exadel-migration/en-US/master.xml 2010-05-20= 01:59:31 UTC (rev 22205) +++ trunk/documentation/guides/Exadel-migration/en-US/master.xml 2010-05-20= 11:40:13 UTC (rev 22206) @@ -35,7 +35,7 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> -Version: 3.0.0.GA +Version: 3.0.1.GA </releaseinfo> = <abstract> Modified: trunk/documentation/guides/GettingStartedGuide/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/GettingStartedGuide/en-US/master.xml 2010-05= -20 01:59:31 UTC (rev 22205) +++ trunk/documentation/guides/GettingStartedGuide/en-US/master.xml 2010-05= -20 11:40:13 UTC (rev 22206) @@ -45,7 +45,7 @@ <year>2010</year> <holder>JBoss by Red Hat</holder> </copyright> - <releaseinfo>Version: 3.0.0.GA</releaseinfo> + <releaseinfo>Version: 3.0.1.GA</releaseinfo> <abstract> <title/> <para> Modified: trunk/esb/docs/esb_ref_guide/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/docs/esb_ref_guide/en-US/master.xml 2010-05-20 01:59:31 UTC (= rev 22205) +++ trunk/esb/docs/esb_ref_guide/en-US/master.xml 2010-05-20 11:40:13 UTC (= rev 22206) @@ -45,7 +45,7 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> - Version: 1.3.0.GA + Version: 1.3.1.GA </releaseinfo> = <abstract> Modified: trunk/hibernatetools/docs/reference/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/docs/reference/en-US/master.xml 2010-05-20 01:59:3= 1 UTC (rev 22205) +++ trunk/hibernatetools/docs/reference/en-US/master.xml 2010-05-20 11:40:1= 3 UTC (rev 22206) @@ -50,7 +50,7 @@ </copyright> = <releaseinfo> - Version: 3.3.0.GA + Version: 3.3.1.GA </releaseinfo> = = Modified: trunk/jmx/docs/reference/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/docs/reference/en-US/master.xml 2010-05-20 01:59:31 UTC (rev = 22205) +++ trunk/jmx/docs/reference/en-US/master.xml 2010-05-20 11:40:13 UTC (rev = 22206) @@ -50,7 +50,7 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> - Version: 1.1.0.GA + Version: 1.1.1.GA </releaseinfo> <abstract> <title/> Modified: trunk/jsf/docs/jsf_tools_ref_guide/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/docs/jsf_tools_ref_guide/en-US/master.xml 2010-05-20 01:59:31= UTC (rev 22205) +++ trunk/jsf/docs/jsf_tools_ref_guide/en-US/master.xml 2010-05-20 11:40:13= UTC (rev 22206) @@ -52,7 +52,7 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> - Version: 3.1.0.GA + Version: 3.1.1.GA </releaseinfo> = <abstract> Modified: trunk/jsf/docs/jsf_tools_tutorial/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/docs/jsf_tools_tutorial/en-US/master.xml 2010-05-20 01:59:31 = UTC (rev 22205) +++ trunk/jsf/docs/jsf_tools_tutorial/en-US/master.xml 2010-05-20 11:40:13 = UTC (rev 22206) @@ -52,7 +52,7 @@ </copyright> = <releaseinfo> - Version: 3.1.0.GA + Version: 3.1.1.GA </releaseinfo> = = Modified: trunk/jsf/docs/userguide/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/docs/userguide/en-US/master.xml 2010-05-20 01:59:31 UTC (rev = 22205) +++ trunk/jsf/docs/userguide/en-US/master.xml 2010-05-20 11:40:13 UTC (rev = 22206) @@ -41,7 +41,7 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> - Version: 3.0.0.GA + Version: 3.0.1.GA </releaseinfo> <abstract> <title/> Modified: trunk/portlet/docs/reference/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/docs/reference/en-US/master.xml 2010-05-20 01:59:31 UTC (= rev 22205) +++ trunk/portlet/docs/reference/en-US/master.xml 2010-05-20 11:40:13 UTC (= rev 22206) @@ -50,7 +50,7 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> - Version: 1.1.0.GA + Version: 1.1.1.GA </releaseinfo> = <abstract> Modified: trunk/seam/docs/reference/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/docs/reference/en-US/master.xml 2010-05-20 01:59:31 UTC (rev= 22205) +++ trunk/seam/docs/reference/en-US/master.xml 2010-05-20 11:40:13 UTC (rev= 22206) @@ -63,7 +63,7 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> - Version: 3.1.0.GA + Version: 3.1.1.GA </releaseinfo> = <abstract> Modified: trunk/smooks/docs/reference/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/smooks/docs/reference/en-US/master.xml 2010-05-20 01:59:31 UTC (r= ev 22205) +++ trunk/smooks/docs/reference/en-US/master.xml 2010-05-20 11:40:13 UTC (r= ev 22206) @@ -32,7 +32,7 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> - Version: 1.1.0.GA + Version: 1.1.1.GA </releaseinfo> = <abstract> Modified: trunk/struts/docs/struts_tools_ref_guide/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/docs/struts_tools_ref_guide/en-US/master.xml 2010-05-20 01= :59:31 UTC (rev 22205) +++ trunk/struts/docs/struts_tools_ref_guide/en-US/master.xml 2010-05-20 11= :40:13 UTC (rev 22206) @@ -53,7 +53,7 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> - Version: 3.1.0.GA + Version: 3.1.1.GA </releaseinfo> = <abstract> Modified: trunk/struts/docs/struts_tools_tutorial/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/struts/docs/struts_tools_tutorial/en-US/master.xml 2010-05-20 01:= 59:31 UTC (rev 22205) +++ trunk/struts/docs/struts_tools_tutorial/en-US/master.xml 2010-05-20 11:= 40:13 UTC (rev 22206) @@ -50,7 +50,7 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> - Version: 3.1.0.GA + Version: 3.1.1.GA </releaseinfo> = <abstract> Modified: trunk/ws/docs/reference/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/docs/reference/en-US/master.xml 2010-05-20 01:59:31 UTC (rev 2= 2205) +++ trunk/ws/docs/reference/en-US/master.xml 2010-05-20 11:40:13 UTC (rev 2= 2206) @@ -34,7 +34,7 @@ <holder>JBoss by Red Hat</holder> </copyright> <releaseinfo> - Version: 1.1.0.GA + Version: 1.1.1.GA </releaseinfo> <abstract> <title/> --===============2892251411223263261==-- From jbosstools-commits at lists.jboss.org Thu May 20 09:38:03 2010 Content-Type: multipart/mixed; boundary="===============5302478025609936747==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22207 - in trunk/seam/docs/reference/en-US: images/create_new_seam and 1 other directory. Date: Thu, 20 May 2010 09:38:03 -0400 Message-ID: <201005201338.o4KDc3Ow028815@svn01.web.mwc.hst.phx2.redhat.com> --===============5302478025609936747== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-20 09:38:02 -0400 (Thu, 20 May 2010) New Revision: 22207 Modified: trunk/seam/docs/reference/en-US/creating_new_seam.xml trunk/seam/docs/reference/en-US/images/create_new_seam/create_seam_1.png trunk/seam/docs/reference/en-US/images/create_new_seam/create_seam_11.png trunk/seam/docs/reference/en-US/images/create_new_seam/create_seam_12.png trunk/seam/docs/reference/en-US/images/create_new_seam/create_seam_13.png trunk/seam/docs/reference/en-US/images/create_new_seam/create_seam_20.png trunk/seam/docs/reference/en-US/images/create_new_seam/create_seam_21.png Log: TOOLSDOC-70-Option to specify the project(s) name in the "Seam Web project" wizard. Obsolete pictures were updated and option to specify projects name is added. Modified: trunk/seam/docs/reference/en-US/creating_new_seam.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/docs/reference/en-US/creating_new_seam.xml 2010-05-20 11:40:= 13 UTC (rev 22206) +++ trunk/seam/docs/reference/en-US/creating_new_seam.xml 2010-05-20 13:38:= 02 UTC (rev 22207) @@ -1,464 +1,478 @@ -<?xml version=3D"1.0" encoding=3D"UTF-8"?> -<chapter id=3D"create_seam" xreflabel=3D"create_seam" role=3D"updated"> - <?dbhtml filename=3D"create_new_seam.html"?> - <chapterinfo> - <keywordset> - <keyword>JBoss Tools</keyword> - <keyword>Seam</keyword> - <keyword>JBDS</keyword> - </keywordset> - </chapterinfo> - <title>Creating a New Seam Project via the New Seam Project wizard</ti= tle> - <para>In this chapter we provide you with the necessary steps to start= working with Seam - Framework.</para> - <para>At first, we suggest to set the specific Seam perspective that c= ombines a number of - different views and editors needed for work with resources concern= ed. For that select - <emphasis> - <property>Window > Open Perspective > Other > Seam</property> - </emphasis> or you can also access it through the button in the ri= ght top corner.</para> - <figure> - <title>Seam Perspective Icon - - - - - - - Also the - Open Web Browser action is dir= ectly available in the - Seam perspective. -
- Embedded Web Browser Button - - - - - -
-
- Create standalone Seam Web Project - The best way to get started with Seam is to create a simple = Seam Project and - experiment with it. - Thus, you should select - File > New > Seam Web Project - to run the New Seam Project w= izard. The wizard form - allows you to create runtime and server instances in order to = get started creating, - running, and debugging J2EE (only) applications. - Seam Web Project wizard has an option for selecting the actu= al Server (not just WTP - runtime) that will be used for the project. This allows the wi= zard to identify correctly - where the required datasource and driver libraries need to go.= - Let's get through the wizard step-by-step. First, you s= hould enter a name and a - location directory for your new project. -
- New Seam Project Wizard - - - - - -
- On the figure above you can see the runtime and the server a= lready created. - If you need to create a new runtime, click on the - New... - button in the Target Runtime = section. It brings up the - wizard where you can specify a new JBoss Server Runtime enviro= nment or the other type of - runtime appropriate for your project configuration. Let's crea= te one more JBoss 4.2 - Runtime. Hence, after choosing it click on - Next - button. -
- Specifying Target Runtime - - - - - -
- All what you need here is to name runtime, type the path to = its install directory or - locate it by using - Browse - button, select a Java Runtime Environment, and sel= ect which configuration - you want. -
- Specifying Target Runtime Configurations - - - - - -
- Clicking on - Finish - returns you to the New Seam Project - wizard page. - The next step is to define a Server by clicking on - New... - button in the Target Server s= ection. In appeared - New Server dialog the last server whi= ch matches the runtime - will be selected. - All declared runtimes are listed in the combo-box under the = servers view. Here, you - can indicate a server runtime that you need. Click - Add - if you want to add a new Server Runtime. -
- Specifying Target Server - - - - - -
- Next page allows you to verify the information for a chosen = server. Leave everything - as it is and click on - Next - . -
- JBoss Runtime Summary - - - - - -
- On the last wizard step you can modify your projects to conf= igure them on the - Server. -
- Project Modification for Configuring on the Server</tit= le> - <mediaobject> - <imageobject> - <imagedata fileref=3D"images/create_new_seam/create_se= am_6.png"/> - </imageobject> - </mediaobject> - </figure> - <para>Once you have the Target Server defined click on <emphasis> - <property>Finish</property> - </emphasis> button to return to the first page of the <propert= y>New Seam Project - wizard</property>.</para> - <tip> - <title>Tip: - We suggest that you look through the Application Server = Manager Guide to - find out more about runtimes and servers. - -
- Completion of Runtime and Server Configuration - - - - - -
- The last section on this wizard step is Configurat= ion. Here, you - can select one of the pre-defined project configurations eithe= r associated with Seam - 1.2, Seam 2.0 or with Seam 2.1. Furthermore, you can create yo= ur own configuration by - pressing the - Modify... - button. It will open the dialog which allows to co= nfigure your own set of - facets for adding extra functionality to your project. - Pass to the next section to find out more details on this di= alog. -
-
- Selecting the Project Facets - The Project Facets wizard allows you to= enable or disable - specific facets which define necessary features for the projec= t. When you switch to this - wizard form, all critical facets are already checked for the c= hosen - Configuration. - Notice that this page of the wizard also allows you to set t= he necessary version for - any facet. -
- Project Facets Selection - - - - - -
- Moreover, here you can specify your own preset of selected f= acets by checking needed - ones in project facets window and clicking on - Save - button. -
- Specifying Custom Facet Preset - - - - - -
- To see all available Server runtimes click on Runt= imes tab on the - left. You can create a new one using the - New - button. If more than one runtime is checked here, = the - Make Primary - button won't be dimmed yet. Thus, you can mak= e use of it to mark - primary runtime. -
- Setting Runtime - - - - - -
- - Ok - button will bring you to the Web Module<= /property> wizard form - again. -
- Seam project with JPA facets - For creating Seam project with JPA support you need to s= elect Java - Persistent facet on Project Facet= s page and - click OK. - Then you should press Next and may = leave the default value on - Java application building page an= d Web Module - Settings page. - After that you will see JPA facet = page. -
- JPA Facet page - - - - - -
- On this page you can choose Platform (vendor-specific JPA - implementation) for your project, type of JPA Implementati= on, and configure the - Connection to database in the Connection area. - More about JPA facet page you can r= ead in Eclipse documentation. - On the next step you will see JSF Capabilities= and Seam - facet pages, which are mostly the same as i= n general Seam - project. -
-
-
- Java application building configuration - With this wizard you can define Java source directories whic= h will be generated on - build path. Also you can specify a default output folder. If y= ou are agree with default - values, press Next -
- Java application building Wizard - - - - - -
-
-
- How to Configure Web Module Settings - As we deal with a Dynamic Web Application, we should at fir= st specify the top level - directory of our application for deploying it to a server afte= rwards. You know, this - kind of application contains Web resources. Thus, it's importa= nt to indicate the content - directory. The wizard will put all those values itself, so you= can leave everything as - is. -
- Web Module Settings - - - - - -
- Choose - Next - to switch to the next wizard form. -
-
- Adding JSF Capabilities - This wizard helps you to add JSF capabilities to your projec= t. - Choose - Library provided by Target Runtime - from Library Type list if you'd like to use a defa= ult JSF implementation - given by the present runtime. -
- Adding JSF Capabilities to Web Project - - - - - -
- In case if you prefer to use your custom JSF implementation,= choose User - Library Item from Library Type list. In User Li= brary list you can check - required library. -
- Using Custom JSF implementation Library - - - - - -
- If a new library is required, click Manage librar= ies... ( - - - - - ) button. Then you should click = New. -
- Using Custom JSF implementation Library - - - - - -
- Here, it's necessary to type a Library Name. -
- Entering New User Library Name - - - - - -
- To add proper Library JARs, click Add - JARs... button and select the JARs on your hard= drive. -
- Selection Library JARs - - - - - -
- You can download necessary JSF implementation libraries prov= ided by Sun and Apache - Foundation as well. Click Download... ( - - - - ) button and choose one of proposed librar= ies. -
- Download JSF Implementation Library - - - - - -
- The last wizard options allows to edit a path for = JSF Configuration - File, a name for JSF Servlet, JSF Servlet - Classname and change URL Mapping Patt= erns. -
- JSF Capabilities Wizard - - - - - -
- Since we are arranging the Seam Web project, the last step w= e should do is to adjust - project configurations associated with the Seam. -
-
- Configure Seam Facet Settings - The last wizard step is related to Seam facet and allows you= to do the - following: -
- Seam Facet Settings - - - - - -
- - - Create Seam runtime and define Seam home folder. - - - For that click on - Add - button in the General section= . Note, in the wizard - shown below you can create a Seam runtime only for the version= that was selected in the - Project Facets wiza= rd (version 1.2 in our - case). -
- Seam Runtime Creation - - - - - -
- - - Select EAR or WAR deployment by checking a necessary= radio button. - - - Select a - Database Type - - - -
- Database Type Selecting - - - - - -
- - - and then specify a - Connection profile - appropriate for your database. - - -
- Connection Profile Options - - - - - -
- You can edit chosen profile by using - Edit - button or organise a new one by clicking on - New - button and selecting necessary for you type of con= nection profile. -
- Connection Profile Selecting - - - - - -
- On the dialog you'll be asked to enter its name and des= cription. And then you - should select a proper driver and adjust connection details. P= ress - Next - to preview all the adjusted settings and complete = the creation of the new - profile. -
- Connection Details - - - - - -
- The next block of settings in the Seam Facet wizard are desc= ribing a Database and a - connection to it. - In the Code Generation section the wiza= rd has already provided - the names for your Session Bean, Entity Bean - and Test packages generation (optional). = Of course, you can change - them on others of your choice. -
- Code Generation Section - - - - - -
- Click on - Finish - to generate a project. - -
- + + + + + + JBoss Tools + Seam + JBDS + + + Creating a New Seam Project via the New Seam Project wizard</ti= tle> + <para>In this chapter we provide you with the necessary steps to start= working with Seam + Framework.</para> + <para>At first, we suggest to set the specific Seam perspective that c= ombines a number of + different views and editors needed for work with resources concern= ed. For that select + <emphasis> + <property>Window > Open Perspective > Other > Seam</property> + </emphasis> or you can also access it through the button in the ri= ght top corner.</para> + <figure> + <title>Seam Perspective Icon + + + + + + + Also the + Open Web Browser action is dir= ectly available in the + Seam perspective. +
+ Embedded Web Browser Button + + + + + +
+
+ Create standalone Seam Web Project + The best way to get started with Seam is to create a simple = Seam Project and + experiment with it. + Thus, you should select + File > New > Seam Web Project + to run the New Seam Project w= izard. The wizard form + allows you to create runtime and server instances in order to = get started creating, + running, and debugging J2EE (only) applications. + Seam Web Project wizard has an option for selecting the actu= al Server (not just WTP + runtime) that will be used for the project. This allows the wi= zard to identify correctly + where the required datasource and driver libraries need to go.= + Let's get through the wizard step-by-step. First, you s= hould enter a name and a + location directory for your new project. +
+ New Seam Project Wizard + + + + + +
+ On the figure above you can see the runtime and the server a= lready created. + If you need to create a new runtime, click on the + New... + button in the Target Runtime = section. It brings up the + wizard where you can specify a new JBoss Server Runtime enviro= nment or the other type of + runtime appropriate for your project configuration. Let's crea= te one more JBoss 4.2 + Runtime. Hence, after choosing it click on + Next + button. +
+ Specifying Target Runtime + + + + + +
+ All what you need here is to name runtime, type the path to = its install directory or + locate it by using + Browse + button, select a Java Runtime Environment, and sel= ect which configuration + you want. +
+ Specifying Target Runtime Configurations + + + + + +
+ Clicking on + Finish + returns you to the New Seam Project + wizard page. + The next step is to define a Server by clicking on + New... + button in the Target Server s= ection. In appeared + New Server dialog the last server whi= ch matches the runtime + will be selected. + All declared runtimes are listed in the combo-box under the = servers view. Here, you + can indicate a server runtime that you need. Click + Add + if you want to add a new Server Runtime. +
+ Specifying Target Server + + + + + +
+ Next page allows you to verify the information for a chosen = server. Leave everything + as it is and click on + Next + . +
+ JBoss Runtime Summary + + + + + +
+ On the last wizard step you can modify your projects to conf= igure them on the + Server. +
+ Project Modification for Configuring on the Server</tit= le> + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/create_new_seam/create_se= am_6.png"/> + </imageobject> + </mediaobject> + </figure> + <para>Once you have the Target Server defined click on <emphasis> + <property>Finish</property> + </emphasis> button to return to the first page of the <propert= y>New Seam Project + wizard</property>.</para> + <tip> + <title>Tip: + We suggest that you look through the Application Server = Manager Guide to + find out more about runtimes and servers. + +
+ Completion of Runtime and Server Configuration + + + + + +
+ The last section on this wizard step is Configurat= ion. Here, you + can select one of the pre-defined project configurations eithe= r associated with Seam + 1.2, Seam 2.0 or with Seam 2.1. Furthermore, you can create yo= ur own configuration by + pressing the + Modify... + button. It will open the dialog which allows to co= nfigure your own set of + facets for adding extra functionality to your project. + Pass to the next section to find out more details on this di= alog. +
+
+ Selecting the Project Facets + The Project Facets wizard allows you to= enable or disable + specific facets which define necessary features for the projec= t. When you switch to this + wizard form, all critical facets are already checked for the c= hosen + Configuration. + Notice that this page of the wizard also allows you to set t= he necessary version for + any facet. +
+ Project Facets Selection + + + + + +
+ Moreover, here you can specify your own preset of selected f= acets by checking needed + ones in project facets window and clicking on + Save + button. +
+ Specifying Custom Facet Preset + + + + + +
+ To see all available Server runtimes click on Runt= imes tab on the + left. You can create a new one using the + New + button. If more than one runtime is checked here, = the + Make Primary + button won't be dimmed yet. Thus, you can mak= e use of it to mark + primary runtime. +
+ Setting Runtime + + + + + +
+ + Ok + button will bring you to the Web Module<= /property> wizard form + again. +
+ Seam project with JPA facets + For creating Seam project with JPA support you need to s= elect Java + Persistent facet on Project Facet= s page and + click OK. + Then you should press Next and may = leave the default value on + Java application building page an= d Web Module + Settings page. + After that you will see JPA facet = page. +
+ JPA Facet page + + + + + +
+ On this page you can choose Platform (vendor-specific JPA + implementation) for your project, type of JPA Implementati= on, and configure the + Connection to database in the Connection area. + More about JPA facet page you can r= ead in Eclipse documentation. + On the next step you will see JSF Capabilities= and Seam + facet pages, which are mostly the same as i= n general Seam + project. +
+
+
+ Java application building configuration + With this wizard you can define Java source directories whic= h will be generated on + build path. Also you can specify a default output folder. If y= ou are agree with default + values, press Next +
+ Java application building Wizard + + + + + +
+
+
+ How to Configure Web Module Settings + As we deal with a Dynamic Web Application, we should at fir= st specify the top level + directory of our application for deploying it to a server afte= rwards. You know, this + kind of application contains Web resources. Thus, it's importa= nt to indicate the content + directory. The wizard will put all those values itself, so you= can leave everything as + is. +
+ Web Module Settings + + + + + +
+ Choose + Next + to switch to the next wizard form. +
+
+ Adding JSF Capabilities + This wizard helps you to add JSF capabilities to your projec= t. + Choose + Library provided by Target Runtime + from Library Type list if you'd like to use a defa= ult JSF implementation + given by the present runtime. +
+ Adding JSF Capabilities to Web Project + + + + + +
+ In case if you prefer to use your custom JSF implementation,= choose User + Library Item from Library Type list. In User Li= brary list you can check + required library. +
+ Using Custom JSF implementation Library + + + + + +
+ If a new library is required, click Manage librar= ies... ( + + + + + ) button. Then you should click = New. +
+ Using Custom JSF implementation Library + + + + + +
+ Here, it's necessary to type a Library Name. +
+ Entering New User Library Name + + + + + +
+ To add proper Library JARs, click Add + JARs... button and select the JARs on your hard= drive. +
+ Selection Library JARs + + + + + +
+ You can download necessary JSF implementation libraries prov= ided by Sun and Apache + Foundation as well. Click Download... ( + + + + ) button and choose one of proposed librar= ies. +
+ Download JSF Implementation Library + + + + + +
+ The last wizard options allows to edit a path for = JSF Configuration + File, a name for JSF Servlet, JSF Servlet + Classname and change URL Mapping Patt= erns. +
+ JSF Capabilities Wizard + + + + + +
+ Since we are arranging the Seam Web project, the last step w= e should do is to adjust + project configurations associated with the Seam. +
+
+ Configure Seam Facet Settings + The last wizard step is related to Seam facet and allows you= to do the + following: +
+ Seam Facet Settings + + + + + +
+ + + Create Seam runtime and define Seam home folder. + + + For that click on + Add + button in the General section= . Note, in the wizard + shown below you can create a Seam runtime only for the version= that was selected in the + Project Facets wiza= rd (version 1.2 in our + case). +
+ Seam Runtime Creation + + + + + +
+ = + + + Select EAR or WAR deployment by checking a necessary= radio button. + + + Enter EJB project name and EAR project name in case = of EAR radio button is checked. + + + = + + Tip: + If you want to name your web project "MyProject-war" no= te that the EJB project should not be "MyProject-war-ejb", = + it should be "MyProject-ejb". The same for EAR and Test= projects' names. They should be respectively "MyProject-ear" = + and "MyProject-test". + + = + + + Select a + Database Type + + + +
+ Database Type Selecting + + + + + +
+ + + and then specify a + Connection profile + appropriate for your database. + + +
+ Connection Profile Options + + + + + +
+ You can edit chosen profile by using + Edit + button or organise a new one by clicking on + New + button and selecting necessary for you type of con= nection profile. +
+ Connection Profile Selecting + + + + + +
+ On the dialog you'll be asked to enter its name and des= cription. And then you + should select a proper driver and adjust connection details. P= ress + Next + to preview all the adjusted settings and complete = the creation of the new + profile. +
+ Connection Details + + + + + +
+ The next block of settings in the Seam Facet wizard are desc= ribing a Database and a + connection to it. + In the Code Generation section the wiza= rd has already provided + the names for your Session Bean, Entity Bean + and Test packages generation (optional). = Of course, you can change + them on others of your choice. +
+ Code Generation Section + + + + + +
+ Click on + Finish + to generate a project. + +
+ \ No newline at end of file Modified: trunk/seam/docs/reference/en-US/images/create_new_seam/create_sea= m_1.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/seam/docs/reference/en-US/images/create_new_seam/create_sea= m_11.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/seam/docs/reference/en-US/images/create_new_seam/create_sea= m_12.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/seam/docs/reference/en-US/images/create_new_seam/create_sea= m_13.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/seam/docs/reference/en-US/images/create_new_seam/create_sea= m_20.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/seam/docs/reference/en-US/images/create_new_seam/create_sea= m_21.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============5302478025609936747==-- From jbosstools-commits at lists.jboss.org Thu May 20 10:15:16 2010 Content-Type: multipart/mixed; boundary="===============1476466358046365935==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22208 - in branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator: src/org/hibernate/mediator/stubs/util and 2 other directories. Date: Thu, 20 May 2010 10:15:16 -0400 Message-ID: <201005201415.o4KEFGWs006849@svn01.web.mwc.hst.phx2.redhat.com> --===============1476466358046365935== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-20 10:15:14 -0400 (Thu, 20 May 2010) New Revision: 22208 Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.new/ Removed: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/ Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/build.properties branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/src/org/hibernate/mediator/x/ejb/packaging/Filter.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - revert Hibernate 3.5 use to= Hibernate 3.3 Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/build.properties 2010-05-20 13:38:02 UTC (rev 22207) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/build.properties 2010-05-20 14:15:14 UTC (rev 22208) @@ -1,6 +1,6 @@ bin.includes =3D plugin.xml,\ org.hibernate.mediator.jar,\ - lib/,\ + lib.new/,\ META-INF/,\ hibernate-log4j.properties,\ about.html,\ @@ -9,35 +9,46 @@ about.properties,\ hibernate_icon.gif,\ plugin.properties,\ - lib/_add/asm-3.1.jar,\ - lib/_add/bsh-core-2.0b4.jar,\ - lib/_add/commons-logging-1.0.4.jar,\ - lib/_add/freemarker.jar,\ - lib/_add/hibernate-tools.jar,\ - lib/_add/jtidy-r8-20060801.jar,\ - lib/_add/log4j-1.2.15.jar,\ - lib/_add/slf4j-api-1.5.8.jar,\ - lib/_add/slf4j-log4j12-1.5.8.jar,\ - lib/bytecode/cglib/cglib-2.2.jar,\ - lib/bytecode/javassist/javassist-3.9.0.GA.jar,\ - lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar,\ - lib/optional/c3p0/c3p0-0.9.1.jar,\ - lib/optional/ehcache/ehcache-1.5.0.jar,\ - lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar,\ - lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar,\ - lib/optional/oscache/oscache-2.1.jar,\ - lib/optional/proxool/proxool-0.8.3.jar,\ - lib/optional/swarmcache/swarmcache-1.0RC2.jar,\ - lib/required/antlr-2.7.6.jar,\ - lib/required/commons-collections-3.1.jar,\ - lib/required/dom4j-1.6.1.jar,\ - lib/required/javassist-3.9.0.GA.jar,\ - lib/required/jta-1.1.jar,\ - lib/required/slf4j-api-1.5.8.jar,\ - lib/hibernate3.jar + lib.new/annotations/ejb3-persistence.jar,\ + lib.new/annotations/hibernate-annotations.jar,\ + lib.new/annotations/hibernate-commons-annotations.jar,\ + lib.new/annotations/hibernate-entitymanager.jar,\ + lib.new/annotations/hibernate-validator.jar,\ + lib.new/hibernate/antlr-2.7.6.jar,\ + lib.new/hibernate/asm-attrs.jar,\ + lib.new/hibernate/asm.jar,\ + lib.new/hibernate/c3p0-0.9.1.jar,\ + lib.new/hibernate/cglib-2.2.jar,\ + lib.new/hibernate/commons-collections-3.1.jar,\ + lib.new/hibernate/commons-logging-1.0.4.jar,\ + lib.new/hibernate/concurrent-1.3.2.jar,\ + lib.new/hibernate/connector.jar,\ + lib.new/hibernate/dom4j-1.6.1.jar,\ + lib.new/hibernate/ehcache-1.2.3.jar,\ + lib.new/hibernate/hibernate-jmx.jar,\ + lib.new/hibernate/hibernate3.jar,\ + lib.new/hibernate/jaas.jar,\ + lib.new/hibernate/javassist.jar,\ + lib.new/hibernate/jboss-cache.jar,\ + lib.new/hibernate/jboss-common.jar,\ + lib.new/hibernate/jboss-jmx.jar,\ + lib.new/hibernate/jboss-system.jar,\ + lib.new/hibernate/jdbc2_0-stdext.jar,\ + lib.new/hibernate/jgroups-2.2.8.jar,\ + lib.new/hibernate/jta.jar,\ + lib.new/hibernate/log4j-1.2.15.jar,\ + lib.new/hibernate/oscache-2.1.jar,\ + lib.new/hibernate/proxool-0.8.3.jar,\ + lib.new/hibernate/slf4j-api-1.5.8.jar,\ + lib.new/hibernate/slf4j-log4j12-1.5.8.jar,\ + lib.new/hibernate/swarmcache-1.0rc2.jar,\ + lib.new/tools/freemarker.jar,\ + lib.new/tools/hibernate-tools.jar,\ + lib.new/tools/jtidy-r8-20060801.jar,\ + lib.new/bsh-core-2.0b4.jar jars.compile.order =3D org.hibernate.mediator.jar source.org.hibernate.mediator.jar =3D src/ output.org.hibernate.mediator.jar =3D bin/ src.includes =3D src/,\ about.html -bin.excludes =3D lib/.cvsignore +bin.excludes =3D lib.new/.cvsignore Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hib= ernate.mediator/lib.new (from rev 22175, branches/hibernatetools-multiversi= on/hibernatetools/plugins/org.hibernate.mediator/lib) Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb= 3.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java= 2010-05-20 13:38:02 UTC (rev 22207) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/stubs/util/OpenMappingUtilsEjb3.java= 2010-05-20 14:15:14 UTC (rev 22208) @@ -16,7 +16,6 @@ import javax.persistence.mediator.x.MappedSuperclass; import javax.persistence.mediator.x.spi.PersistenceUnitTransactionType; = -import org.hibernate.mediator.x.ejb.Ejb3Configuration; import org.hibernate.mediator.x.ejb.HibernatePersistence; import org.hibernate.mediator.x.ejb.packaging.ClassFilter; import org.hibernate.mediator.x.ejb.packaging.Entry; Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java 2010-05-20 = 13:38:02 UTC (rev 22207) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/cfg/Configuration.java 2010-05-20 = 14:15:14 UTC (rev 22208) @@ -136,7 +136,6 @@ = public HibernateMappingExporter createHibernateMappingExporter(File folde= r2Gen, final IExporterNewOutputDir enod) { return HibernateMappingExporter.newInstance(this, folder2Gen, new Hibern= ateMappingExporter.IExportPOJOInterceptor() { - @SuppressWarnings("unchecked") public Object exportPOJO(Object obj, Method method, Object[] args, Meth= odProxy proxy) throws Throwable { HibernateMappingExporter hme =3D HibernateMappingExporter.newInstance(= obj); POJOClass element =3D POJOClass.newInstance(args[1]); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/src/org/hibernate/mediator/x/ejb/packaging/Filter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/Filter.java 2010-05-= 20 13:38:02 UTC (rev 22207) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/src/org/hibernate/mediator/x/ejb/packaging/Filter.java 2010-05-= 20 14:15:14 UTC (rev 22208) @@ -6,7 +6,7 @@ import net.sf.cglib.proxy.CallbackFilter; import net.sf.cglib.proxy.Enhancer; import net.sf.cglib.proxy.MethodInterceptor; -import net.sf.cglib.proxy.NoOp; +import net.sf.cglib.proxy.MethodProxy; = import org.hibernate.mediator.base.HObject; = @@ -39,7 +39,12 @@ public static Enhancer createEnhancer(Class clazz, MethodInterceptor m= i) { Enhancer e =3D new Enhancer(); e.setSuperclass(clazz); - e.setCallbacks(new Callback[] { NoOp.INSTANCE, mi }); + MethodInterceptor miDef =3D new MethodInterceptor() { + public Object intercept(Object obj, Method method, Object[] args, Metho= dProxy proxy) throws Throwable { + return proxy.invokeSuper(obj, args); + } + }; + e.setCallbacks(new Callback[] { miDef, mi }); e.setCallbackFilter(baseNodeFilter); return e; } --===============1476466358046365935==-- From jbosstools-commits at lists.jboss.org Thu May 20 10:16:35 2010 Content-Type: multipart/mixed; boundary="===============3954910421598378751==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22209 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: editor and 3 other directories. Date: Thu, 20 May 2010 10:16:35 -0400 Message-ID: <201005201416.o4KEGZ1B007027@svn01.web.mwc.hst.phx2.redhat.com> --===============3954910421598378751== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2010-05-20 10:16:34 -0400 (Thu, 20 May 2010) New Revision: 22209 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDnD= .java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vpe= Controller.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/moz= illa/MozillaEventAdapter.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/moz= illa/listener/MozillaDndListener.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/uti= l/VisualDomUtil.java Log: https://jira.jboss.org/browse/JBIDE-6288 : VPE DnD: element under cursor is= not highlighted on Linux Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd= /VpeDnD.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDn= D.java 2010-05-20 14:15:14 UTC (rev 22208) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/dnd/VpeDn= D.java 2010-05-20 14:16:34 UTC (rev 22209) @@ -38,6 +38,7 @@ import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping; import org.jboss.tools.vpe.editor.mozilla.MozillaEditor; import org.jboss.tools.vpe.editor.mozilla.listener.MozillaDndListener; +import org.jboss.tools.vpe.editor.util.VisualDomUtil; import org.jboss.tools.vpe.editor.util.VpeDndUtil; import org.jboss.tools.vpe.xulrunner.XPCOM; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; @@ -102,7 +103,7 @@ draggablePattern =3D new DraggablePattern(mozillaEditor); } = - public void dragGesture(nsIDOMEvent domEvent) { + public void dragStart(nsIDOMEvent domEvent) { nsIDOMElement selectedElement =3D vpeController.getXulRunnerEditor() .getLastSelectedElement(); // start drag sessionvpe-element @@ -110,8 +111,6 @@ Point pageCoords =3D getPageCoords(domEvent); draggablePattern.startSession(pageCoords.x, pageCoords.y); startDragSession(selectedElement); - - draggablePattern.closeSession(); domEvent.stopPropagation(); domEvent.preventDefault(); } @@ -159,16 +158,35 @@ disposeDropableArea(); vpeController.onRefresh(); } - = + public void dragExit(nsIDOMEvent domEvent) { -// disposeDropableArea(); - nsIDOMNode visualNode =3D (nsIDOMNode) domEvent.getTarget() - .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); - if (visualNode.getNodeType()=3D=3DnsIDOMNode.DOCUMENT_NODE) { - disposeDropableArea(); + nsIDOMNode eventTargetNode =3D (nsIDOMNode) domEvent.getTarget() + .queryInterface(nsIDOMNode.NS_IDOMNODE_IID); + = + if (dropableArea !=3D null) { + nsIDOMNode dropTargetNode =3D dropableArea.getNode(); + = + boolean targetNodeIsTemporary =3D false; + if (eventTargetNode.getNodeType() =3D=3D nsIDOMNode.ELEMENT_NODE) { + nsIDOMElement eventTargetElement =3D (nsIDOMElement) + eventTargetNode.queryInterface(nsIDOMElement.NS_IDOMELEMENT_IID); + targetNodeIsTemporary =3D DndUtil.isTemporaryDndElement(eventTargetEle= ment); + } + boolean eventTargetIsAscedantOfDropTarget =3D VisualDomUtil.isAscendant= (eventTargetNode, dropTargetNode); + = + // ignore events which are fired by the reason + // of drawing the dropable area + if (targetNodeIsTemporary || eventTargetIsAscedantOfDropTarget) { + disposeDropableArea(); + } } } = + public void dragEnd(nsIDOMEvent domEvent) { + disposeDropableArea(); + draggablePattern.closeSession(); + } + public void selectionChanged() { nsIDOMElement selectedElement =3D vpeController.getXulRunnerEditor() .getLastSelectedElement(); @@ -247,16 +265,15 @@ if (originalVisualNode =3D=3D null) { return; } - = - if (dropableArea =3D=3D null) { - dropableArea =3D new DropableArea(document); - } + Node originalSourceNode =3D vpeController.getDomMapping() .getNearSourceNode(originalVisualNode); - if (originalSourceNode.getNodeType() =3D=3D Node.TEXT_NODE) { + = + if (originalSourceNode !=3D null + && originalSourceNode.getNodeType() =3D=3D Node.TEXT_NODE) { originalSourceNode =3D originalSourceNode.getParentNode(); } - = + final Node highlightedNode; final EnumSet dropTargets; if (dropResolver.canDrop(originalSourceNode)) { @@ -271,14 +288,14 @@ dropTargets =3D EnumSet.of(DropTarget.BEGIN, DropTarget.END); } } else { - Node sourceNode; + Node sourceNode =3D null; Node sourceNodeParent =3D originalSourceNode; boolean nodeFound =3D false; - do { + while (sourceNodeParent !=3D null && !nodeFound) { sourceNode =3D sourceNodeParent; sourceNodeParent =3D sourceNode.getParentNode(); nodeFound =3D dropResolver.canDrop(sourceNodeParent); - } while (sourceNodeParent !=3D null && !nodeFound); + } = if (nodeFound) { highlightedNode =3D sourceNode; @@ -289,13 +306,21 @@ } } = - dropableArea.setDropTargets(dropTargets); - dropableArea.setNode( - vpeController.getDomMapping().getNearVisualNode(highlightedNode)); - Point mouseCoords =3D getPageCoords(event); - dropableArea.setHighlightedDropTarget(mouseCoords.x, mouseCoords.y); - dropableArea.setVisible(true); - dropableArea.redraw(); + if (highlightedNode !=3D null) { + if (dropableArea =3D=3D null) { + dropableArea =3D new DropableArea(document); + } + + dropableArea.setDropTargets(dropTargets); + dropableArea.setNode( + vpeController.getDomMapping().getNearVisualNode(highlightedNode)); + Point mouseCoords =3D getPageCoords(event); + dropableArea.setHighlightedDropTarget(mouseCoords.x, mouseCoords.y); + dropableArea.setVisible(true); + dropableArea.redraw(); + } else { + disposeDropableArea(); + } } = private Point getClientCoords(nsIDOMEvent event) { @@ -457,11 +482,12 @@ if (sourceDropInfo.canDrop()) { VpeDnDHelper dropper =3D new VpeDnDHelper(); dropper.setDndData(false, true); + Node node =3D sourceInnerDragInfo.getNode(); dropper.drop(vpeController.getPageContext(), sourceInnerDragInfo, sourceDropInfo); = // select dropped node, JBIDE-6239 - setSelectedNode(sourceInnerDragInfo.getNode()); + setSelectedNode(node); = if (sourceInnerDragInfo !=3D null) { sourceInnerDragInfo =3D null; @@ -537,6 +563,7 @@ } } = + @SuppressWarnings("restriction") private Point getSourceSelectionRange(Node sourceInitNode, int sourceInit= Offset) { int offset=3D0; int position=3D0; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/VpeController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eController.java 2010-05-20 14:15:14 UTC (rev 22208) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eController.java 2010-05-20 14:16:34 UTC (rev 22209) @@ -128,7 +128,6 @@ import org.jboss.tools.vpe.resref.core.TaglibReferenceList; import org.jboss.tools.vpe.selbar.SelectionBar; import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor; -import org.jboss.tools.vpe.xulrunner.editor.XulRunnerVpeUtils; import org.mozilla.interfaces.nsIDOMDocument; import org.mozilla.interfaces.nsIDOMElement; import org.mozilla.interfaces.nsIDOMEvent; @@ -1202,7 +1201,7 @@ // so we start it's manually // mareshkau if (vpeDnD.isDragIconClicked(mouseEvent)) { - vpeDnD.dragGesture(mouseEvent); + vpeDnD.dragStart(mouseEvent); } else { selectionManager.setSelection(mouseEvent); = } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/mozilla/MozillaEventAdapter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEventAdapter.java 2010-05-20 14:15:14 UTC (rev 22208) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEventAdapter.java 2010-05-20 14:16:34 UTC (rev 22209) @@ -54,11 +54,13 @@ private static final String KEYPRESS=3D"keypress"; //$NON-NLS-1$ private static final String DBLCLICK=3D"dblclick"; //$NON-NLS-1$ private static final String CONTEXTMENUEVENTTYPE=3D"contextmenu"; //$NON-= NLS-1$ - private static final String DRAGGESTUREEVENT =3D "draggesture"; //$NON-NL= S-1$ +// private static final String DRAGGESTUREEVENT =3D "draggesture"; //$NON-= NLS-1$ + private static final String DRAGSTART =3D "dragstart"; //$NON-NLS-1$ private static final String DRAGOVEREVENT =3D "dragover"; //$NON-NLS-1$ private static final String DRAGDROPEVENT =3D "dragdrop"; //$NON-NLS-1$ private static final String DRAGENTEREVENT =3D "dragenter"; //$NON-NLS-1$ private static final String DRAGEXITEVENT =3D "dragexit"; //$NON-NLS-1$ + private static final String DRAGEND =3D "dragend"; //$NON-NLS-1$ = private EventListenerList listeners =3D new EventListenerList(); private nsIDOMEventTarget window; @@ -107,8 +109,9 @@ if (document !=3D null) { document.addEventListener(MozillaEventAdapter.DRAGDROPEVENT, this, fals= e); document.addEventListener(MozillaEventAdapter.DRAGENTEREVENT, this, fal= se); + document.addEventListener(MozillaEventAdapter.DRAGEND,this, false); document.addEventListener(MozillaEventAdapter.DRAGEXITEVENT,this, false= ); - document.addEventListener(MozillaEventAdapter.DRAGGESTUREEVENT, this, f= alse); + document.addEventListener(MozillaEventAdapter.DRAGSTART, this, false); document.addEventListener(MozillaEventAdapter.DRAGOVEREVENT, this, fals= e); = document.addEventListener(MozillaEventAdapter.KEYPRESS, this, false); @@ -136,8 +139,9 @@ if (document !=3D null) { document.removeEventListener(MozillaEventAdapter.DRAGDROPEVENT, this, f= alse); document.removeEventListener(MozillaEventAdapter.DRAGENTEREVENT, this, = false); + document.removeEventListener(MozillaEventAdapter.DRAGEND, this, false); document.removeEventListener(MozillaEventAdapter.DRAGEXITEVENT, this, f= alse); - document.removeEventListener(MozillaEventAdapter.DRAGGESTUREEVENT, this= , false); + document.removeEventListener(MozillaEventAdapter.DRAGSTART, this, false= ); document.removeEventListener(MozillaEventAdapter.DRAGOVEREVENT, this, f= alse); = document.removeEventListener(MozillaEventAdapter.KEYPRESS, this, false)= ; = @@ -286,7 +290,7 @@ MozillaContextMenuListener.class)) { listener.onShowContextMenu(0, domEvent, node); } - } else if(DRAGGESTUREEVENT.equals(eventType)) { + } else if(DRAGSTART.equals(eventType)) { // fix of JBIDE-4998: since drag events now are implemented by // handling CLICKEVENTTYPE, there is no need to handle them here = //for (DndDomEventListener listener : dndListeners) { @@ -302,6 +306,11 @@ domEvent.preventDefault(); } else if(DRAGENTEREVENT.equals(eventType)) { //just ignore this event + } else if(DRAGEND.equals(eventType)) { + for (MozillaDndListener listener : listeners.getListeners( + MozillaDndListener.class)) { + listener.dragEnd(domEvent); + } } else if(DRAGEXITEVENT.equals(eventType)) { for (MozillaDndListener listener : listeners.getListeners( MozillaDndListener.class)) { Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/mozilla/listener/MozillaDndListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/listener/MozillaDndListener.java 2010-05-20 14:15:14 UTC (rev 22208) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/listener/MozillaDndListener.java 2010-05-20 14:16:34 UTC (rev 22209) @@ -26,7 +26,7 @@ * Drag gesture event handler * @param event xulrunner drag event */ - void dragGesture(nsIDOMEvent event); + void dragStart(nsIDOMEvent event); = /** * Calls when drop event occurs = @@ -35,9 +35,9 @@ void dragDrop(nsIDOMEvent domEvent); // these methods are never used // void dragEnter(nsIDOMEvent event); -// void dragExit(nsIDOMEvent event); // void drop(nsIDOMEvent event); // void onPasteOrDrop(nsIDOMMouseEvent mouseEvent, String flavor, String d= ata); = void dragExit(nsIDOMEvent domEvent); + void dragEnd(nsIDOMEvent domEvent); } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/util/VisualDomUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut= il/VisualDomUtil.java 2010-05-20 14:15:14 UTC (rev 22208) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut= il/VisualDomUtil.java 2010-05-20 14:16:34 UTC (rev 22209) @@ -535,5 +535,23 @@ } return facetChildren; } + + /** + * Returns {@code true} if and only if {@code potentialAscendant} + * is an ascendant of {@code potentialDescendant}. + * = + * @param potentialAscendant must not be {@code null} + * @param potentialDescendant may be {@code null} + */ + public static boolean isAscendant(nsIDOMNode potentialAscendant, + nsIDOMNode potentialDescendant) { + while (potentialDescendant !=3D null) { + potentialDescendant =3D potentialDescendant.getParentNode(); + if (potentialAscendant.equals(potentialDescendant)) { + return true; + } + } + return false; + } = } --===============3954910421598378751==-- From jbosstools-commits at lists.jboss.org Thu May 20 10:18:53 2010 Content-Type: multipart/mixed; boundary="===============5683956004770934081==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22210 - in branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator: META-INF and 1 other directory. Date: Thu, 20 May 2010 10:18:53 -0400 Message-ID: <201005201418.o4KEIrEv007053@svn01.web.mwc.hst.phx2.redhat.com> --===============5683956004770934081== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-20 10:18:53 -0400 (Thu, 20 May 2010) New Revision: 22210 Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/META-INF/MANIFEST.MF.new branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib/ Removed: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/lib.bak/ Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/META-INF/MANIFEST.MF Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - revert Hibernate 3.5 use to= Hibernate 3.3 Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/META-INF/MANIFEST.MF 2010-05-20 14:16:34 UTC (rev 22209) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/META-INF/MANIFEST.MF 2010-05-20 14:18:53 UTC (rev 22210) @@ -4,32 +4,43 @@ Bundle-SymbolicName: org.hibernate.mediator;singleton:=3Dtrue Bundle-Version: 3.3.0.qualifier Bundle-ClassPath: org.hibernate.mediator.jar, - lib/_add/bsh-core-2.0b4.jar, - lib/_add/commons-logging-1.0.4.jar, - lib/_add/freemarker.jar, - lib/_add/hibernate-tools.jar, - lib/_add/jtidy-r8-20060801.jar, - lib/_add/log4j-1.2.15.jar, - lib/_add/slf4j-api-1.5.8.jar, - lib/_add/slf4j-log4j12-1.5.8.jar, - lib/bytecode/cglib/cglib-2.2.jar, - lib/bytecode/javassist/javassist-3.9.0.GA.jar, - lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar, - lib/optional/c3p0/c3p0-0.9.1.jar, - lib/optional/ehcache/ehcache-1.5.0.jar, - lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar, - lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar, - lib/optional/oscache/oscache-2.1.jar, - lib/optional/proxool/proxool-0.8.3.jar, - lib/optional/swarmcache/swarmcache-1.0RC2.jar, - lib/required/antlr-2.7.6.jar, - lib/required/commons-collections-3.1.jar, - lib/required/dom4j-1.6.1.jar, - lib/required/javassist-3.9.0.GA.jar, - lib/required/jta-1.1.jar, - lib/required/slf4j-api-1.5.8.jar, - lib/hibernate3.jar, - lib/_add/asm-3.1.jar + lib/annotations/ejb3-persistence.jar, + lib/annotations/hibernate-annotations.jar, + lib/annotations/hibernate-commons-annotations.jar, + lib/annotations/hibernate-entitymanager.jar, + lib/annotations/hibernate-validator.jar, + lib/hibernate/antlr-2.7.6.jar, + lib/hibernate/asm-attrs.jar, + lib/hibernate/asm.jar, + lib/hibernate/c3p0-0.9.1.jar, + lib/hibernate/cglib-2.2.jar, + lib/hibernate/commons-collections-3.1.jar, + lib/hibernate/commons-logging-1.0.4.jar, + lib/hibernate/concurrent-1.3.2.jar, + lib/hibernate/connector.jar, + lib/hibernate/dom4j-1.6.1.jar, + lib/hibernate/ehcache-1.2.3.jar, + lib/hibernate/hibernate-jmx.jar, + lib/hibernate/hibernate3.jar, + lib/hibernate/jaas.jar, + lib/hibernate/javassist.jar, + lib/hibernate/jboss-cache.jar, + lib/hibernate/jboss-common.jar, + lib/hibernate/jboss-jmx.jar, + lib/hibernate/jboss-system.jar, + lib/hibernate/jdbc2_0-stdext.jar, + lib/hibernate/jgroups-2.2.8.jar, + lib/hibernate/jta.jar, + lib/hibernate/log4j-1.2.15.jar, + lib/hibernate/oscache-2.1.jar, + lib/hibernate/proxool-0.8.3.jar, + lib/hibernate/slf4j-api-1.5.8.jar, + lib/hibernate/slf4j-log4j12-1.5.8.jar, + lib/hibernate/swarmcache-1.0rc2.jar, + lib/tools/freemarker.jar, + lib/tools/hibernate-tools.jar, + lib/tools/jtidy-r8-20060801.jar, + lib/bsh-core-2.0b4.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Export-Package: org.hibernate.mediator, Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hib= ernate.mediator/META-INF/MANIFEST.MF.new (from rev 22199, branches/hibernat= etools-multiversion/hibernatetools/plugins/org.hibernate.mediator/META-INF/= MANIFEST.MF) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/META-INF/MANIFEST.MF.new (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/META-INF/MANIFEST.MF.new 2010-05-20 14:18:53 UTC (rev 22210) @@ -0,0 +1,76 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: %Bundle-Name.0 +Bundle-SymbolicName: org.hibernate.mediator;singleton:=3Dtrue +Bundle-Version: 3.3.0.qualifier +Bundle-ClassPath: org.hibernate.mediator.jar, + lib/_add/bsh-core-2.0b4.jar, + lib/_add/commons-logging-1.0.4.jar, + lib/_add/freemarker.jar, + lib/_add/hibernate-tools.jar, + lib/_add/jtidy-r8-20060801.jar, + lib/_add/log4j-1.2.15.jar, + lib/_add/slf4j-api-1.5.8.jar, + lib/_add/slf4j-log4j12-1.5.8.jar, + lib/bytecode/cglib/cglib-2.2.jar, + lib/bytecode/javassist/javassist-3.9.0.GA.jar, + lib/jpa/hibernate-jpa-2.0-api-1.0.0.Final.jar, + lib/optional/c3p0/c3p0-0.9.1.jar, + lib/optional/ehcache/ehcache-1.5.0.jar, + lib/optional/infinispan/infinispan-core-4.0.0.FINAL.jar, + lib/optional/jbosscache/jbosscache-core-3.2.1.GA.jar, + lib/optional/oscache/oscache-2.1.jar, + lib/optional/proxool/proxool-0.8.3.jar, + lib/optional/swarmcache/swarmcache-1.0RC2.jar, + lib/required/antlr-2.7.6.jar, + lib/required/commons-collections-3.1.jar, + lib/required/dom4j-1.6.1.jar, + lib/required/javassist-3.9.0.GA.jar, + lib/required/jta-1.1.jar, + lib/required/slf4j-api-1.5.8.jar, + lib/hibernate3.jar, + lib/_add/asm-3.1.jar +Bundle-Vendor: %Bundle-Vendor.0 +Bundle-Localization: plugin +Export-Package: org.hibernate.mediator, + org.hibernate.mediator.base, + org.hibernate.mediator.execution, + org.hibernate.mediator.logging, + org.hibernate.mediator.preferences, + org.hibernate.mediator.stubs.util, + org.hibernate.mediator.util, + org.hibernate.mediator.x, + org.hibernate.mediator.x.cfg, + org.hibernate.mediator.x.cfg.reveng, + org.hibernate.mediator.x.connection, + org.hibernate.mediator.x.dialect, + org.hibernate.mediator.x.engine, + org.hibernate.mediator.x.engine.query, + org.hibernate.mediator.x.hql, + org.hibernate.mediator.x.hql.antlr, + org.hibernate.mediator.x.mapping, + org.hibernate.mediator.x.metadata, + org.hibernate.mediator.x.proxy, + org.hibernate.mediator.x.tool.hbm2ddl, + org.hibernate.mediator.x.tool.hbm2x, + org.hibernate.mediator.x.tool.hbm2x.pojo, + org.hibernate.mediator.x.tool.ide.completion, + org.hibernate.mediator.x.type, + org.hibernate.mediator.x.util, + org.dom4j.mediator.x, + org.dom4j.mediator.x.io, + org.objectweb.asm, + org.objectweb.asm.signature, + net.sf.cglib.core, + net.sf.cglib.proxy, + net.sf.cglib.reflect +Require-Bundle: org.eclipse.core.runtime, + org.eclipse.ui.console, + org.eclipse.ui.views, + org.eclipse.jface, + org.eclipse.jdt.apt.core, + org.eclipse.datatools.connectivity +Bundle-ActivationPolicy: lazy +Eclipse-BuddyPolicy: registered +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Activator: org.hibernate.mediator.MediatorPlugin Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hib= ernate.mediator/lib (from rev 22178, branches/hibernatetools-multiversion/h= ibernatetools/plugins/org.hibernate.mediator/lib.bak) --===============5683956004770934081==-- From jbosstools-commits at lists.jboss.org Thu May 20 10:37:28 2010 Content-Type: multipart/mixed; boundary="===============7460958820939868522==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22211 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/launch. Date: Thu, 20 May 2010 10:37:28 -0400 Message-ID: <201005201437.o4KEbSvG009019@svn01.web.mwc.hst.phx2.redhat.com> --===============7460958820939868522== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-20 10:37:27 -0400 (Thu, 20 May 2010) New Revision: 22211 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclip= se/as/ui/launch/JBossLaunchConfigurationTabGroup.java Log: Emailed Tycho build issue regarding unprivelaged access to internal classes Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/id= e/eclipse/as/ui/launch/JBossLaunchConfigurationTabGroup.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/ecli= pse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2010-05-20 14:18:53 = UTC (rev 22210) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/ecli= pse/as/ui/launch/JBossLaunchConfigurationTabGroup.java 2010-05-20 14:37:27 = UTC (rev 22211) @@ -21,14 +21,7 @@ */ package org.jboss.ide.eclipse.as.ui.launch; = -import java.text.MessageFormat; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup; import org.eclipse.debug.ui.CommonTab; @@ -40,9 +33,10 @@ import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab; import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab; import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds; -import org.eclipse.jdt.internal.debug.ui.SWTFactory; import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages; import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Font; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; @@ -74,9 +68,20 @@ setTabs(tabs); } = + public static Composite createComposite(Composite parent, Font font, int = columns, int hspan, int fill) { + Composite g =3D new Composite(parent, SWT.NONE); + g.setLayout(new GridLayout(columns, false)); + g.setFont(font); + GridData gd =3D new GridData(fill); + gd.horizontalSpan =3D hspan; + g.setLayoutData(gd); + return g; + } + + = public class JavaMainTabExtension extends JavaMainTabClone { public void createControl(Composite parent) { - Composite comp =3D SWTFactory.createComposite(parent, parent.getFont(),= 1, 1, GridData.FILL_BOTH); + Composite comp =3D createComposite(parent, parent.getFont(), 1, 1, Grid= Data.FILL_BOTH); ((GridLayout)comp.getLayout()).verticalSpacing =3D 0; //createProjectEditor(comp); //createVerticalSpacer(comp, 1); --===============7460958820939868522==-- From jbosstools-commits at lists.jboss.org Thu May 20 11:16:51 2010 Content-Type: multipart/mixed; boundary="===============0112098112040318861==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22212 - trunk. Date: Thu, 20 May 2010 11:16:51 -0400 Message-ID: <201005201516.o4KFGpRl019624@svn01.web.mwc.hst.phx2.redhat.com> --===============0112098112040318861== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-20 11:16:51 -0400 (Thu, 20 May 2010) New Revision: 22212 Removed: trunk/pom-all-components.xml Log: merged into pom.xml Deleted: trunk/pom-all-components.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/pom-all-components.xml 2010-05-20 14:37:27 UTC (rev 22211) +++ trunk/pom-all-components.xml 2010-05-20 15:16:51 UTC (rev 22212) @@ -1,47 +0,0 @@ - - 4.0.0 - - parent-pom.xml - org.jboss.tools - org.jboss.tools.parent.pom - 0.0.1-SNAPSHOT - - org.jboss.tools - trunk - 0.0.1-SNAPSHOT - pom - - - tests - common - flow - jbpm - jmx - archives - as - drools - bpel - smooks - freemarker - profiler - portlet - modeshape - xulrunner - jst - vpe - jsf - esb - tptp - ws - cdi - struts - hibernatetools - seam - examples - birt - maven - site - - - = --===============0112098112040318861==-- From jbosstools-commits at lists.jboss.org Thu May 20 11:25:47 2010 Content-Type: multipart/mixed; boundary="===============8205265301264696475==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22213 - in branches/hibernatetools-multiversion/hibernatetools/plugins: org.hibernate.mediator and 1 other directory. Date: Thu, 20 May 2010 11:25:47 -0400 Message-ID: <201005201525.o4KFPlLc020561@svn01.web.mwc.hst.phx2.redhat.com> --===============8205265301264696475== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-20 11:25:46 -0400 (Thu, 20 May 2010) New Revision: 22213 Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.= java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/.classpath branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernat= e.mediator/build.properties Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - revert Hibernate 3.5 use to= Hibernate 3.3 Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappin= gUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils= .java 2010-05-20 15:16:51 UTC (rev 22212) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils= .java 2010-05-20 15:25:46 UTC (rev 22213) @@ -530,13 +530,13 @@ * @param element * @return */ - @SuppressWarnings("unchecked") public static IFile searchInEjb3MappingFiles(ConsoleConfiguration console= Config, Object element) { IFile file =3D null; if (consoleConfig =3D=3D null) { return file; } final ConsoleConfiguration cc2 =3D consoleConfig; + /** / List documentPaths =3D (List)consoleConfig.execute(new E= xecutionContext.Command() { public Object execute() { return OpenMappingUtilsEjb3.enumDocuments( @@ -544,6 +544,11 @@ cc2.getEntityResolver()); } }); + /**/ + List documentPaths =3D OpenMappingUtilsEjb3.enumDocuments( + cc2.getPreferences().getPersistenceUnitName(), + cc2.getEntityResolver()); + /**/ if (documentPaths =3D=3D null) { return file; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/.classpath 2010-05-20 15:16:51 UTC (rev 22212) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/.classpath 2010-05-20 15:25:46 UTC (rev 22213) @@ -3,30 +3,42 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.h= ibernate.mediator/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/build.properties 2010-05-20 15:16:51 UTC (rev 22212) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hiberna= te.mediator/build.properties 2010-05-20 15:25:46 UTC (rev 22213) @@ -1,6 +1,5 @@ bin.includes =3D plugin.xml,\ org.hibernate.mediator.jar,\ - lib.new/,\ META-INF/,\ hibernate-log4j.properties,\ about.html,\ @@ -9,46 +8,48 @@ about.properties,\ hibernate_icon.gif,\ plugin.properties,\ - lib.new/annotations/ejb3-persistence.jar,\ - lib.new/annotations/hibernate-annotations.jar,\ - lib.new/annotations/hibernate-commons-annotations.jar,\ - lib.new/annotations/hibernate-entitymanager.jar,\ - lib.new/annotations/hibernate-validator.jar,\ - lib.new/hibernate/antlr-2.7.6.jar,\ - lib.new/hibernate/asm-attrs.jar,\ - lib.new/hibernate/asm.jar,\ - lib.new/hibernate/c3p0-0.9.1.jar,\ - lib.new/hibernate/cglib-2.2.jar,\ - lib.new/hibernate/commons-collections-3.1.jar,\ - lib.new/hibernate/commons-logging-1.0.4.jar,\ - lib.new/hibernate/concurrent-1.3.2.jar,\ - lib.new/hibernate/connector.jar,\ - lib.new/hibernate/dom4j-1.6.1.jar,\ - lib.new/hibernate/ehcache-1.2.3.jar,\ - lib.new/hibernate/hibernate-jmx.jar,\ - lib.new/hibernate/hibernate3.jar,\ - lib.new/hibernate/jaas.jar,\ - lib.new/hibernate/javassist.jar,\ - lib.new/hibernate/jboss-cache.jar,\ - lib.new/hibernate/jboss-common.jar,\ - lib.new/hibernate/jboss-jmx.jar,\ - lib.new/hibernate/jboss-system.jar,\ - lib.new/hibernate/jdbc2_0-stdext.jar,\ - lib.new/hibernate/jgroups-2.2.8.jar,\ - lib.new/hibernate/jta.jar,\ - lib.new/hibernate/log4j-1.2.15.jar,\ - lib.new/hibernate/oscache-2.1.jar,\ - lib.new/hibernate/proxool-0.8.3.jar,\ - lib.new/hibernate/slf4j-api-1.5.8.jar,\ - lib.new/hibernate/slf4j-log4j12-1.5.8.jar,\ - lib.new/hibernate/swarmcache-1.0rc2.jar,\ - lib.new/tools/freemarker.jar,\ - lib.new/tools/hibernate-tools.jar,\ - lib.new/tools/jtidy-r8-20060801.jar,\ - lib.new/bsh-core-2.0b4.jar + lib/,\ + lib/annotations/ejb3-persistence.jar,\ + lib/annotations/hibernate-annotations.jar,\ + lib/annotations/hibernate-commons-annotations.jar,\ + lib/annotations/hibernate-entitymanager.jar,\ + lib/annotations/hibernate-validator.jar,\ + lib/hibernate/antlr-2.7.6.jar,\ + lib/hibernate/asm-attrs.jar,\ + lib/hibernate/asm.jar,\ + lib/hibernate/c3p0-0.9.1.jar,\ + lib/hibernate/cglib-2.2.jar,\ + lib/hibernate/commons-collections-3.1.jar,\ + lib/hibernate/commons-logging-1.0.4.jar,\ + lib/hibernate/concurrent-1.3.2.jar,\ + lib/hibernate/connector.jar,\ + lib/hibernate/dom4j-1.6.1.jar,\ + lib/hibernate/ehcache-1.2.3.jar,\ + lib/hibernate/hibernate-jmx.jar,\ + lib/hibernate/hibernate3.jar,\ + lib/hibernate/jaas.jar,\ + lib/hibernate/javassist.jar,\ + lib/hibernate/jboss-cache.jar,\ + lib/hibernate/jboss-common.jar,\ + lib/hibernate/jboss-jmx.jar,\ + lib/hibernate/jdbc2_0-stdext.jar,\ + lib/hibernate/jboss-system.jar,\ + lib/hibernate/jgroups-2.2.8.jar,\ + lib/hibernate/jta.jar,\ + lib/hibernate/log4j-1.2.15.jar,\ + lib/hibernate/oscache-2.1.jar,\ + lib/hibernate/proxool-0.8.3.jar,\ + lib/hibernate/slf4j-api-1.5.8.jar,\ + lib/hibernate/slf4j-log4j12-1.5.8.jar,\ + lib/hibernate/swarmcache-1.0rc2.jar,\ + lib/tools/freemarker.jar,\ + lib/tools/hibernate-tools.jar,\ + lib/tools/jtidy-r8-20060801.jar jars.compile.order =3D org.hibernate.mediator.jar source.org.hibernate.mediator.jar =3D src/ output.org.hibernate.mediator.jar =3D bin/ src.includes =3D src/,\ about.html -bin.excludes =3D lib.new/.cvsignore +bin.excludes =3D lib/annotations/,\ + lib/hibernate/,\ + lib/tools/ --===============8205265301264696475==-- From jbosstools-commits at lists.jboss.org Thu May 20 11:37:00 2010 Content-Type: multipart/mixed; boundary="===============8150190500021714100==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22214 - branches. Date: Thu, 20 May 2010 11:36:59 -0400 Message-ID: <201005201536.o4KFaxDa021658@svn01.web.mwc.hst.phx2.redhat.com> --===============8150190500021714100== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-20 11:36:59 -0400 (Thu, 20 May 2010) New Revision: 22214 Added: branches/3.2.helios/ Log: branch for helios work Copied: branches/3.2.helios (from rev 22213, trunk) --===============8150190500021714100==-- From jbosstools-commits at lists.jboss.org Thu May 20 12:09:51 2010 Content-Type: multipart/mixed; boundary="===============6779977941318213798==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22215 - trunk/build. Date: Thu, 20 May 2010 12:09:50 -0400 Message-ID: <201005201609.o4KG9o3v031305@svn01.web.mwc.hst.phx2.redhat.com> --===============6779977941318213798== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-20 12:09:50 -0400 (Thu, 20 May 2010) New Revision: 22215 Added: trunk/build/jbds.product Log: from branch? Added: trunk/build/jbds.product =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/jbds.product (rev 0) +++ trunk/build/jbds.product 2010-05-20 16:09:50 UTC (rev 22215) @@ -0,0 +1,37 @@ + + + + + + + + + + + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.sm= allFonts + + + + + + + + + + + + + + + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.inter= nal.debug.ui.launcher.StandardVMType/J2SE-1.5 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.inter= nal.debug.ui.launcher.StandardVMType/J2SE-1.5 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.int= ernal.debug.ui.launcher.StandardVMType/J2SE-1.5 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.int= ernal.debug.ui.launcher.StandardVMType/J2SE-1.5 + + + + + + + + --===============6779977941318213798==-- From jbosstools-commits at lists.jboss.org Thu May 20 12:30:21 2010 Content-Type: multipart/mixed; boundary="===============1074759477446374156==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22216 - in trunk/bpel/plugins: org.eclipse.bpel.ui and 2 other directories. Date: Thu, 20 May 2010 12:30:20 -0400 Message-ID: <201005201630.o4KGUKlG001207@svn01.web.mwc.hst.phx2.redhat.com> --===============1074759477446374156== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bbrodt Date: 2010-05-20 12:30:19 -0400 (Thu, 20 May 2010) New Revision: 22216 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse= /bpel/apache/ode/deploy/ui/util/DeployUtils.java trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELResou= rceChangeListener.java trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUICo= nstants.java Log: https://jira.jboss.org/browse/JBIDE-6006 https://jira.jboss.org/browse/JBIDE-6093 Had to roll my own BPEL Content Describer class - XMLRootElementContentDesc= riber2 has some...strange behavior Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/= eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclips= e/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-05-20 16:09:50 UTC (= rev 22215) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclips= e/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-05-20 16:30:19 UTC (= rev 22216) @@ -333,10 +333,16 @@ if (type.getId().equals(BPEL_CONTENT_TYPE)) return true; } + = + // https://jira.jboss.org/browse/JBIDE-6006 + // this causes all kinds of nasty stack traces - see https://jira.jbos= s.org/browse/JBIDE-6093 + // since this version of the ODE deployment editor is part of the same= feature as the BPEL editor + // plugin, we'll go on the assumption that they will always be install= ed together. You'd have to + // something pretty dangerous to install one without the other. // maybe the eclipse BPEL editor is not installed? // fall back to using '.bpel' file extension - if ("bpel".equals(((IFile)res).getFileExtension())) - return true; + //if ("bpel".equals(((IFile)res).getFileExtension())) + // return true; } } catch(Exception ex) Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2010-05-20 = 16:09:50 UTC (rev 22215) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF 2010-05-20 = 16:30:19 UTC (rev 22216) @@ -66,3 +66,4 @@ org.eclipse.bpel.ui.util.marker, org.eclipse.bpel.ui.wizards Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Import-Package: org.eclipse.bpel.validator Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml 2010-05-20 16:09:50 U= TC (rev 22215) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/plugin.xml 2010-05-20 16:30:19 U= TC (rev 22216) @@ -657,11 +657,9 @@ name=3D"BPEL Editor File" file-extensions=3D"bpel,bpel2,xml" priority=3D"normal"> + - + class=3D"org.eclipse.bpel.ui.BPELContentDescriber"> Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BP= ELResourceChangeListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELReso= urceChangeListener.java 2010-05-20 16:09:50 UTC (rev 22215) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELReso= urceChangeListener.java 2010-05-20 16:30:19 UTC (rev 22216) @@ -21,6 +21,7 @@ import org.eclipse.bpel.model.CorrelationSet; import org.eclipse.bpel.model.messageproperties.Property; import org.eclipse.bpel.ui.util.BPELUtil; +import org.eclipse.bpel.validator.Builder; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; @@ -51,13 +52,9 @@ = public boolean visit(final IResourceDelta delta) throws CoreException { IResource target =3D delta.getResource(); - if (target.getType() =3D=3D IResource.FILE) { - String ext =3D target.getFileExtension(); - if (ext !=3D null) { - if (ext.equals(IBPELUIConstants.EXTENSION_BPEL)) { - handleBPEL(delta); - } - } + // https://jira.jboss.org/browse/JBIDE-6006 + if (Builder.isBPELFile(target)) { + handleBPEL(delta); } return true; } Modified: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IB= PELUIConstants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIC= onstants.java 2010-05-20 16:09:50 UTC (rev 22215) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/IBPELUIC= onstants.java 2010-05-20 16:30:19 UTC (rev 22216) @@ -17,7 +17,9 @@ = public interface IBPELUIConstants { // File extensions - @Deprecated // use content type instead of bpel file extensions + // https://jira.jboss.org/browse/JBIDE-6006 + // @Deprecated // use content type instead of bpel file extensions + // oops! actually not deprecated - we still need this to construct bpel f= ile names public final String EXTENSION_BPEL =3D "bpel"; //$NON-NLS-1$ public final String EXTENSION_WSDL =3D "wsdl"; //$NON-NLS-1$ public final String EXTENSION_WSIL =3D "wsil"; //$NON-NLS-1$ --===============1074759477446374156==-- From jbosstools-commits at lists.jboss.org Thu May 20 12:31:37 2010 Content-Type: multipart/mixed; boundary="===============7121136385228594916==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22217 - trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui. Date: Thu, 20 May 2010 12:31:37 -0400 Message-ID: <201005201631.o4KGVbaB001510@svn01.web.mwc.hst.phx2.redhat.com> --===============7121136385228594916== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bbrodt Date: 2010-05-20 12:31:36 -0400 (Thu, 20 May 2010) New Revision: 22217 Added: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELConte= ntDescriber.java Log: https://jira.jboss.org/browse/JBIDE-6006 https://jira.jboss.org/browse/JBIDE-6093 Had to roll my own BPEL Content Describer class - XMLRootElementContentDesc= riber2 has some...strange behavior Added: trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELC= ontentDescriber.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELCont= entDescriber.java (rev 0) +++ trunk/bpel/plugins/org.eclipse.bpel.ui/src/org/eclipse/bpel/ui/BPELCont= entDescriber.java 2010-05-20 16:31:36 UTC (rev 22217) @@ -0,0 +1,104 @@ +/*************************************************************************= ****** = + * 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.eclipse.bpel.ui; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; + +import org.apache.xerces.parsers.SAXParser; +import org.apache.xerces.xni.Augmentations; +import org.apache.xerces.xni.QName; +import org.apache.xerces.xni.XMLAttributes; +import org.apache.xerces.xni.XNIException; +import org.eclipse.core.runtime.QualifiedName; +import org.eclipse.core.runtime.content.IContentDescription; +import org.eclipse.core.runtime.content.ITextContentDescriber; +import org.xml.sax.InputSource; + +/** + * @author Bob Brodt + * = + * added for https://jira.jboss.org/browse/JBIDE-6006 + */ +public class BPELContentDescriber implements ITextContentDescriber { + + private static final String WSBPEL_2_NAMESPACE =3D "http://docs.oasis-ope= n.org/wsbpel/2.0/process/executable"; //$NON-NLS-1$ + private static final String ROOT_ELEMENT =3D "process"; //$NON-NLS-1$ + + private RootElementParser parser; + + public BPELContentDescriber() { + } + + public int describe(Reader contents, IContentDescription description) thr= ows IOException { + return doDescribe(contents) =3D=3D null ? INVALID : VALID; + } + + public int describe(InputStream contents, IContentDescription description= ) throws IOException { + return describe(new InputStreamReader(contents), description); + } + + private synchronized String doDescribe(Reader contents) throws IOExceptio= n { + try { + InputSource source =3D new InputSource(contents); + parser =3D new RootElementParser(); + parser.parse(source); + } catch (AcceptedException e) { + return e.acceptedRootElement; + } catch (RejectedException e) { + return null; + } catch (Exception e) { + return null; + } + finally { + parser =3D null; + } + + return null; + } + + public QualifiedName[] getSupportedOptions() { + return null; + } + + private class RootElementParser extends SAXParser { + public void startElement(QName qName, XMLAttributes attributes, Augmenta= tions augmentations) throws XNIException { + + super.startElement(qName, attributes, augmentations); + + if (ROOT_ELEMENT.equals(qName.localpart)) { + String namespace =3D fNamespaceContext.getURI(qName.prefix); + if (WSBPEL_2_NAMESPACE.equals(namespace)) + throw new AcceptedException(qName.localpart); + else + throw new RejectedException(); + } else + throw new RejectedException(); + } + } + + private class AcceptedException extends RuntimeException { + public String acceptedRootElement; + + public AcceptedException(String acceptedRootElement) { + this.acceptedRootElement =3D acceptedRootElement; + } + + private static final long serialVersionUID =3D 1L; + } + + private class RejectedException extends RuntimeException { + private static final long serialVersionUID =3D 1L; + } +} --===============7121136385228594916==-- From jbosstools-commits at lists.jboss.org Thu May 20 12:56:36 2010 Content-Type: multipart/mixed; boundary="===============7794704278524321672==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22218 - trunk/jmx/docs/reference/en-US. Date: Thu, 20 May 2010 12:56:36 -0400 Message-ID: <201005201656.o4KGuakQ004574@svn01.web.mwc.hst.phx2.redhat.com> --===============7794704278524321672== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-20 12:56:35 -0400 (Thu, 20 May 2010) New Revision: 22218 Modified: trunk/jmx/docs/reference/en-US/introduction.xml Log: corrected a error Modified: trunk/jmx/docs/reference/en-US/introduction.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/docs/reference/en-US/introduction.xml 2010-05-20 16:31:36 UTC= (rev 22217) +++ trunk/jmx/docs/reference/en-US/introduction.xml 2010-05-20 16:56:35 UTC= (rev 22218) @@ -1,4 +1,3 @@ -<<<<<<< .mine @@ -131,138 +130,4 @@ section. - -=3D=3D=3D=3D=3D=3D=3D - - - - - Introduction - JBoss Tools' JMX project is a fork of eclipse-jmx, a p= roject by Jeff Mesnil. - It was forked with permission. - = -
- What is JMX? - -The Java Management Extensions (JMX) technology is a standard part of the = Java Platform, Standard Edition (Java SE platform). The JMX technology was = added to the platform in the Java 2 Platform, Standard Edition (J2SE) 5.0 r= elease. - - -The JMX technology provides a simple, standard way of managing resources s= uch as applications, devices, and services. Because the JMX technology is d= ynamic, you can use it to monitor and manage resources as they are created,= installed and implemented. You can also use the JMX technology to monitor = and manage the Java Virtual Machine (Java VM). - - -The JMX specification defines the architecture, design patterns, APIs, and= services in the Java programming language for management and monitoring of= applications and networks. - - -Using the JMX technology, a given resource is instrumented by one or more = Java objects known as Managed Beans, or MBeans. These MBeans are registered= in a core-managed object server, known as an MBean server. The MBean serve= r acts as a management agent and can run on most devices that have been ena= bled for the Java programming language. = - - - -The specifications define JMX agents that you use to manage any resources = that have been correctly configured for management. A JMX agent consists of= an MBean server, in which MBeans are registered, and a set of services for= handling the MBeans. In this way, JMX agents directly control resources an= d make them available to remote management applications. - - -The way in which resources are instrumented is completely independent from= the management infrastructure. Resources can therefore be rendered managea= ble regardless of how their management applications are implemented. - - -The JMX technology defines standard connectors (known as JMX connectors) t= hat enable you to access JMX agents from remote management applications. JM= X connectors using different protocols provide the same management interfac= e. Consequently, a management application can manage resources transparentl= y, regardless of the communication protocol used. JMX agents can also be us= ed by systems or applications that are not compliant with the JMX specifica= tion, as long as those systems or applications support JMX agents. = - -Read more about JMX. -
- = -
- What is JMX Tools? - JBoss JMX Tools allow to setup multiple JMX = connections and provide view - for exploring the JMX tree and execute operations directly from Eclips= e. - - This chapter covers the basics of working with JMX plugi= n, which is - used to manage Java applications through JMX and its RMI Connector. - -
- JMX Tools - - - - - -
-
- -
Key Features of JMX Tools - For a start, we propose you to look through the table of main fe= atures of JMX Tools: - - = - Key Functionality for JMX Tools - - = - - - - = - - - Feature - Benefit - Chapter - - - = - - = - - MBean Explorer - MBean Explorer is a useful view with a text filte= r that displays domains, mbeans, attributes, and operations inside a connec= tion. - - MBean Explorer - - - = - - MBean Editor - MBean Editor is a multi-page editor to manage MBe= ans. - - MBean Editor - - - - -
-
- = -
- Requirements and Installation -
- Requirements - Requirements to use JMX Tools are the follo= wing: - = - - - JMX Tools is developed on Eclipse 3.4.x= milestones - - - JMX Tools requires that Eclipse is run = on a JDK 1.5.0 or above - (due to dependencies on JMX packages which were introduced in Ja= va 1.5.0) - - -
-
- Installation - Here, we are going to explain how to install the JMX p= lugin into - Eclipse. - - JMX Tools is one module of the JB= oss Tools - project. JMX Tools has no dependency on any oth= er part of JBoss - Tools, and can be downloaded standalone. Even though th= e JMX - Tools have no dependencies, other plugins, such as AS Tools, - do depend on the JMX Tooling and even extend it. - - You can find the JBoss Tools plugins over a= t the download pages. The only - package you'll need to get is the JMX Tooling, however the AS - Tools would give you a more full experience when using = JMX with JBoss Servers. - You can find further download and installation instructions on the J= Boss Wiki in the Installin= g JBoss Tools - section. -
-
->>>>>>> .r22100 + \ No newline at end of file --===============7794704278524321672==-- From jbosstools-commits at lists.jboss.org Thu May 20 14:06:30 2010 Content-Type: multipart/mixed; boundary="===============1680354867753012783==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22219 - trunk/build. Date: Thu, 20 May 2010 14:06:30 -0400 Message-ID: <201005201806.o4KI6UIf024287@svn01.web.mwc.hst.phx2.redhat.com> --===============1680354867753012783== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-20 14:06:30 -0400 (Thu, 20 May 2010) New Revision: 22219 Modified: trunk/build/build.xml Log: make empty update site zips appear as [ERROR] in log Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-20 16:56:35 UTC (rev 22218) +++ trunk/build/build.xml 2010-05-20 18:06:30 UTC (rev 22219) @@ -1126,7 +1126,7 @@ Overall update site zip contains no features! - Update site zip for ${COMPONENTS.to.build} cont= ains no features! + [ERROR] Update site zip for ${COMPONENTS.to.bu= ild} contains no features! --===============1680354867753012783==-- From jbosstools-commits at lists.jboss.org Thu May 20 15:12:53 2010 Content-Type: multipart/mixed; boundary="===============4957588314282796860==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22220 - trunk. Date: Thu, 20 May 2010 15:12:52 -0400 Message-ID: <201005201912.o4KJCqes005331@svn01.web.mwc.hst.phx2.redhat.com> --===============4957588314282796860== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-20 15:12:52 -0400 (Thu, 20 May 2010) New Revision: 22220 Modified: trunk/parent-pom.xml Log: add profile to add Hudson BUILD_NUMBER into plugin ID; also add M1 suffix f= or first milestone Modified: trunk/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/parent-pom.xml 2010-05-20 18:06:30 UTC (rev 22219) +++ trunk/parent-pom.xml 2010-05-20 19:12:52 UTC (rev 22220) @@ -11,6 +11,7 @@ 0.9.0-SNAPSHOT trunk + M1 = @@ -20,7 +21,7 @@ maven-osgi-packaging-plugin ${tychoVersion} - 'v'yyyyMMdd-HHmm + 'v'yyyyMMdd-HHmm'-${BUILD_ALIAS}' true @@ -100,6 +101,17 @@ org.eclipse.sdk.ide 0.0.0 + + + org.jmock + jmock-legacy + 2.5.1 + + + org.jmock + jmock-junit4 + 2.5.1 + **/AllTests.class @@ -156,7 +168,30 @@ = + + hudson + + + BUILD_NUMBER + + + + + + org.sonatype.tycho + maven-osgi-packaging-plugin + ${tychoVersion} + + 'v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}-${BUILD_ALIAS}' + true + + + + + + helios --===============4957588314282796860==-- From jbosstools-commits at lists.jboss.org Thu May 20 15:14:17 2010 Content-Type: multipart/mixed; boundary="===============2635356642386636897==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22221 - trunk. Date: Thu, 20 May 2010 15:14:16 -0400 Message-ID: <201005201914.o4KJEGMf005351@svn01.web.mwc.hst.phx2.redhat.com> --===============2635356642386636897== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-20 15:14:16 -0400 (Thu, 20 May 2010) New Revision: 22221 Modified: trunk/parent-pom.xml Log: perf tune the list of repos to search Modified: trunk/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/parent-pom.xml 2010-05-20 19:12:52 UTC (rev 22220) +++ trunk/parent-pom.xml 2010-05-20 19:14:16 UTC (rev 22221) @@ -390,22 +390,11 @@ = - maven-central - http://repo1.maven.org/maven2/ - - - true - - - true - - - sonatype-maven-central http://repository.sonatype.org/content/repositories/central/ - true + false true @@ -419,7 +408,7 @@ true - true + false @@ -430,7 +419,7 @@ true - true + false @@ -440,7 +429,7 @@ true - true + false --===============2635356642386636897==-- From jbosstools-commits at lists.jboss.org Thu May 20 15:24:55 2010 Content-Type: multipart/mixed; boundary="===============5736259981692774477==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22222 - in trunk/documentation/guides/GettingStartedGuide/en-US: images/first_seam and 1 other directory. Date: Thu, 20 May 2010 15:24:55 -0400 Message-ID: <201005201924.o4KJOtNQ006632@svn01.web.mwc.hst.phx2.redhat.com> --===============5736259981692774477== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-20 15:24:54 -0400 (Thu, 20 May 2010) New Revision: 22222 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam10.png trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam12.png trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam13.png trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam14.png trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam3.png trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam4.png trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam5.png trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam8.png trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam8_1.png trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam9.png Log: TOOLSDOC-74Create and deploy Seam Web section update - description and imag= es are apdated = Modified: trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.x= ml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml 201= 0-05-20 19:14:16 UTC (rev 22221) +++ trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml 201= 0-05-20 19:24:54 UTC (rev 22222) @@ -125,7 +125,9 @@ Select Library Provided by Target Runtime - as Type of JSF Impl= ementation Library. We will use the JSF implementation that come= s with JBoss server. + as Type of JSF Impl= ementation + Library. We will use the JSF implementation that = comes with JBoss + server. Click @@ -166,9 +168,9 @@ - Select JDBC Connection Properties. Make s= ure the URL is set to - - jdbc:hsqldb:hsql://localhost:1701 + Select HSQLDB Profile Properties. Make su= re the Database location + is set to + hsql://localhost:1701
JDBC Connection Properties @@ -180,11 +182,14 @@
Try click on Test Connection button. It p= robably won=E2=80=99t work. This happens if the hsql jdbc driver is not exactly the same. This can = be worked around by - modifying the HSQLDB database driver settings. To modify the setti= ngs, click the =E2=80=9C...=E2=80=9D next to the drop-down box. - The proper Driver JAR File should be listed under Dr= iver File(s). - Select the hsqldb.jar file found in the database/lib directory and= click on Ok. + modifying the HSQLDB database driver settings. To modify the setti= ngs, click the Edit Driver Definition Driver( + + + + ) . + The proper Driver JAR File should be listed under Ja= r List. Select + the hsqldb.jar file found in the jbdevstudio/jboss-eap/jboss-as/co= mmon/lib/ directory and + click Ok.
Driver Details @@ -193,18 +198,8 @@
- Select Hypersonic DB and click on Ok. Again, - this only happens if the selected hsqldb.jar is different from the= running database. -
- Hypersonic DB Selecting - - - - - -
Now, the Test Connection should succeed. = After testing the - connection, click on Ok. + connection, click Ok.
Connection Testing Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam10.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam12.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam13.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam14.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam3.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam4.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam5.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam8.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam8_1.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam9.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============5736259981692774477==-- From jbosstools-commits at lists.jboss.org Thu May 20 15:34:53 2010 Content-Type: multipart/mixed; boundary="===============7520190013632974573==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22223 - trunk. Date: Thu, 20 May 2010 15:34:53 -0400 Message-ID: <201005201934.o4KJYrLD007674@svn01.web.mwc.hst.phx2.redhat.com> --===============7520190013632974573== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-20 15:34:53 -0400 (Thu, 20 May 2010) New Revision: 22223 Modified: trunk/pom.xml Log: uncomment rest of stack from pom.xml; fix order Modified: trunk/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/pom.xml 2010-05-20 19:24:54 UTC (rev 22222) +++ trunk/pom.xml 2010-05-20 19:34:53 UTC (rev 22223) @@ -12,15 +12,14 @@ 0.0.1-SNAPSHOT pom - + tests common flow jbpm - + site = --===============7520190013632974573==-- From jbosstools-commits at lists.jboss.org Thu May 20 16:08:38 2010 Content-Type: multipart/mixed; boundary="===============0023274259837076900==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22224 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 2 other directories. Date: Thu, 20 May 2010 16:08:37 -0400 Message-ID: <201005202008.o4KK8bkD017503@svn01.web.mwc.hst.phx2.redhat.com> --===============0023274259837076900== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-20 16:08:36 -0400 (Thu, 20 May 2010) New Revision: 22224 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDIValidationMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : - method annotated @Specializes is static or does not directly override a= nother producer method Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDIUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-20 19:34:53 UTC (rev 22223) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-20 20:08:36 UTC (rev 22224) @@ -11,8 +11,10 @@ package org.jboss.tools.cdi.core; = import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; = import org.eclipse.core.resources.IProject; @@ -338,6 +340,9 @@ if (sourceType =3D=3D null) { continue; } + if(!sourceType.isInterface()) { + continue; + } IAnnotation annotation =3D sourceType.getAnnotation(CDIConstants.LOCA= L_ANNOTATION_TYPE_NAME); if (annotation =3D=3D null) { annotation =3D sourceType.getAnnotation("Local"); //$NON-NLS-N1 @@ -359,4 +364,92 @@ } return method.getMethod(); } + + /** + * Finds the method which is overridden by the given method. Or null if t= his method overrides nothing. = + * = + * @param method + * @return + */ + public static IMethod getOverridingMethodDeclaration(IBeanMethod method) { + IClassBean bean =3D method.getClassBean(); + Map foundMethods =3D new HashMap(); + try { + if (Flags.isStatic(method.getMethod().getFlags())) { + return null; + } + Set types =3D bean.getLegalTypes(); + for (IParametedType type : types) { + IType sourceType =3D type.getType(); + if (sourceType =3D=3D null || sourceType.isInterface()) { + continue; + } + IMethod[] methods =3D sourceType.getMethods(); + for (IMethod iMethod : methods) { + if (method.getMethod().isSimilar(iMethod)) { + foundMethods.put(iMethod.getDeclaringType(), iMethod); + } + } + } + if(foundMethods.size()=3D=3D1) { + return foundMethods.values().iterator().next(); + } else if(foundMethods.size()>1) { + IType type =3D bean.getBeanClass(); + IType superClass =3D getSuperClass(type); + while(superClass!=3Dnull) { + IMethod m =3D foundMethods.get(superClass); + if(m!=3Dnull) { + return m; + } + superClass =3D getSuperClass(superClass); + } + } + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + return null; + } + + /** + * Finds the method which is overridden by the given method. Or null if t= his method overrides nothing. = + * = + * @param method + * @return + */ + public static IMethod getDirectOverridingMethodDeclaration(IBeanMethod me= thod) { + IClassBean bean =3D method.getClassBean(); + try { + if (Flags.isStatic(method.getMethod().getFlags())) { + return null; + } + IType type =3D bean.getBeanClass(); + IType superClass =3D getSuperClass(type); + if(superClass!=3Dnull) { + IMethod[] methods =3D superClass.getMethods(); + for (IMethod iMethod : methods) { + if (method.getMethod().isSimilar(iMethod)) { + return iMethod; + } + } + } + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + return null; + } + + private static IType getSuperClass(IType type) throws JavaModelException { + String superclassName =3D type.getSuperclassName(); + if(superclassName!=3Dnull) { + String fullySuperclassName =3D EclipseJavaUtil.resolveType(type, superc= lassName); + if(fullySuperclassName!=3Dnull&&!fullySuperclassName.equals("java.lang.= Object")) { //$NON-NLS-1$ + if(fullySuperclassName.equals(type.getFullyQualifiedName())) { + return null; + } + IType superType =3D type.getJavaProject().findType(fullySuperclassName= ); + return superType; + } + } + return null; + } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-20 19:34:53 UTC (rev 222= 23) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-20 20:08:36 UTC (rev 222= 24) @@ -27,6 +27,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.Flags; +import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IMemberValuePair; import org.eclipse.jdt.core.IMethod; @@ -686,6 +687,49 @@ validationContext.addLinkedCoreResource(classBean.getSourcePath().to= OSString(), method.getResource().getFullPath(), false); } } + + IAnnotationDeclaration sDeclaration =3D producerMethod.getSpecializesA= nnotationDeclaration(); + if(sDeclaration!=3Dnull) { + if(Flags.isStatic(producerMethod.getMethod().getFlags())) { + /* + * 3.3.3. Specializing a producer method + * - method annotated @Specializes is static + */ + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_PRODUCER_STATIC,= CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, sDeclaration, producer.getRe= source()); + } else { + /* + * 3.3.3. Specializing a producer method + * - method annotated @Specializes does not directly override anoth= er producer method + */ + IMethod superMethod =3D CDIUtil.getDirectOverridingMethodDeclaration= (producerMethod); + boolean overrides =3D false; + if(superMethod!=3Dnull) { + IType superType =3D superMethod.getDeclaringType(); + if(superType.isBinary()) { + IAnnotation[] ants =3D superMethod.getAnnotations(); + for (IAnnotation an : ants) { + if(CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME.equals(an.getElemen= tName())) { + overrides =3D true; + } + } + } else { + Set beans =3D cdiProject.getBeans(superType.getResource().g= etFullPath()); + for (IBean iBean : beans) { + if(iBean instanceof IProducerMethod) { + IProducerMethod prMethod =3D (IProducerMethod)iBean; + if(prMethod.getMethod().isSimilar(superMethod)) { + overrides =3D true; + } + } + } + } + } + if(!overrides) { + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_PRODUCER_OVERRI= DE, CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, sDeclaration, producer.ge= tResource()); + } + saveAllSuperTypesAsLinkedResources(producer.getClassBean()); + } + } } } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDIValidationMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-20 19:34:53 UTC (re= v 22223) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-20 20:08:36 UTC (re= v 22224) @@ -93,7 +93,8 @@ = public static String ILLEGAL_SPECIALIZING_MANAGED_BEAN; public static String ILLEGAL_SPECIALIZING_SESSION_BEAN; - public static String ILLEGAL_SPECIALIZING_PRODUCER; + public static String ILLEGAL_SPECIALIZING_PRODUCER_STATIC; + public static String ILLEGAL_SPECIALIZING_PRODUCER_OVERRIDE; public static String MISSING_TYPE_IN_SPECIALIZING_BEAN; public static String CONFLICTING_NAME_IN_SPECIALIZING_BEAN; public static String INTERCEPTOR_ANNOTATED_SPECIALIZES; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-20 19:34:53 UTC (rev 22223) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-20 20:08:36 UTC (rev 22224) @@ -72,7 +72,8 @@ = ILLEGAL_SPECIALIZING_MANAGED_BEAN=3DManaged bean class annotated @Speciali= zes does not directly extend the bean class of another managed bean ILLEGAL_SPECIALIZING_SESSION_BEAN=3DSession bean class annotated @Speciali= zes does not directly extend the bean class of another session bean -ILLEGAL_SPECIALIZING_PRODUCER=3DMethod annotated @Specializes is static or= does not directly override another producer method +ILLEGAL_SPECIALIZING_PRODUCER_STATIC=3DProducer method annotated @Speciali= zes is static +ILLEGAL_SPECIALIZING_PRODUCER_OVERRIDE=3DProducer method annotated @Specia= lizes does not directly override another producer method MISSING_TYPE_IN_SPECIALIZING_BEAN=3DBean X specializes Y but does not have= some bean type of Y CONFLICTING_NAME_IN_SPECIALIZING_BEAN=3DBean X specializes Y and Y has a n= ame and X declares a name explicitly, using @Named INTERCEPTOR_ANNOTATED_SPECIALIZES=3DInterceptor is annotated @Specializes Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-20 19:34:53 UTC (rev 22223) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-20 20:08:36 UTC (rev 22224) @@ -124,7 +124,7 @@ new String[][]{ {CDIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_illegalSpecializingManagedBean_label}, {CDIPreferences.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_label}, -// {CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label}, + {CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, CDIPreferencesMessages.= CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label}, // {CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferencesMes= sages.CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label= }, // {CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreference= sMessages.CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBe= an_label}, // {CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferencesMes= sages.CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_lab= el}, Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-20 19:34:53 UTC (rev 22223) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-20 20:08:36 UTC (rev 22224) @@ -527,6 +527,28 @@ } = /** + * 3.3.3. Specializing a producer method + * - method annotated @Specializes is static + * = + * @throws Exception + */ + public void testSpecializedStaticMethod() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /inheritance/specialization/producer/method/broken/specializesStaticMethod/= FurnitureShop_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SPECIALIZING_PRODUCER_= STATIC, 24); + } + + /** + * 3.3.3. Specializing a producer method + * - method annotated @Specializes does not directly override another pr= oducer method + * = + * @throws Exception + */ + public void testSpecializedMethodIndirectlyOverridesAnotherProducerMethod= () throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /inheritance/specialization/producer/method/broken/indirectOverride/ShoeSho= p_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_SPECIALIZING_PRODUCER_= OVERRIDE, 24); + } + + /** * 3.5.1. Declaring a resource * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) * = --===============0023274259837076900==-- From jbosstools-commits at lists.jboss.org Thu May 20 16:46:42 2010 Content-Type: multipart/mixed; boundary="===============2253189917601006867==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22225 - in trunk/cdi: plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 2 other directories. Date: Thu, 20 May 2010 16:46:42 -0400 Message-ID: <201005202046.o4KKkgHV021912@svn01.web.mwc.hst.phx2.redhat.com> --===============2253189917601006867== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-20 16:46:39 -0400 (Thu, 20 May 2010) New Revision: 22225 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/producers/NonStaticProducerOfSessionBeanBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/producers/ProducerAnnotatedInjectBroken.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : Non-static field of a session bean class is annotated @Produces Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-20 20:08:36 UTC (rev 222= 24) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-20 20:46:39 UTC (rev 222= 25) @@ -582,8 +582,7 @@ if (nameDeclaration !=3D null) { declaration =3D nameDeclaration; } - addError(CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME= , CDIPreferences.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, - declaration, producer.getResource()); + addError(CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME= , CDIPreferences.RESOURCE_PRODUCER_FIELD_SETS_EL_NAME, declaration, produce= r.getResource()); } } } @@ -596,11 +595,17 @@ for (String variableSig : typeVariables) { String variableName =3D Signature.getTypeVariable(variableSig); if (typeString.equals(variableName)) { - addError(CDIValidationMessages.PRODUCER_FIELD_TYPE_IS_VARIABLE, CDI= Preferences.PRODUCER_FIELD_TYPE_IS_VARIABLE, - typeDeclaration !=3D null ? typeDeclaration : producer, producer.= getResource()); + addError(CDIValidationMessages.PRODUCER_FIELD_TYPE_IS_VARIABLE, CDI= Preferences.PRODUCER_FIELD_TYPE_IS_VARIABLE, typeDeclaration !=3D null ? ty= peDeclaration : producer, producer.getResource()); } } } + /* + * 3.4.2. Declaring a producer field + * - non-static field of a session bean class is annotated @Produces + */ + if(producer.getClassBean() instanceof ISessionBean && !Flags.isStatic(= producerField.getField().getFlags())) { + addError(CDIValidationMessages.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN= , CDIPreferences.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN, producer.getProduc= esAnnotation(), producer.getResource()); + } } else { IProducerMethod producerMethod =3D (IProducerMethod) producer; List params =3D producerMethod.getParameters(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-20 20:08:36 UTC (rev 22224) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-20 20:46:39 UTC (rev 22225) @@ -65,9 +65,6 @@ is not a business method of the session bean - interceptor or decorator has a method annotated @Produces = - - - 3.3.3. Specializing a producer method - method annotated @Specializes is static or does not directly override an= other producer method = @@ -94,6 +91,9 @@ - non-static field of a session bean class is annotated @Produces - interceptor or decorator has a field annotated @Produces = + + + 3.5.1. Declaring a resource - producer field declaration specifies an EL name (together with one of = @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-20 20:08:36 UTC (rev 22224) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-20 20:46:39 UTC (rev 22225) @@ -86,7 +86,7 @@ {CDIPreferences.ILLEGAL_DISPOSER_IN_SESSION_BEAN, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalDisposerInSessionBean_label}, {CDIPreferences.NO_PRODUCER_MATCHING_DISPOSER, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_noProducerMatchingDisposer_label}, {CDIPreferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_multipleDisposersForProducer_label}, -// {CDIPreferences.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN, CDIPreference= sMessages.CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBe= an_label}, + {CDIPreferences.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN, CDIPreferencesM= essages.CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBean= _label}, // {CDIPreferences.MULTIPLE_INJECTION_CONSTRUCTORS, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label}, // {CDIPreferences.CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED, CDIPrefere= ncesMessages.CDIValidatorConfigurationBlock_pb_constructorParameterIllegall= yAnnotated_label}, // {CDIPreferences.GENERIC_METHOD_ANNOTATED_INJECT, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label}, Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/producers/NonStaticProducerOfSessionBeanBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/NonStaticProducerOfSessionBeanBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/NonStaticProducerOfSessionBeanBroken.java 2010-05-20 20= :46:39 UTC (rev 22225) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.producers; + +import javax.ejb.Stateless; +import javax.enterprise.inject.Produces; + +(a)Stateless +public class NonStaticProducerOfSessionBeanBroken { + + @Produces public FunnelWeaver anotherFunnelWeaver; +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/producers/NonStaticProducerOfSessionBeanBroken.j= ava ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/producers/ProducerAnnotatedInjectBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/ProducerAnnotatedInjectBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/producers/ProducerAnnotatedInjectBroken.java 2010-05-20 20:46:39 = UTC (rev 22225) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.producers; + +import javax.enterprise.inject.Produces; +import javax.inject.Inject; + +public class ProducerAnnotatedInjectBroken { + + @Produces @Inject public FunnelWeaver anotherFunnelWeaver; +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/producers/ProducerAnnotatedInjectBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-20 20:08:36 UTC (rev 22224) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-20 20:46:39 UTC (rev 22225) @@ -549,28 +549,6 @@ } = /** - * 3.5.1. Declaring a resource - * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) - * = - * @throws Exception - */ - public void testResourceWithELName() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/resources/ProducerFieldsBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_E= L_NAME, 15, 19, 24, 27, 31); - } - - /** - * 3.11. The qualifier @Named at injection points - * - injection point other than injected field declares a @Named annotat= ion that does not specify the value member - * = - * @throws Exception - */ - public void testNamedInjectPoint() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/inject/NamedInjectionBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PARAM_INJECTION_DECLARES_EMPTY= _NAME, 10, 16); - } - - /** * 3.3.6. Declaring a disposer method * - method has more than one parameter annotated @Disposes * = @@ -711,6 +689,28 @@ = /** * 3.4.2. Declaring a producer field + * - producer field is annotated @Inject + * = + * @throws Exception + */ + public void testProducerAnnotatedInject() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/ProducerAnnotatedInjectBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_ANNOTATED_INJECT, 8); + } + + /** + * 3.4.2. Declaring a producer field + * - non-static field of a session bean class is annotated @Produces + * = + * @throws Exception + */ + public void testNonStaticProducerOfSessionBean() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/producers/NonStaticProducerOfSessionBeanBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_PRODUCER_FIELD_IN_SESS= ION_BEAN, 9); + } + + /** + * 3.4.2. Declaring a producer field * - decorator has a field annotated @Produces * = * @throws Exception @@ -732,6 +732,17 @@ } = /** + * 3.5.1. Declaring a resource + * - producer field declaration specifies an EL name (together with one = of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) + * = + * @throws Exception + */ + public void testResourceWithELName() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/resources/ProducerFieldsBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_E= L_NAME, 15, 19, 24, 27, 31); + } + + /** * 3.9.1. Declaring an initializer method * - an initializer method has a parameter annotated @Disposes * = @@ -744,6 +755,17 @@ } = /** + * 3.11. The qualifier @Named at injection points + * - injection point other than injected field declares a @Named annotat= ion that does not specify the value member + * = + * @throws Exception + */ + public void testNamedInjectPoint() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/inject/NamedInjectionBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.PARAM_INJECTION_DECLARES_EMPTY= _NAME, 10, 16); + } + + /** * 10.4.2. Declaring an observer method * - an observer method is annotated @Produces * = --===============2253189917601006867==-- From jbosstools-commits at lists.jboss.org Thu May 20 17:58:11 2010 Content-Type: multipart/mixed; boundary="===============0237543725252119139==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22226 - trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF. Date: Thu, 20 May 2010 17:58:11 -0400 Message-ID: <201005202158.o4KLwBjt003631@svn01.web.mwc.hst.phx2.redhat.com> --===============0237543725252119139== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-20 17:58:10 -0400 (Thu, 20 May 2010) New Revision: 22226 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFE= ST.MF Log: fix version ranges Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF= /MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIF= EST.MF 2010-05-20 20:46:39 UTC (rev 22225) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIF= EST.MF 2010-05-20 21:58:10 UTC (rev 22226) @@ -7,8 +7,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.wst.common.emfworkbench.integration, - org.jboss.ide.eclipse.archives.core;bundle-version=3D"2.0.0", - org.jboss.ide.eclipse.archives.ui;bundle-version=3D"1.0.0", + org.jboss.ide.eclipse.archives.core, + org.jboss.ide.eclipse.archives.ui, org.eclipse.wst.server.core;bundle-version=3D"1.1.0", org.eclipse.wst.server.ui;bundle-version=3D"1.1.0", org.eclipse.core.resources;bundle-version=3D"3.4.0", @@ -17,15 +17,15 @@ org.eclipse.jem.util, org.eclipse.wst.common.modulecore;bundle-version=3D"1.1.200", org.apache.ant;bundle-version=3D"1.7.0", - org.jboss.ide.eclipse.as.core;bundle-version=3D"1.0.0", + org.jboss.ide.eclipse.as.core, org.eclipse.ui.ide;bundle-version=3D"3.4.0", - org.jboss.ide.eclipse.as.ui;bundle-version=3D"1.0.0", + org.jboss.ide.eclipse.as.ui, org.eclipse.core.filesystem;bundle-version=3D"1.2.0", org.eclipse.ui.navigator;bundle-version=3D"3.3.100", - org.jboss.tools.jmx.core;bundle-version=3D"0.2.1", + org.jboss.tools.jmx.core, org.eclipse.core.variables;bundle-version=3D"3.2.200", - org.jboss.ide.eclipse.as.wtp.core;bundle-version=3D"1.0.0", - org.jboss.ide.eclipse.as.wtp.ui;bundle-version=3D"1.0.0", + org.jboss.ide.eclipse.as.wtp.core, + org.jboss.ide.eclipse.as.wtp.ui, org.eclipse.emf.common;bundle-version=3D"2.5.0", org.eclipse.emf.ecore;bundle-version=3D"2.5.0" Bundle-ActivationPolicy: lazy --===============0237543725252119139==-- From jbosstools-commits at lists.jboss.org Thu May 20 18:09:24 2010 Content-Type: multipart/mixed; boundary="===============4780065695416791736==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22227 - in trunk/tests: site and 1 other directory. Date: Thu, 20 May 2010 18:09:23 -0400 Message-ID: <201005202209.o4KM9N6u010622@svn01.web.mwc.hst.phx2.redhat.com> --===============4780065695416791736== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-20 18:09:23 -0400 (Thu, 20 May 2010) New Revision: 22227 Added: trunk/tests/site/ trunk/tests/site/pom.xml trunk/tests/site/site.xml Log: add site files Added: trunk/tests/site/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/site/pom.xml (rev 0) +++ trunk/tests/site/pom.xml 2010-05-20 22:09:23 UTC (rev 22227) @@ -0,0 +1,13 @@ + + 4.0.0 = + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + tests.site = + 0.0.1-SNAPSHOT + eclipse-update-site + Added: trunk/tests/site/site.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/site/site.xml (rev 0) +++ trunk/tests/site/site.xml 2010-05-20 22:09:23 UTC (rev 22227) @@ -0,0 +1,12 @@ + + + To install these features, point Eclipse at this site. + + + JBoss Tools tests Nightly Build Update Site: contains all f= eatures in this build. + + + + + + --===============4780065695416791736==-- From jbosstools-commits at lists.jboss.org Thu May 20 19:38:49 2010 Content-Type: multipart/mixed; boundary="===============8766499386395389672==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22228 - trunk/documentation/guides/JBDS_Release_Notes/en-US. Date: Thu, 20 May 2010 19:38:49 -0400 Message-ID: <201005202338.o4KNcnl8026385@svn01.web.mwc.hst.phx2.redhat.com> --===============8766499386395389672== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: irooskov(a)redhat.com Date: 2010-05-20 19:38:48 -0400 (Thu, 20 May 2010) New Revision: 22228 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml Log: updated with new jira JBDS-1228 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-20 22:09:23 UTC (rev 22227) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-20 23:38:48 UTC (rev 22228) @@ -174,6 +174,11 @@ + JBDS-1228= : The JBoss Developer Studio installation wizard would display inco= rrect step numbering, seeming to jump sporadically. This occured because st= eps the installer takes that are invisible to the user were still included = in the displayed step numbering on each screen. In this release the step nu= mbering has been corrected to count only the steps the user participates in. + + + + JBDS-1220= : Within the JBoss Developer Studio, the browse button that allowed= a user to select the location of the JBoss Application Server would not de= fault to the location where the JBoss Enterprise Application Platform was i= nstalled. The consequence of this was that a user would have to search for = the installed location of the JBoss Enterprise Application Platform. Though= installation of the JBoss Enterprise Application Platform is optional, if = it is installed it can be assumed that this will be the Application Server = a user will wish to use. In order to improve the user experience, when the = JBoss Enterprise Application Platform is installed, the server location bro= wse button will default to that directory. --===============8766499386395389672==-- From jbosstools-commits at lists.jboss.org Thu May 20 20:05:46 2010 Content-Type: multipart/mixed; boundary="===============6824858937451426865==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22229 - trunk/documentation/guides/JBDS_Release_Notes/en-US. Date: Thu, 20 May 2010 20:05:45 -0400 Message-ID: <201005210005.o4L05jVx003426@svn01.web.mwc.hst.phx2.redhat.com> --===============6824858937451426865== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: irooskov(a)redhat.com Date: 2010-05-20 20:05:45 -0400 (Thu, 20 May 2010) New Revision: 22229 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml Log: updated to remove jbosstools image link Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml 2010-05-= 20 23:38:48 UTC (rev 22228) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/master.xml 2010-05-= 21 00:05:45 UTC (rev 22229) @@ -13,16 +13,7 @@ = Release Notes - - - - - = - - - = - = - + = = Isaac --===============6824858937451426865==-- From jbosstools-commits at lists.jboss.org Thu May 20 20:22:12 2010 Content-Type: multipart/mixed; boundary="===============1548771178279901083==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22230 - trunk/documentation/guides/JBDS_Release_Notes/en-US. Date: Thu, 20 May 2010 20:22:12 -0400 Message-ID: <201005210022.o4L0MCp4004960@svn01.web.mwc.hst.phx2.redhat.com> --===============1548771178279901083== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: irooskov(a)redhat.com Date: 2010-05-20 20:22:11 -0400 (Thu, 20 May 2010) New Revision: 22230 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml Log: updated to make image tag close itself Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 20= 10-05-21 00:05:45 UTC (rev 22229) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Article_Info.xml 20= 10-05-21 00:22:11 UTC (rev 22230) @@ -15,8 +15,7 @@ - - + --===============1548771178279901083==-- From jbosstools-commits at lists.jboss.org Fri May 21 02:54:15 2010 Content-Type: multipart/mixed; boundary="===============6782143544470610544==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22231 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 2 other directories. Date: Fri, 21 May 2010 02:54:15 -0400 Message-ID: <201005210654.o4L6sFOJ019296@svn01.web.mwc.hst.phx2.redhat.com> --===============6782143544470610544== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-21 02:54:15 -0400 (Fri, 21 May 2010) New Revision: 22231 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/i= de/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/e= clipse/as/core/server/internal/DeployableServer.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/e= clipse/as/core/server/xpl/PublishCopyUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ecl= ipse/as/wtp/core/util/ServerModelUtilities.java Log: JBIDE-6320 - zipped deployment fail on binary child modules Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/= jboss/ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/= ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2010-05= -21 00:22:11 UTC (rev 22230) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/= ide/eclipse/archives/webtools/modules/LocalZippedPublisherUtil.java 2010-05= -21 06:54:15 UTC (rev 22231) @@ -30,6 +30,7 @@ import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehav= ior; import org.jboss.ide.eclipse.as.core.util.FileUtil; import org.jboss.ide.eclipse.as.core.util.FileUtil.IFileUtilListener; +import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities; = import de.schlichtherle.io.ArchiveDetector; = @@ -174,6 +175,21 @@ return (IStatus[]) status.toArray(new IStatus[status.size()]); } = + protected IStatus[] fullBinaryPublish(IServer server, String deployRoot, = IModule[] parent, IModule last) { + ArrayList results =3D new ArrayList(); + try { + IPath path =3D getOutputFilePath(combine(parent, last)); + path =3D path.removeLastSegments(1); + de.schlichtherle.io.File root =3D TrueZipUtil.getFile(path, TrueZipUtil= .getJarArchiveDetector()); + IModuleResource[] resources =3D getResources(last); + results.addAll(Arrays.asList(copy(root, resources))); + TrueZipUtil.umount(); + return (IStatus[]) results.toArray(new IStatus[results.size()]); + } catch( CoreException ce) { + results.add(generateCoreExceptionStatus(ce)); + return (IStatus[]) results.toArray(new IStatus[results.size()]); + } + } protected IStatus[] fullPublish(IServer server, String deployRoot, IModul= e[] module) { ArrayList results =3D new ArrayList(); try { @@ -187,8 +203,12 @@ results.addAll(Arrays.asList(copy(root, resources))); = IModule[] children =3D server.getChildModules(module, new NullProgressM= onitor()); - for( int i =3D 0; i < children.length; i++ ) = - results.addAll(Arrays.asList(fullPublish(server, deployRoot, combine(m= odule, children[i])))); + for( int i =3D 0; i < children.length; i++ ) { + if( ServerModelUtilities.isBinaryModule(children[i])) + results.addAll(Arrays.asList(fullBinaryPublish(server, deployRoot, mo= dule, children[i]))); + else + results.addAll(Arrays.asList(fullPublish(server, deployRoot, combine(= module, children[i])))); + } TrueZipUtil.umount(); return (IStatus[]) results.toArray(new IStatus[results.size()]); } catch( CoreException ce) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jbos= s/ide/eclipse/as/core/server/internal/DeployableServer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/= eclipse/as/core/server/internal/DeployableServer.java 2010-05-21 00:22:11 U= TC (rev 22230) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/= eclipse/as/core/server/internal/DeployableServer.java 2010-05-21 06:54:15 U= TC (rev 22231) @@ -30,6 +30,7 @@ import org.jboss.ide.eclipse.as.core.util.ModuleUtil; import org.jboss.ide.eclipse.as.core.util.ServerUtil; import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule; +import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities; = public class DeployableServer extends ServerDelegate implements IDeployabl= eServer { = @@ -62,11 +63,6 @@ return Status.OK_STATUS; } = - public IModule[] getChildModules(IModule[] module) { - IModule[] children =3D ModuleUtil.getChildModules(module); - return children; - } - public IModule[] getRootModules(IModule module) throws CoreException { IStatus status =3D canModifyModules(new IModule[] { module }, null= ); if (status !=3D null && !status.isOK()) @@ -77,6 +73,9 @@ return new IModule[] { module }; } = + public IModule[] getChildModules(IModule[] module) { + return ServerModelUtilities.getChildModules(module); + } = private IModule[] doGetParentModules(IModule module) { // get all supported modules @@ -86,20 +85,10 @@ ArrayList list =3D new ArrayList(); = for( int i =3D 0; i < supported.length; i++ ) { - IEnterpriseApplication jeeMod =3D (IEnterpriseApplication)supported[i].= loadAdapter(IEnterpriseApplication.class,null); - IJBTModule jbtMod =3D (IJBTModule)supported[i].loadAdapter(IJBTModule.c= lass, null); - if( jeeMod !=3D null ) { - IModule[] childs =3D jeeMod.getModules(); - for (int j =3D 0; j < childs.length; j++) { - if(childs[j].equals(module)) - list.add(supported[i]); - } - } else if( jbtMod !=3D null ) { - IModule[] childs =3D jbtMod.getModules(); - for (int j =3D 0; j < childs.length; j++) { - if(childs[j].equals(module)) - list.add(supported[i]); - } + IModule[] childs =3D ServerModelUtilities.getChildModules(supported[i]); + for (int j =3D 0; j < childs.length; j++) { + if(childs[j].equals(module)) + list.add(supported[i]); } } return list.toArray(new IModule[list.size()]); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jbos= s/ide/eclipse/as/core/server/xpl/PublishCopyUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/= eclipse/as/core/server/xpl/PublishCopyUtil.java 2010-05-21 00:22:11 UTC (re= v 22230) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/= eclipse/as/core/server/xpl/PublishCopyUtil.java 2010-05-21 06:54:15 UTC (re= v 22231) @@ -540,8 +540,13 @@ List status =3D new ArrayList(2); if (resource instanceof IModuleFolder) { IModuleFolder folder =3D (IModuleFolder) resource; - IStatus[] stat =3D publishFull(folder.members(), path, monitor); - addArrayToList(status, stat); + IModuleResource[] children =3D folder.members(); + if( children.length =3D=3D 0 ) + handler.makeDirectoryIfRequired(folder.getModuleRelativePath().append(= folder.getName()), monitor); = + else { + IStatus[] stat =3D publishFull(children, path, monitor); + addArrayToList(status, stat); + } } else { IModuleFile mf =3D (IModuleFile) resource; path =3D path.append(mf.getModuleRelativePath()).append(name); Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/= ide/eclipse/as/wtp/core/util/ServerModelUtilities.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/util/ServerModelUtilities.java 2010-05-21 00:22:11 UTC (r= ev 22230) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/ec= lipse/as/wtp/core/util/ServerModelUtilities.java 2010-05-21 06:54:15 UTC (r= ev 22231) @@ -15,6 +15,7 @@ = import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jst.server.core.IEnterpriseApplication; +import org.eclipse.jst.server.core.IJ2EEModule; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule; @@ -47,17 +48,31 @@ } = public static IModule[] getChildModules(IModule[] module) { - int last =3D module.length-1; - if (module[last] !=3D null && module[last].getModuleType() !=3D null) { - IEnterpriseApplication enterpriseApplication =3D (IEnterpriseApplicatio= n) module[last] - .loadAdapter(IEnterpriseApplication.class, n= ull); - if( enterpriseApplication !=3D null ) - return enterpriseApplication.getModules() =3D=3D null ? new IModule[]{= } : enterpriseApplication.getModules(); - = - IJBTModule jbtMod =3D (IJBTModule)module[last].loadAdapter(IJBTModule.c= lass, null); - if( jbtMod !=3D null ) - return jbtMod.getModules(); - } + int last =3D module.length -1; + if( module[last] !=3D null && module[last].getModuleType() !=3D null) + return getChildModules(module[last]); return new IModule[0]; } + = + public static IModule[] getChildModules(IModule module) { + IEnterpriseApplication enterpriseApplication =3D (IEnterpriseApplication= ) = + module.loadAdapter(IEnterpriseApplication.cla= ss, null); + if( enterpriseApplication !=3D null ) + return enterpriseApplication.getModules() =3D=3D null ? new IModule[]{}= : enterpriseApplication.getModules(); + = + IJBTModule jbtMod =3D (IJBTModule)module.loadAdapter(IJBTModule.class, n= ull); + if( jbtMod !=3D null ) + return jbtMod.getModules(); + return new IModule[0]; + } + = + public static boolean isBinaryModule(IModule module) { + IJ2EEModule jee =3D (IJ2EEModule) module.loadAdapter(IJ2EEModule.class, = null); + if( jee !=3D null ) + return jee.isBinary(); + IJBTModule jbtMod =3D (IJBTModule)module.loadAdapter(IJBTModule.class, n= ull); + if( jbtMod !=3D null ) + return jbtMod.isBinary(); + return false; + } } --===============6782143544470610544==-- From jbosstools-commits at lists.jboss.org Fri May 21 03:19:18 2010 Content-Type: multipart/mixed; boundary="===============1375234417731244683==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22232 - in trunk/bpel/tests: org.jboss.tools.bpel.ui.bot.test and 20 other directories. Date: Fri, 21 May 2010 03:19:18 -0400 Message-ID: <201005210719.o4L7JIBl027778@svn01.web.mwc.hst.phx2.redhat.com> --===============1375234417731244683== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Grid.Qian Date: 2010-05-21 03:19:17 -0400 (Fri, 21 May 2010) New Revision: 22232 Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.settings/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.settings/org.eclipse.= jdt.core.prefs trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/org/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/org/jboss/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/org/jboss/tools/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/org/jboss/tools/bp= el/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/org/jboss/tools/bp= el/ui/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/org/jboss/tools/bp= el/ui/bot/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/org/jboss/tools/bp= el/ui/bot/test/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/org/jboss/tools/bp= el/ui/bot/test/Activator.class trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/org/jboss/tools/bp= el/ui/bot/test/wizard/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/org/jboss/tools/bp= el/ui/bot/test/wizard/NewWizardTest.class trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/build.properties trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bp= el/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bp= el/ui/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bp= el/ui/bot/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bp= el/ui/bot/test/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bp= el/ui/bot/test/Activator.java trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bp= el/ui/bot/test/wizard/ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bp= el/ui/bot/test/wizard/NewWizardTest.java Log: JBIDE-6154: add the swtbot test for this issue Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath = (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath 2010-05-21= 07:19:17 UTC (rev 22232) @@ -0,0 +1,7 @@ + + + + + + + Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project = (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project 2010-05-21 0= 7:19:17 UTC (rev 22232) @@ -0,0 +1,28 @@ + + + org.jboss.tools.bpel.ui.bot.test + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.pde.PluginNature + org.eclipse.jdt.core.javanature + + Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.settings/org.ecli= pse.jdt.core.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.settings/org.eclipse= .jdt.core.prefs (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.settings/org.eclipse= .jdt.core.prefs 2010-05-21 07:19:17 UTC (rev 22232) @@ -0,0 +1,8 @@ +#Tue May 18 12:03:11 CST 2010 +eclipse.preferences.version=3D1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5 +org.eclipse.jdt.core.compiler.compliance=3D1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror +org.eclipse.jdt.core.compiler.problem.enumIdentifier=3Derror +org.eclipse.jdt.core.compiler.source=3D1.5 Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.= MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF = (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/META-INF/MANIFEST.MF = 2010-05-21 07:19:17 UTC (rev 22232) @@ -0,0 +1,16 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: org.jboss.tools.bpel.ui.bot.test +Bundle-SymbolicName: org.jboss.tools.bpel.ui.bot.test +Bundle-Version: 1.0.0.qualifier +Bundle-Activator: org.jboss.tools.bpel.ui.bot.test.Activator +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.swtbot.eclipse.core, + org.eclipse.swtbot.eclipse.finder, + org.eclipse.swtbot.swt.finder, + org.junit, + org.eclipse.core.resources +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-Vendor: JBoss by Red Hat Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/org/jboss/tool= s/bpel/ui/bot/test/Activator.class =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/= org/jboss/tools/bpel/ui/bot/test/Activator.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/org/jboss/tool= s/bpel/ui/bot/test/wizard/NewWizardTest.class =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/bin/= org/jboss/tools/bpel/ui/bot/test/wizard/NewWizardTest.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/build.properties = (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/build.properties 2010= -05-21 07:19:17 UTC (rev 22232) @@ -0,0 +1,7 @@ +output.. =3D bin/ +bin.includes =3D .,\ + META-INF/ +source.. =3D src/ +src.includes =3D META-INF/,\ + .,\ + build.properties Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml = (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2010-05-21 07= :19:17 UTC (rev 22232) @@ -0,0 +1,14 @@ + + 4.0.0 = + + ../../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + org.jboss.tools.bpel.ui.bot.test = + 1.0.0-SNAPSHOT + eclipse-test-plugin + Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tool= s/bpel/ui/bot/test/Activator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/b= pel/ui/bot/test/Activator.java (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/b= pel/ui/bot/test/Activator.java 2010-05-21 07:19:17 UTC (rev 22232) @@ -0,0 +1,50 @@ +package org.jboss.tools.bpel.ui.bot.test; + +import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.osgi.framework.BundleContext; + +/** + * The activator class controls the plug-in life cycle + */ +public class Activator extends AbstractUIPlugin { + + // The plug-in ID + public static final String PLUGIN_ID =3D "org.jboss.tools.bpel.ui.bot.tes= t"; + + // The shared instance + private static Activator plugin; + = + /** + * The constructor + */ + public Activator() { + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.B= undleContext) + */ + public void start(BundleContext context) throws Exception { + super.start(context); + plugin =3D this; + } + + /* + * (non-Javadoc) + * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.Bu= ndleContext) + */ + public void stop(BundleContext context) throws Exception { + plugin =3D null; + super.stop(context); + } + + /** + * Returns the shared instance + * + * @return the shared instance + */ + public static Activator getDefault() { + return plugin; + } + +} Added: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tool= s/bpel/ui/bot/test/wizard/NewWizardTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/b= pel/ui/bot/test/wizard/NewWizardTest.java (rev 0) +++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/b= pel/ui/bot/test/wizard/NewWizardTest.java 2010-05-21 07:19:17 UTC (rev 2223= 2) @@ -0,0 +1,85 @@ +package org.jboss.tools.bpel.ui.bot.test.wizard; + +import java.io.BufferedInputStream; +import java.io.IOException; +import java.io.InputStream; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.Path; +import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; + +public class NewWizardTest extends TestCase{ +private static SWTWorkbenchBot bot; = +private IProject project; +protected void setUp() throws Exception { + bot =3D new SWTWorkbenchBot(); = + bot.viewByTitle("Welcome").close(); = +} +public void testNewWizard() throws IOException, CoreException{ + createBPELProject(); + createBPELFile(); +} + +private void createBPELFile() throws IOException, CoreException { + bot.menu("File").menu("New").menu("Other...").click(); + bot.shell("New").activate(); + SWTBotTree tree =3D bot.tree(); + tree.expandNode("BPEL 2.0").expandNode("New BPEL Process File").select(); + assertTrue(bot.button("Next >").isEnabled()); + bot.button("Next >").click(); + = + assertFalse(bot.button("Next >").isEnabled()); + = + bot.textWithLabel("BPEL Process Name:").setText("a"); = + bot.comboBoxWithLabel("Namespace:").setText("http://eclipse.org/bpel/s= ample"); = + bot.comboBoxWithLabel("Template:").setSelection(2); = + assertTrue(bot.button("Next >").isEnabled()); + bot.button("Next >").click(); + assertEquals("a", bot.textWithLabel("Service Name").getText()); + bot.button("Finish").click(); + bot.sleep(10000); + = + IFile bpelFile =3D project.getFile( new Path("bpelContent/a.bpel")); + assertNotNull(bpelFile); + IFile wsdlFile =3D project.getFile( new Path("bpelContent/aArtifacts.w= sdl")); + assertNotNull(wsdlFile); = + = + String con =3D getContents(wsdlFile.getContents(),wsdlFile); + assertTrue(con.contains("tns:aBinding")); +} +private void createBPELProject() { + bot.menu("File").menu("New").menu("Project...").click(); + bot.shell("New Project").activate(); + SWTBotTree tree =3D bot.tree(); + tree.expandNode("BPEL 2.0").expandNode("BPEL Project").select(); + assertTrue(bot.button("Next >").isEnabled()); + bot.button("Next >").click(); + bot.shell("New BPEL Project").activate(); + assertFalse(bot.button("Finish").isEnabled()); + = + bot.textWithLabel("Project name:").setText("A"); = + assertTrue(bot.button("Finish").isEnabled()); + bot.button("Finish").click(); + bot.sleep(10000); + project =3D ResourcesPlugin.getWorkspace().getRoot().getProject("A"); + assertNotNull(project); +} +protected void tearDown() throws Exception { + bot =3D null; +} + +protected String getContents(InputStream is, IFile file) throws IOExceptio= n { + BufferedInputStream bis =3D new BufferedInputStream(is); + int l =3D (int)file.getLocation().toFile().length(); + byte[] bs =3D new byte[l]; + l =3D bis.read(bs, 0, l); + bis.close(); + return new String(bs); +} +} --===============1375234417731244683==-- From jbosstools-commits at lists.jboss.org Fri May 21 04:54:00 2010 Content-Type: multipart/mixed; boundary="===============4043764549643518111==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22233 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF. Date: Fri, 21 May 2010 04:54:00 -0400 Message-ID: <201005210854.o4L8s094012170@svn01.web.mwc.hst.phx2.redhat.com> --===============4043764549643518111== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vpakan(a)redhat.com Date: 2010-05-21 04:54:00 -0400 (Fri, 21 May 2010) New Revision: 22233 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF Log: Remove not used plugins from Plugins Dependencies Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST= .MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF 20= 10-05-21 07:19:17 UTC (rev 22232) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/META-INF/MANIFEST.MF 20= 10-05-21 08:54:00 UTC (rev 22233) @@ -11,8 +11,6 @@ org.eclipse.swtbot.swt.finder;bundle-version=3D"2.0.0", org.apache.log4j;bundle-version=3D"1.2.13", org.junit4;bundle-version=3D"4.5.0", - org.eclipse.swtbot.eclipse.spy;bundle-version=3D"2.0.0", - org.eclipse.swtbot.eclipse.ui;bundle-version=3D"2.0.0", org.eclipse.swtbot.junit4_x;bundle-version=3D"2.0.0", org.jboss.tools.ui.bot.ext Bundle-ActivationPolicy: lazy --===============4043764549643518111==-- From jbosstools-commits at lists.jboss.org Fri May 21 07:19:52 2010 Content-Type: multipart/mixed; boundary="===============4098477640547536501==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22234 - trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/defects. Date: Fri, 21 May 2010 07:19:52 -0400 Message-ID: <201005211119.o4LBJqP7013653@svn01.web.mwc.hst.phx2.redhat.com> --===============4098477640547536501== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-21 07:19:52 -0400 (Fri, 21 May 2010) New Revision: 22234 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/a= s/test/defects/DefectTest.java Log: JBDS-1207 test for trunk Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/ec= lipse/as/test/defects/DefectTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/= as/test/defects/DefectTest.java 2010-05-21 08:54:00 UTC (rev 22233) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/= as/test/defects/DefectTest.java 2010-05-21 11:19:52 UTC (rev 22234) @@ -1,7 +1,12 @@ package org.jboss.ide.eclipse.as.test.defects; = +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + import junit.framework.TestCase; = +import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -12,18 +17,30 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jst.j2ee.application.internal.operations.AddComponentTo= EnterpriseApplicationDataModelProvider; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateRe= ferenceComponentsDataModelProperties; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualArch= iveComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerWorkingCopy; import org.eclipse.wst.server.core.ServerUtil; +import org.eclipse.wst.server.core.model.IModuleFile; +import org.eclipse.wst.server.core.model.IModuleFolder; +import org.eclipse.wst.server.core.model.IModuleResource; +import org.eclipse.wst.server.core.model.ModuleDelegate; import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer; import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils; import org.jboss.ide.eclipse.as.test.util.wtp.CreateProjectOperationsUtili= ty; import org.jboss.ide.eclipse.as.test.util.wtp.JavaEEFacetConstants; import org.jboss.ide.eclipse.as.test.util.wtp.OperationTestCase; +import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil; = public class DefectTest extends TestCase { public void testJBIDE6184_Odd_Republish_Error() throws Exception { @@ -108,8 +125,80 @@ assertTrue(earPath.append("d2.war").append("META-INF").toFile().exists()= ); assertTrue(earPath.append("d2.war").append("META-INF").append("MANIFEST.= MF").toFile().exists()); assertTrue(earPath.append("d2.war").append("WEB-INF").append("web.xml").= toFile().exists()); + } + = + //wtp305306_patchBuildTest + public void testEAR50_WithVariableReference() throws Exception { + IDataModel dm =3D ProjectCreationUtil.getEARDataModel("pEAR", "ourConten= t", null, null, + JavaEEFacetConstants.EAR_5, false); + OperationTestCase.runAndVerify(dm); + IProject p =3D ResourcesPlugin.getWorkspace().getRoot() + .getProject("pEAR"); + if (p !=3D null && p.exists()) { + try { + IVirtualComponent vc =3D ComponentCore.createComponent(p); + addArchiveComponent(vc); + // now verify + IModule module =3D ServerUtil.getModule(p); + assertNotNull(module); + ModuleDelegate md =3D (ModuleDelegate) module.loadAdapter( + ModuleDelegate.class, new NullProgressMonitor()); + IModuleResource[] resources =3D md.members(); + + // Currently intended to fail, = + boolean shouldFail =3D true; + if( shouldFail) { + assertEquals(0, resources.length); + } else { + assertEquals(1, resources.length); + assertEquals(1, ((IModuleFolder) resources[0]).members().length); + assertTrue(((IModuleFolder) resources[0]).members()[0] instanceof IMo= duleFile); + IModuleFile junitjar =3D (IModuleFile) ((IModuleFolder) resources[0]) + .members()[0]; + assertEquals("junit.jar", junitjar.getName()); + } + } catch (CoreException ce) { + ce.printStackTrace(); + } + } + } = - = + public void addArchiveComponent(IVirtualComponent component) + throws CoreException { + + IPath path =3D new Path("JUNIT_HOME/junit.jar"); //$NON-NLS-1$ + IPath resolvedPath =3D JavaCore.getResolvedVariablePath(path); + java.io.File file =3D new java.io.File(resolvedPath.toOSString()); + if (file.isFile() && file.exists()) { + String type =3D VirtualArchiveComponent.VARARCHIVETYPE + + IPath.SEPARATOR; + IVirtualComponent archive =3D ComponentCore.createArchiveComponent( + component.getProject(), type + path.toString()); + IDataModelProvider provider =3D new AddComponentToEnterpriseApplication= DataModelProvider(); + IDataModel dm =3D DataModelFactory.createDataModel(provider); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COM= PONENT, + component); + dm.setProperty( ICreateReferenceComponentsDataModelProperties.TARGET_CO= MPONENT_LIST, + Arrays.asList(archive)); + Map uriMap =3D new HashMap(); + uriMap.put(archive, "junit.jar"); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COM= PONENTS_TO_URI_MAP, + uriMap); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COM= PONENTS_DEPLOY_PATH, + "/lib"); + IStatus stat =3D dm.validateProperty( + ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST); + if (!stat.isOK()) + throw new CoreException(stat); + try { + dm.getDefaultOperation().execute(new NullProgressMonitor(), + null); + } catch (ExecutionException e) { + throw new CoreException(new Status(IStatus.ERROR, "test", e + .getMessage())); + } + + } } = protected IModule[] getModule(IProject p) { --===============4098477640547536501==-- From jbosstools-commits at lists.jboss.org Fri May 21 07:31:52 2010 Content-Type: multipart/mixed; boundary="===============1066033223209032527==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22235 - in branches/jbosstools-3.1.x/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test: defects and 1 other directory. Date: Fri, 21 May 2010 07:31:52 -0400 Message-ID: <201005211131.o4LBVqdC015094@svn01.web.mwc.hst.phx2.redhat.com> --===============1066033223209032527== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-21 07:31:51 -0400 (Fri, 21 May 2010) New Revision: 22235 Added: branches/jbosstools-3.1.x/as/tests/org.jboss.ide.eclipse.as.test/src/org= /jboss/ide/eclipse/as/test/defects/ branches/jbosstools-3.1.x/as/tests/org.jboss.ide.eclipse.as.test/src/org= /jboss/ide/eclipse/as/test/defects/DefectTest.java Log: JBDS-1207 - a test to verify it works Added: branches/jbosstools-3.1.x/as/tests/org.jboss.ide.eclipse.as.test/src= /org/jboss/ide/eclipse/as/test/defects/DefectTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/as/tests/org.jboss.ide.eclipse.as.test/src/or= g/jboss/ide/eclipse/as/test/defects/DefectTest.java = (rev 0) +++ branches/jbosstools-3.1.x/as/tests/org.jboss.ide.eclipse.as.test/src/or= g/jboss/ide/eclipse/as/test/defects/DefectTest.java 2010-05-21 11:31:51 UTC= (rev 22235) @@ -0,0 +1,112 @@ +package org.jboss.ide.eclipse.as.test.defects; + +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + +import junit.framework.TestCase; + +import org.eclipse.core.commands.ExecutionException; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Status; +import org.eclipse.jdt.core.JavaCore; +import org.eclipse.jst.j2ee.application.internal.operations.AddComponentTo= EnterpriseApplicationDataModelProvider; +import org.eclipse.wst.common.componentcore.ComponentCore; +import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateRe= ferenceComponentsDataModelProperties; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualArch= iveComponent; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.ServerUtil; +import org.eclipse.wst.server.core.model.IModuleFile; +import org.eclipse.wst.server.core.model.IModuleFolder; +import org.eclipse.wst.server.core.model.IModuleResource; +import org.eclipse.wst.server.core.model.ModuleDelegate; +import org.jboss.ide.eclipse.as.test.util.wtp.JavaEEFacetConstants; +import org.jboss.ide.eclipse.as.test.util.wtp.OperationTestCase; +import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil; + +public class DefectTest extends TestCase { + //wtp305306_patchBuildTest + public void testEAR50_WithVariableReference() throws Exception { + IDataModel dm =3D ProjectCreationUtil.getEARDataModel("pEAR", "ourConten= t", null, null, + JavaEEFacetConstants.EAR_5, false); + OperationTestCase.runAndVerify(dm); + IProject p =3D ResourcesPlugin.getWorkspace().getRoot() + .getProject("pEAR"); + if (p !=3D null && p.exists()) { + try { + IVirtualComponent vc =3D ComponentCore.createComponent(p); + addArchiveComponent(vc); + // now verify + IModule module =3D ServerUtil.getModule(p); + assertNotNull(module); + ModuleDelegate md =3D (ModuleDelegate) module.loadAdapter( + ModuleDelegate.class, new NullProgressMonitor()); + IModuleResource[] resources =3D md.members(); + + assertEquals(1, resources.length); + assertEquals(1, ((IModuleFolder) resources[0]).members().length); + assertTrue(((IModuleFolder) resources[0]).members()[0] instanceof IMod= uleFile); + IModuleFile junitjar =3D (IModuleFile) ((IModuleFolder) resources[0]) + .members()[0]; + assertEquals("junit.jar", junitjar.getName()); + } catch (CoreException ce) { + ce.printStackTrace(); + } + } + } + = + public void addArchiveComponent(IVirtualComponent component) + throws CoreException { + + IPath path =3D new Path("JUNIT_HOME/junit.jar"); //$NON-NLS-1$ + IPath resolvedPath =3D JavaCore.getResolvedVariablePath(path); + java.io.File file =3D new java.io.File(resolvedPath.toOSString()); + if (file.isFile() && file.exists()) { + String type =3D VirtualArchiveComponent.VARARCHIVETYPE + + IPath.SEPARATOR; + IVirtualComponent archive =3D ComponentCore.createArchiveComponent( + component.getProject(), type + path.toString()); + IDataModelProvider provider =3D new AddComponentToEnterpriseApplication= DataModelProvider(); + IDataModel dm =3D DataModelFactory.createDataModel(provider); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COM= PONENT, + component); + dm.setProperty( ICreateReferenceComponentsDataModelProperties.TARGET_CO= MPONENT_LIST, + Arrays.asList(archive)); + Map uriMap =3D new HashMap(); + uriMap.put(archive, "junit.jar"); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COM= PONENTS_TO_URI_MAP, + uriMap); + dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COM= PONENTS_DEPLOY_PATH, + "/lib"); + IStatus stat =3D dm.validateProperty( + ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST); + if (!stat.isOK()) + throw new CoreException(stat); + try { + dm.getDefaultOperation().execute(new NullProgressMonitor(), + null); + } catch (ExecutionException e) { + throw new CoreException(new Status(IStatus.ERROR, "test", e + .getMessage())); + } + + } + } + = + protected IModule[] getModule(IProject p) { + return new IModule[]{ServerUtil.getModule(p)}; + } + protected IProject findProject(String name) { + return ResourcesPlugin.getWorkspace().getRoot().getProject(name); + } +} --===============1066033223209032527==-- From jbosstools-commits at lists.jboss.org Fri May 21 09:10:34 2010 Content-Type: multipart/mixed; boundary="===============2521699789679408778==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22236 - in trunk/bpel/docs/reference/en-US: images/reference and 1 other directories. Date: Fri, 21 May 2010 09:10:34 -0400 Message-ID: <201005211310.o4LDAYYb005707@svn01.web.mwc.hst.phx2.redhat.com> --===============2521699789679408778== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-21 09:10:34 -0400 (Fri, 21 May 2010) New Revision: 22236 Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_13.png trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_2a.png Modified: trunk/bpel/docs/reference/en-US/master.xml trunk/bpel/docs/reference/en-US/modules/detail.xml trunk/bpel/docs/reference/en-US/modules/reference.xml Log:

https://jira.jboss.org/browse/TOOLSDOC-23 - Created Reference chapter,ad= ded description of different BPEL wizards and editors.

Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_13.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_13.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/reference/bpel_ref_2a.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/reference/bpel_= ref_2a.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/bpel/docs/reference/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/docs/reference/en-US/master.xml 2010-05-21 11:31:51 UTC (rev= 22235) +++ trunk/bpel/docs/reference/en-US/master.xml 2010-05-21 13:10:34 UTC (rev= 22236) @@ -7,7 +7,7 @@ - + ]> = @@ -51,4 +51,5 @@ &detail; &deploy; &reference; + &summary; = Modified: trunk/bpel/docs/reference/en-US/modules/detail.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/docs/reference/en-US/modules/detail.xml 2010-05-21 11:31:51 = UTC (rev 22235) +++ trunk/bpel/docs/reference/en-US/modules/detail.xml 2010-05-21 13:10:34 = UTC (rev 22236) @@ -2,7 +2,11 @@ Creating and editing a BPEL project In the chapter we describe the necessary steps to create a new B= PEL project and edit the BPEL files. - First of all, you should create a BPEL project. + Here and further in the guide we will create + a simple echo example, used to respond to a sent message with a + modified version of the request message being returned in a respon= se. + First of all, you should create a BPEL project. + =
Creating a BPEL project Modified: trunk/bpel/docs/reference/en-US/modules/reference.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/docs/reference/en-US/modules/reference.xml 2010-05-21 11:31:= 51 UTC (rev 22235) +++ trunk/bpel/docs/reference/en-US/modules/reference.xml 2010-05-21 13:10:= 34 UTC (rev 22236) @@ -41,6 +41,23 @@
+ Apache ODE Deployment Descriptor Wizard + Using this wizard user can create ODE deployment descrip= tor (deploy.xml) and place it in the temporary directory.It is available wi= th clicking + File->New->Other->Apache ODE Deployment Descript= or Wizard in the menu bar. +
+ New BPEL Project Wizard + + + + + +
+ On the page you can adjust the name of the deployment de= scriptor and + the directory where it will be created.Note,that you shoul= d use + /PROJECT_NAME/bpelContent directory as an o= utput one. + = +
+
New BPEL Process file Wizard Using New BPEL Process file Wizard user can create BPEL process file and WSDL file if it is n= ecessary. @@ -229,7 +246,7 @@ If the user wants to disable/unable validation he ca= n do it by following Window->Preferences->Validation.<= /para>
- Validation error in Source tab + Validation configuration @@ -238,6 +255,129 @@
=
+
+ ODE Deployment Descriptor Editor + To deploy your process in Ode you need to create a + simple deployment descriptor with basic information and + ODE Deployment Descriptor Editor facili= tates the process of descriptor configuration. + You can see how the descriptor file,opened in the editor loo= ks like on the picture below: + +
+ ODE Deployment Descriptor Editor + + + + + +
= + The table below describes the configuration options of the + ODE Deployment Descriptor Editor: + + ODE Deployment Descriptor Editor.Options. = + + + + + = + + + Section = + Options + Description + + + + + = + General + = + This process is + Select one of the provided options: = + + + activated = + + + + deactivated + + + retired = + + + + = + = + Run this process in memory + for performance purposes, + you can define the process as being = + executed only in-memory. + + = + + Inbound Interfaces(Services) + Associated Port + Click Associated Port and the dropdown li= st with all available port names will appear. + Select the one you need ,other fields will b= e filled automatically. + This action configure the services + provided by the process and = + bind each service to an endpoint + + = + = + = + + Outbound Interfaces(Invokes) + Associated Port + Click Associated Port and the dropdown li= st with all available port names will appear. + Select the one you need, other fields will b= e filled automatically. + This action configure the services + invoked by the process + + + Process-level Monitoring Events + + + None + + + + All + + + + + Selected: + + + Instance life cycle<= /para> + Activity life cycle<= /para> + Data handling= + Scope handling + Correlation + = + + = + + + + Using ODE's deployment descriptor, it's a= lso = + possible to make events generation to = + filtrate which ones get created. + All option just duplicates the default beha= viour, + when nothing is specified in the deployment.= + + + Scope-level Monitoring Events + Scope + This section makes it possible to + define filtering for each scope of your proc= ess. + + + + +
+
= = --===============2521699789679408778==-- From jbosstools-commits at lists.jboss.org Fri May 21 09:40:30 2010 Content-Type: multipart/mixed; boundary="===============6294710909833447724==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22237 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory. Date: Fri, 21 May 2010 09:40:29 -0400 Message-ID: <201005211340.o4LDeT2q009183@svn01.web.mwc.hst.phx2.redhat.com> --===============6294710909833447724== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-21 09:40:29 -0400 (Fri, 21 May 2010) New Revision: 22237 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/InjectionPointParameter.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/BeanMethod.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/CDIProject.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/ProducerMethod.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/MethodDefinition.java Log: https://jira.jboss.org/browse/JBIDE-6310 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/BeanMethod.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanMethod.java 2010-05-21 13:10:34 UTC (rev 22236) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanMethod.java 2010-05-21 13:40:29 UTC (rev 22237) @@ -41,13 +41,17 @@ = List ps =3D definition.getParameters(); for (ParameterDefinition p: ps) { - Parameter parameter =3D new Parameter(); + Parameter parameter =3D newParameter(); parameter.setBeanMethod(this); parameter.setDefinition(p); parameters.add(parameter); } } = + protected Parameter newParameter() { + return new Parameter(); + } + public IMethod getMethod() { return method; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/CDIProject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/CDIProject.java 2010-05-21 13:10:34 UTC (rev 22236) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/CDIProject.java 2010-05-21 13:40:29 UTC (rev 22237) @@ -44,6 +44,7 @@ import org.jboss.tools.cdi.core.IParameter; import org.jboss.tools.cdi.core.IProducer; import org.jboss.tools.cdi.core.IProducerMethod; +import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.core.IQualifierDeclaration; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinit= ion; @@ -245,8 +246,19 @@ if(type =3D=3D null) { return result; } + = + boolean isParameter =3D injectionPoints instanceof InjectionPointParamet= er; = Set qs =3D injectionPoints.getQualifierDeclaratio= ns(); + List qs2 =3D null; + if(isParameter) { + qs2 =3D new ArrayList(); + Set qs_ =3D ((InjectionPointParameter)injectionPoints).getQ= ualifiers(); + for (IQualifier q: qs_) { + IType t =3D q.getSourceType(); + if(t !=3D null) qs2.add(t); + } + } = Set beans =3D new HashSet(); synchronized(allBeans) { @@ -257,8 +269,14 @@ if(containsType(types, type)) { try { Set qsb =3D b.getQualifierDeclarations(true); - if(areMatchingQualifiers(qsb, qs)) { - result.add(b); + if(isParameter) { + if(areMatchingQualifiers(qsb, qs2.toArray(new IType[0]))) { + result.add(b); + } + } else { + if(areMatchingQualifiers(qsb, qs)) { + result.add(b); + } } } catch (CoreException e) { CDICorePlugin.getDefault().logError(e); Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/i= nternal/core/impl/InjectionPointParameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/InjectionPointParameter.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/InjectionPointParameter.java 2010-05-21 13:40:29 UTC (rev 22= 237) @@ -0,0 +1,54 @@ +/*************************************************************************= ****** = + * Copyright (c) 2007 Red Hat, Inc. = + * Distributed under license by Red Hat, Inc. All rights reserved. = + * This program is made available under the terms of the = + * Eclipse Public License v1.0 which accompanies this distribution, = + * and is available at http://www.eclipse.org/legal/epl-v10.html = + * = + * Contributors: = + * Red Hat, Inc. - initial API and implementation = + *************************************************************************= *****/ = +package org.jboss.tools.cdi.internal.core.impl; + +import java.util.HashSet; +import java.util.Set; + +import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.IAnnotationDeclaration; +import org.jboss.tools.cdi.core.IInjectionPointParameter; +import org.jboss.tools.cdi.core.IQualifier; +import org.jboss.tools.cdi.core.IQualifierDeclaration; + +/** + * = + * @author Viacheslav Kabanovich + * + */ +public class InjectionPointParameter extends Parameter implements + IInjectionPointParameter { + + public IAnnotationDeclaration getDelegateAnnotation() { + return null; + } + + public Set getQualifierDeclarations() { + Set result =3D new HashSet= (); + //cannot implement + return result; + } + + public Set getQualifiers() { + Set result =3D new HashSet(); + Set as =3D getAnnotationTypes(); + for (String s: as) { + IQualifier q =3D getCDIProject().getQualifier(s); + if (q !=3D null) result.add(q); + } + return result; + } + + public boolean isDelegate() { + return isAnnotationPresent(CDIConstants.DELEGATE_STEREOTYPE_TYPE_NAME); + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jbo= ss/tools/cdi/internal/core/impl/InjectionPointParameter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/ProducerMethod.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ProducerMethod.java 2010-05-21 13:10:34 UTC (rev 22236) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ProducerMethod.java 2010-05-21 13:40:29 UTC (rev 22237) @@ -22,6 +22,7 @@ import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IParametedType; +import org.jboss.tools.cdi.core.IParameter; import org.jboss.tools.cdi.core.IProducerMethod; import org.jboss.tools.cdi.core.IScope; import org.jboss.tools.cdi.core.IScopeDeclaration; @@ -50,6 +51,10 @@ produces =3D definition.getProducesAnnotation(); } = + protected Parameter newParameter() { + return new InjectionPointParameter(); + } + public Set getAllTypeDeclarations() { Set result =3D new HashSet(); if(typeDeclaration !=3D null && typeDeclaration.getStartPosition() > 0) { @@ -67,7 +72,13 @@ } = public Set getInjectionPoints() { - return new HashSet(); + HashSet result =3D new HashSet(); + for (IParameter p: parameters) { + if(p instanceof IInjectionPoint) { + result.add((IInjectionPoint)p); + } + } + return result; } = public Set getLegalTypes() { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/MethodDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-21 13:10:34 UTC (re= v 22236) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-21 13:40:29 UTC (re= v 22237) @@ -12,6 +12,7 @@ = import java.util.ArrayList; import java.util.List; +import java.util.StringTokenizer; = import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IMethod; @@ -59,6 +60,7 @@ = void loadParamDefinitions(IType contextType, DefinitionContext context) t= hrows CoreException { if(method =3D=3D null) return; + boolean isProducer =3D getProducesAnnotation() !=3D null; String[] parameterNames =3D method.getParameterNames(); if(parameterNames =3D=3D null || parameterNames.length =3D=3D 0) return; if(contextType =3D=3D null || contextType.isBinary()) return; @@ -78,7 +80,7 @@ int start =3D paramStart + 1; = for (int i =3D 0; i < params.length; i++) { - if(params[i].indexOf('@') < 0) { + if(params[i].indexOf('@') < 0 && !isProducer) { start +=3D params[i].length() + 1; continue; //do not need parameters without annotation } @@ -91,14 +93,19 @@ pd.name =3D parameterNames[i]; pd.index =3D i; pd.type =3D type; + = + String p =3D params[i].trim(); + int pi =3D params[i].indexOf(p); + = ValueInfo v =3D new ValueInfo(); v.setValue(params[i]); - v.valueStartPosition =3D start; - v.valueLength =3D params[i].length(); + v.valueStartPosition =3D start + pi; + v.valueLength =3D p.length(); pd.setPosition(v); = - String[] tokens =3D params[i].split(" "); - for (String q: tokens) { + StringTokenizer tokens =3D new StringTokenizer(p, " \r\n\t"); + while (tokens.hasMoreElements()) { + String q =3D tokens.nextToken(); if(!q.startsWith("@")) continue; v =3D new ValueInfo(); v.setValue(q); --===============6294710909833447724==-- From jbosstools-commits at lists.jboss.org Fri May 21 09:57:35 2010 Content-Type: multipart/mixed; boundary="===============6674558023718562743==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22238 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck. Date: Fri, 21 May 2010 09:57:35 -0400 Message-ID: <201005211357.o4LDvZ7R010710@svn01.web.mwc.hst.phx2.redhat.com> --===============6674558023718562743== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-21 09:57:34 -0400 (Fri, 21 May 2010) New Revision: 22238 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ProducerMethodDefinitionTest.java Log: https://jira.jboss.org/browse/JBIDE-6310 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ProducerMethodDefinitionTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ProducerMethodDefinitionTest.java 2010-05-21 13:40:29 UTC (rev= 22237) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ProducerMethodDefinitionTest.java 2010-05-21 13:57:34 UTC (rev= 22238) @@ -33,8 +33,8 @@ Set injections =3D bean.getInjectionPoints(); assertEquals("Wrong number of injection points in the producer.", 2, inj= ections.size()); // TODO use real location for injection points. - assertLocationEquals(injections, 0, 0); - assertLocationEquals(injections, 0, 0); + assertLocationEquals(injections, 1287, 29); + assertLocationEquals(injections, 1328, 19); } = // TODO continue implementing producer tests. --===============6674558023718562743==-- From jbosstools-commits at lists.jboss.org Fri May 21 10:05:04 2010 Content-Type: multipart/mixed; boundary="===============5438070931015066126==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22239 - trunk/jsf/docs/userguide/en-US/images/visual_page. Date: Fri, 21 May 2010 10:05:04 -0400 Message-ID: <201005211405.o4LE54QN017951@svn01.web.mwc.hst.phx2.redhat.com> --===============5438070931015066126== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-21 10:05:03 -0400 (Fri, 21 May 2010) New Revision: 22239 Added: trunk/jsf/docs/userguide/en-US/images/visual_page/validation_error.png Log: https://jira.jboss.org/browse/TOOLSDOC-8 - new images for the "Visual Templ= ates" section. Added: trunk/jsf/docs/userguide/en-US/images/visual_page/validation_error.p= ng =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en-US/images/visual_page/vali= dation_error.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============5438070931015066126==-- From jbosstools-commits at lists.jboss.org Fri May 21 10:06:32 2010 Content-Type: multipart/mixed; boundary="===============4833662780468179999==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22240 - trunk/jsf/docs/userguide/en-US/images/visual_page. Date: Fri, 21 May 2010 10:06:32 -0400 Message-ID: <201005211406.o4LE6WO9018321@svn01.web.mwc.hst.phx2.redhat.com> --===============4833662780468179999== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-21 10:06:31 -0400 (Fri, 21 May 2010) New Revision: 22240 Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_7a.png trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_7b.png trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_7c.png Log: https://jira.jboss.org/browse/TOOLSDOC-8 - updated images for the "Visual T= emplates" section. Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_7a.= png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_7b.= png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_7c.= png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============4833662780468179999==-- From jbosstools-commits at lists.jboss.org Fri May 21 10:07:17 2010 Content-Type: multipart/mixed; boundary="===============9209582060586064896==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22241 - trunk/jsf/docs/userguide/en-US/images/preferences. Date: Fri, 21 May 2010 10:07:15 -0400 Message-ID: <201005211407.o4LE7FeQ018341@svn01.web.mwc.hst.phx2.redhat.com> --===============9209582060586064896== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-21 10:07:15 -0400 (Fri, 21 May 2010) New Revision: 22241 Added: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_8a.png Log: https://jira.jboss.org/browse/TOOLSDOC-8 - add new image for the "VPE Code = Templates" section. Added: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_8a.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en-US/images/preferences/pref= erences_8a.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============9209582060586064896==-- From jbosstools-commits at lists.jboss.org Fri May 21 10:07:40 2010 Content-Type: multipart/mixed; boundary="===============5635116596728117997==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22242 - in branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core: internal/project/facet and 1 other directory. Date: Fri, 21 May 2010 10:07:39 -0400 Message-ID: <201005211407.o4LE7d9Z018354@svn01.web.mwc.hst.phx2.redhat.com> --===============5635116596728117997== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-21 10:07:39 -0400 (Fri, 21 May 2010) New Revision: 22242 Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/s= rc/org/jboss/tools/portlet/core/PortletCoreActivator.java branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/s= rc/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInsta= llDelegate.java branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/s= rc/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallLi= stener.java Log: https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds rich= faces fragments to web.xml Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .core/src/org/jboss/tools/portlet/core/PortletCoreActivator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/PortletCoreActivator.java 2010-05-21 14:07= :15 UTC (rev 22241) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/PortletCoreActivator.java 2010-05-21 14:07= :39 UTC (rev 22242) @@ -38,6 +38,9 @@ public static final String CHECK_RUNTIMES =3D "checkRuntimes"; //$NON-NLS= -1$ public static final boolean DEFAULT_CHECK_RUNTIMES =3D true; = + public static final String JSFPORTLET_LIBRARY_PROVIDER =3D "jsfportlet-li= brary-provider"; //$NON-NLS-1$ + public static final String JSFPORTLETBRIDGE_LIBRARY_PROVIDER =3D "jsfport= letbridge-library-provider"; //$NON-NLS-1$ + = public static final IOverwriteQuery OVERWRITE_ALL_QUERY =3D new IOverwrit= eQuery() { public String queryOverwrite(String pathString) { return IOverwriteQuery.ALL; Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFac= etInstallDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInst= allDelegate.java 2010-05-21 14:07:15 UTC (rev 22241) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInst= allDelegate.java 2010-05-21 14:07:39 UTC (rev 22242) @@ -31,6 +31,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDel= egate; import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil; import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants; @@ -50,6 +51,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFile; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework; import org.eclipse.wst.common.project.facet.core.IDelegate; import org.eclipse.wst.common.project.facet.core.IFacetedProjectWorkingCop= y; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; @@ -62,6 +64,8 @@ import org.jboss.tools.portlet.core.JBossWebUtil25; import org.jboss.tools.portlet.core.Messages; import org.jboss.tools.portlet.core.PortletCoreActivator; +import org.jboss.tools.portlet.core.libprov.AbstractLibraryProviderInstall= OperationConfig; +import org.jboss.tools.portlet.core.libprov.JSFPortletbridgeRuntimeLibrary= ProviderInstallOperationConfig; = /** * @author snjeza @@ -69,6 +73,7 @@ */ public class JSFPortletFacetInstallDelegate implements IDelegate { = + private static final String JST_SEAM_FACET =3D "jst.seam"; //$NON-NLS-1$ private static final String ORG_JBOSS_PORTLET_STATE_MANAGER =3D "org.jbos= s.portletbridge.application.PortletStateManager"; //$NON-NLS-1$ private static final String ORG_JBOSS_PORTLET_VIEW_HANDLER =3D "org.jboss= .portletbridge.application.PortletViewHandler"; //$NON-NLS-1$ = @@ -249,7 +254,7 @@ } = private void configureWebApp(final IProject project, - final IProgressMonitor monitor, IDataModel config) { + final IProgressMonitor monitor, final IDataModel config) { final IModelProvider provider =3D PortletCoreActivator .getModelProvider(project); IPath modelPath =3D new Path("WEB-INF").append("web.xml"); //$NON-NLS-1$= //$NON-NLS-2$ @@ -267,55 +272,92 @@ } else { util =3D new JBossWebUtil(); } - String name =3D "org.ajax4jsf.VIEW_HANDLERS"; //$NON-NLS-1$ - String value =3D "org.jboss.portletbridge.application.FaceletPortletVi= ewHandler"; //$NON-NLS-1$ - String description =3D null; - util.configureContextParam(project, monitor, name, value, + if (addRichfacesLibraries(config, project)) { + = + String name =3D "org.ajax4jsf.VIEW_HANDLERS"; //$NON-NLS-1$ + String value =3D "org.jboss.portletbridge.application.FaceletPortletV= iewHandler"; //$NON-NLS-1$ + String description =3D null; + util.configureContextParam(project, monitor, name, value, description); = - name =3D "javax.portlet.faces.renderPolicy"; //$NON-NLS-1$ - value =3D "ALWAYS_DELEGATE"; //$NON-NLS-1$ - util.configureContextParam(project, monitor, name, value, + name =3D "javax.portlet.faces.renderPolicy"; //$NON-NLS-1$ + value =3D "ALWAYS_DELEGATE"; //$NON-NLS-1$ + util.configureContextParam(project, monitor, name, value, description); = // RichFaces settings = - name =3D "org.richfaces.LoadStyleStrategy"; //$NON-NLS-1$ - value =3D "NONE"; //$NON-NLS-1$ - util.configureContextParam(project, monitor, name, value, + = + name =3D "org.richfaces.LoadStyleStrategy"; //$NON-NLS-1$ + value =3D "NONE"; //$NON-NLS-1$ + util.configureContextParam(project, monitor, name, value, description); = - name =3D "org.richfaces.LoadScriptStrategy"; //$NON-NLS-1$ - value =3D "NONE"; //$NON-NLS-1$ - util.configureContextParam(project, monitor, name, value, + name =3D "org.richfaces.LoadScriptStrategy"; //$NON-NLS-1$ + value =3D "NONE"; //$NON-NLS-1$ + util.configureContextParam(project, monitor, name, value, description); = - name =3D "org.ajax4jsf.RESOURCE_URI_PREFIX"; //$NON-NLS-1$ - value =3D "rfRes"; //$NON-NLS-1$ - util.configureContextParam(project, monitor, name, value, + name =3D "org.ajax4jsf.RESOURCE_URI_PREFIX"; //$NON-NLS-1$ + value =3D "rfRes"; //$NON-NLS-1$ + util.configureContextParam(project, monitor, name, value, description); = - String displayName =3D "Ajax4jsf Filter"; //$NON-NLS-1$ - String filterName =3D "ajax4jsf"; //$NON-NLS-1$ - String className =3D "org.ajax4jsf.Filter"; //$NON-NLS-1$ - util.configureFilter(project, monitor, filterName, className, + String displayName =3D "Ajax4jsf Filter"; //$NON-NLS-1$ + String filterName =3D "ajax4jsf"; //$NON-NLS-1$ + String className =3D "org.ajax4jsf.Filter"; //$NON-NLS-1$ + util.configureFilter(project, monitor, filterName, className, displayName, description); = - String servletName =3D util.findJsfServlet(provider + String servletName =3D util.findJsfServlet(provider .getModelObject()); - if (servletName =3D=3D null) { - RuntimeException e =3D new RuntimeException( + if (servletName =3D=3D null) { + RuntimeException e =3D new RuntimeException( Messages.JSFPortletFacetInstallDelegate_Cannot_find_the_JSF_servlet= ); - PortletCoreActivator.log(e); - throw e; + PortletCoreActivator.log(e); + throw e; + } + util.configureFilterMapping(project, monitor, filterName, + servletName); + } else { + String name =3D "javax.portlet.faces.renderPolicy"; //$NON-NLS-1$ + String value =3D "NEVER_DELEGATE"; //$NON-NLS-1$ + String description =3D null; + util.configureContextParam(project, monitor, name, value, + description); } - util.configureFilterMapping(project, monitor, filterName, - servletName); - } }, modelPath); } = + private boolean addRichfacesLibraries(IDataModel config, IProject project= ) { + LibraryInstallDelegate libraryDelegate =3D ( (LibraryInstallDelegate) co= nfig.getProperty( IPortletConstants.JSFPORTLET_LIBRARY_PROVIDER_DELEGATE ) = ); + if (libraryDelegate !=3D null) { + ILibraryProvider libraryProvider =3D libraryDelegate + .getLibraryProvider(); + String providerId =3D libraryProvider.getId(); + if (PortletCoreActivator.JSFPORTLETBRIDGE_LIBRARY_PROVIDER.equals(provi= derId) + || PortletCoreActivator.JSFPORTLET_LIBRARY_PROVIDER.equals(providerId= )) { + AbstractLibraryProviderInstallOperationConfig libraryConfig =3D (Abstr= actLibraryProviderInstallOperationConfig) libraryDelegate.getLibraryProvide= rOperationConfig(libraryProvider); + = + boolean isSeamFacet =3D false; + try { + isSeamFacet =3D FacetedProjectFramework.hasProjectFacet(project, JST_= SEAM_FACET); + } catch (CoreException e) { + PortletCoreActivator.log(e); + } + if (isSeamFacet) { + return true; + } + if (!libraryConfig.isAddRichfacesCapabilities()) { + return false; + } + } + = + } + return false; + } + = private void configureClassPath(final IProject project, final IProgressMonitor monitor, IDataModel config) throws JavaModelException { Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostIn= stallListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallL= istener.java 2010-05-21 14:07:15 UTC (rev 22241) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallL= istener.java 2010-05-21 14:07:39 UTC (rev 22242) @@ -53,8 +53,6 @@ = public class PortletPostInstallListener implements IFacetedProjectListener= { = - private static final String JSFPORTLET_LIBRARY_PROVIDER =3D "jsfportlet-l= ibrary-provider"; //$NON-NLS-1$ - private static final String JSFPORTLETBRIDGE_LIBRARY_PROVIDER =3D "jsfpor= tletbridge-library-provider"; //$NON-NLS-1$ private static final IProjectFacet seamFacet =3D ProjectFacetsManager.get= ProjectFacet("jst.seam"); //$NON-NLS-1$ private static final IOverwriteQuery OVERWRITE_NONE_QUERY =3D new IOverwr= iteQuery() { @@ -104,17 +102,17 @@ ILibraryProvider libraryProvider =3D libraryDelegate .getLibraryProvider(); String providerId =3D libraryProvider.getId(); - if (JSFPORTLETBRIDGE_LIBRARY_PROVIDER.equals(providerId)) { + if (PortletCoreActivator.JSFPORTLETBRIDGE_LIBRARY_PROVIDER.equals(pro= viderId)) { JSFPortletbridgeRuntimeLibraryProviderInstallOperationConfig library= Config =3D (JSFPortletbridgeRuntimeLibraryProviderInstallOperationConfig) l= ibraryDelegate .getLibraryProviderOperationConfig(libraryProvider); portletbridgeRuntime =3D libraryConfig.getPortletbridgeHome(); } else { portletbridgeRuntime =3D null; } - richfacesFromServerRuntime =3D JSFPORTLET_LIBRARY_PROVIDER.equals(pro= viderId); //$NON-NLS-1$ + richfacesFromServerRuntime =3D PortletCoreActivator.JSFPORTLET_LIBRAR= Y_PROVIDER.equals(providerId); //$NON-NLS-1$ = - if (JSFPORTLETBRIDGE_LIBRARY_PROVIDER.equals(providerId) - || JSFPORTLET_LIBRARY_PROVIDER.equals(providerId)) { + if (PortletCoreActivator.JSFPORTLETBRIDGE_LIBRARY_PROVIDER.equals(pro= viderId) + || PortletCoreActivator.JSFPORTLET_LIBRARY_PROVIDER.equals(provider= Id)) { AbstractLibraryProviderInstallOperationConfig libraryConfig =3D (Abs= tractLibraryProviderInstallOperationConfig) libraryDelegate.getLibraryProvi= derOperationConfig(libraryProvider); richfacesCapabilities =3D libraryConfig.isAddRichfacesCapabilities(); richfacesRuntime =3D libraryConfig.getRichfacesRuntime(); @@ -259,6 +257,9 @@ private void addRichfacesFromRichfacesRuntime( IFacetedProject facetedProject) { final boolean isSeamProject =3D facetedProject.hasProjectFacet(seamFacet= ); + if (!isSeamProject && !richfacesCapabilities) { + return; + } File richfacesRuntimeHome =3D new File(richfacesRuntime); File richfacesLib =3D new File(richfacesRuntimeHome, "lib"); //$NON-NLS-= 1$ if (!richfacesLib.exists()) { @@ -543,6 +544,10 @@ return null; } List list =3D new ArrayList(); + if (!isSeamProject && !richfacesCapabilities) { + return list; + } + = Enumeration entries =3D rootEntry.entries(); IProject earProject =3D getEarProject(facetedProject.getProject(),isSeam= Project); = --===============5635116596728117997==-- From jbosstools-commits at lists.jboss.org Fri May 21 10:07:48 2010 Content-Type: multipart/mixed; boundary="===============8094032201547536881==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22243 - trunk/jsf/docs/userguide/en-US/images/preferences. Date: Fri, 21 May 2010 10:07:48 -0400 Message-ID: <201005211407.o4LE7mNx018378@svn01.web.mwc.hst.phx2.redhat.com> --===============8094032201547536881== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-21 10:07:48 -0400 (Fri, 21 May 2010) New Revision: 22243 Modified: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_7.png trunk/jsf/docs/userguide/en-US/images/preferences/preferences_8.png Log: https://jira.jboss.org/browse/TOOLSDOC-8 - updated images for the "VPE Pref= erences" chapter. Modified: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_7.p= ng =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jsf/docs/userguide/en-US/images/preferences/preferences_8.p= ng =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============8094032201547536881==-- From jbosstools-commits at lists.jboss.org Fri May 21 10:08:56 2010 Content-Type: multipart/mixed; boundary="===============6934629023776382764==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22244 - trunk/jsf/docs/userguide/en-US. Date: Fri, 21 May 2010 10:08:55 -0400 Message-ID: <201005211408.o4LE8trR018399@svn01.web.mwc.hst.phx2.redhat.com> --===============6934629023776382764== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-21 10:08:55 -0400 (Fri, 21 May 2010) New Revision: 22244 Modified: trunk/jsf/docs/userguide/en-US/preferences.xml Log: https://jira.jboss.org/browse/TOOLSDOC-8 - added "VPE Code Templates" secti= on, updated "VPE Preferences" section Modified: trunk/jsf/docs/userguide/en-US/preferences.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/docs/userguide/en-US/preferences.xml 2010-05-21 14:07:48 UTC = (rev 22243) +++ trunk/jsf/docs/userguide/en-US/preferences.xml 2010-05-21 14:08:55 UTC = (rev 22244) @@ -390,7 +390,7 @@ = = - VPE Preferences + VPE General Preferences = @@ -477,8 +477,8 @@
= - On the Templates tab you can add, edit = or remove VPE templates. + On the Visual Templates tab you can add= , edit or remove VPE visual templates.
Visual Page Editor Templates @@ -493,6 +493,89 @@ button. It will pick up the Template dialog where you can adjust new settings. + = +
+ Visual Page Editor Code Templates + On the + JBoss Tools > Web > Editors > Visual Page E= ditor > Code Templates + preferences page you can create new and edit existing XHTML te= mplates. Such a template allows you to + quickly insert an often used snippet of XHTML code. = + + = +
+ Visual Page Editor Code Templates + + + + + +
+ = + VPE provides four predefined templates: + + XHTML blank facelet page template + Common facelet page template + Form facelet page template + New JSF composite component template + + = + The following table lists the configuration options for the = code templates. + + = + VPE Code Templates Options + + = + + + = + + + Option + Description + + + = + + + New + Opens the dialog to create a new template. = + + = + + Edit + Opens the dialog to edit the currently sele= cted template. + + = + + Remove + Removes all selected templates. + + = + + Restore Removed + Restores the removed templates. + + = + + Revert to Default + Reverts the code templates list to default.= + + = + + Import + Allows you to import templates from the fil= e system. + + = + + Edit + Allows you to export all selected templates= to the file system. + + + +
+ = +
+ = =
--===============6934629023776382764==-- From jbosstools-commits at lists.jboss.org Fri May 21 10:09:56 2010 Content-Type: multipart/mixed; boundary="===============4368810304503748071==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22245 - trunk/jsf/docs/userguide/en-US. Date: Fri, 21 May 2010 10:09:56 -0400 Message-ID: <201005211409.o4LE9udE018411@svn01.web.mwc.hst.phx2.redhat.com> --===============4368810304503748071== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-21 10:09:56 -0400 (Fri, 21 May 2010) New Revision: 22245 Modified: trunk/jsf/docs/userguide/en-US/editors.xml Log: https://jira.jboss.org/browse/TOOLSDOC-8 - updated "Visual Templates" secti= on with new screenshots and info. Modified: trunk/jsf/docs/userguide/en-US/editors.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/docs/userguide/en-US/editors.xml 2010-05-21 14:08:55 UTC (rev= 22244) +++ trunk/jsf/docs/userguide/en-US/editors.xml 2010-05-21 14:09:56 UTC (rev= 22245) @@ -1503,11 +1503,11 @@
- Templating - The VPE also makes it possible to create templates for u= nknown tags. + Visual Templates + The VPE also makes it possible to create visual template= s for unknown tags. To call the Template dialog for a t= ag, right-click on it in Visual mode and select - Setup Template for <tag name> + Setup Visual Template for <tag name> option.
Calling Template Dialog @@ -1527,6 +1527,24 @@
+ = + The + Tag Name field is for sett= ing the name of the unknown tag. + + Note: + The given field should be filled in according to the= pattern: "taglib:tag". Also make sure = + you do not surround the name with angle brackets = + which will cause the validation error (see the figure = below). + +
+ Validation Error in the Template Dialog + + + + + +
+ = Tag for Display field in the Template dialog requires specifying a @@ -1542,8 +1560,14 @@ the field to bring the CSS Di= alog for editing styles. You can observe all defined templates in the VPE - Preferences on the Templates tab which you can = quickly access by pressing - Preferences butt= on. + Preferences on the + Visual Templates + tab which you can quickly access by pressi= ng + Preferences (= + + + + ).
Templates Tab of the VPE Preferences Page --===============4368810304503748071==-- From jbosstools-commits at lists.jboss.org Fri May 21 10:59:15 2010 Content-Type: multipart/mixed; boundary="===============5326314893113063597==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22246 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: views and 1 other directory. Date: Fri, 21 May 2010 10:59:15 -0400 Message-ID: <201005211459.o4LExFGj024082@svn01.web.mwc.hst.phx2.redhat.com> --===============5326314893113063597== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-21 10:59:14 -0400 (Fri, 21 May 2010) New Revision: 22246 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/J= AXRSTester.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/J= AXWSTester.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/J= AXRSWSTestView.java Log: JBIDE-6281 - putting in better JAX-WS fault handling and JAX-RS parameter h= andling in URL ("?") Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= utils/JAXRSTester.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXRSTester.java 2010-05-21 14:09:56 UTC (rev 22245) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXRSTester.java 2010-05-21 14:59:14 UTC (rev 22246) @@ -157,8 +157,21 @@ URL url =3D null; if (query !=3D null) { // add the ? if there are parameters - if (!address.endsWith("?") && methodType.equalsIgnoreCase("GET= ") ) { //$NON-NLS-1$//$NON-NLS-2$ - address =3D address + "?"; //$NON-NLS-1$ + if (!address.endsWith("?")) {//$NON-NLS-1$ + + // if we're a "GET" - add the ? by default + if (methodType.equalsIgnoreCase("GET")) { //$NON-NLS-1$ + address =3D address + "?"; //$NON-NLS-1$ + + // if we're a PUT or POST, check if we have parms + // and add the ? if we do + } else if (methodType.equalsIgnoreCase("POST")//$NON-NLS-1$ = + || methodType.equalsIgnoreCase("PUT") //$NON-NLS-1$ + || methodType.equalsIgnoreCase("DELETE")) { //$NON-NLS-1$ + if (query.trim().length() > 0) { + address =3D address + "?"; //$NON-NLS-1$ + } + } } // add parms to the url if we have some url =3D new URL(address + query); Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= utils/JAXWSTester.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXWSTester.java 2010-05-21 14:09:56 UTC (rev 22245) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXWSTester.java 2010-05-21 14:59:14 UTC (rev 22246) @@ -17,6 +17,7 @@ import javax.xml.soap.MimeHeader; import javax.xml.soap.MimeHeaders; = +import org.apache.axis.AxisFault; import org.apache.axis.Message; import org.apache.axis.MessageContext; import org.apache.axis.client.Call; @@ -89,26 +90,61 @@ call.setProperty(Call.SOAPACTION_URI_PROPERTY,action); } Message message =3D new Message(document); - SOAPEnvelope envelope =3D call.invoke( message ); = - // Get back the response message + SOAPEnvelope envelope =3D null; + = this.resultBody =3D EMPTY_STRING; - if (envelope !=3D null && envelope.getBody() !=3D null) { = - this.resultBody =3D envelope.getBody().toString(); - } - = - // Get back the response HTTP headers and pass back as a Map - if (call !=3D null && call.getMessageContext() !=3D null) { - MessageContext mc =3D call.getMessageContext(); - if (mc.getMessage() !=3D null && mc.getMessage().getMimeHeaders() !=3D = null) { - MimeHeaders mh =3D mc.getMessage().getMimeHeaders(); - Iterator iter =3D mh.getAllHeaders(); + + try { + envelope =3D call.invoke( message ); + + // Get back the response message + if (envelope !=3D null && envelope.getBody() !=3D null) { = + this.resultBody =3D envelope.getBody().toString(); + } + = + // Get back the response HTTP headers and pass back as a Map + if (call !=3D null && call.getMessageContext() !=3D null) { + MessageContext mc =3D call.getMessageContext(); + if (mc.getMessage() !=3D null && mc.getMessage().getMimeHeaders() !=3D= null) { + MimeHeaders mh =3D mc.getMessage().getMimeHeaders(); + Iterator iter =3D mh.getAllHeaders(); + resultHeaders =3D new HashMap(); + while (iter.hasNext()) { + MimeHeader next =3D (MimeHeader)iter.next(); + resultHeaders.put(next.getName(), next.getValue()); + } + } + } + } catch (AxisFault fault){ + + // Get back the response message + if (fault.getFaultString() !=3D null) { = + this.resultBody =3D fault.getFaultString(); + } + + // Get back the response HTTP headers and pass back as a Map + if (fault.getHeaders() !=3D null && !fault.getHeaders().isEmpty()) { + Iterator iter =3D fault.getHeaders().iterator(); resultHeaders =3D new HashMap(); while (iter.hasNext()) { - MimeHeader next =3D (MimeHeader)iter.next(); - resultHeaders.put(next.getName(), next.getValue()); + Object next =3D iter.next(); + resultHeaders.put(next.toString(), ""); //$NON-NLS-1$ } + } else if (call !=3D null && call.getMessageContext() !=3D null) { + MessageContext mc =3D call.getMessageContext(); + if (mc.getMessage() !=3D null && mc.getMessage().getMimeHeaders() !=3D= null) { + MimeHeaders mh =3D mc.getMessage().getMimeHeaders(); + Iterator iter =3D mh.getAllHeaders(); + resultHeaders =3D new HashMap(); + while (iter.hasNext()) { + MimeHeader next =3D (MimeHeader)iter.next(); + resultHeaders.put(next.getName(), next.getValue()); + } + } } + } + = } } \ No newline at end of file Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/JAXRSWSTestView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-21 14:09:56 UTC (rev 22245) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-21 14:59:14 UTC (rev 22246) @@ -425,7 +425,7 @@ parmsList.setEnabled(false); dlsList.setEnabled(false); parmsTab.getControl().setEnabled(false); - headerTab.getControl().setEnabled(false); + headerTab.getControl().setEnabled(true); methodCombo.setText(POST); = String emptySOAP =3D "" = + //$NON-NLS-1$ --===============5326314893113063597==-- From jbosstools-commits at lists.jboss.org Fri May 21 11:14:05 2010 Content-Type: multipart/mixed; boundary="===============2007253257724379796==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22247 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core: impl/definition and 1 other directories. Date: Fri, 21 May 2010 11:14:05 -0400 Message-ID: <201005211514.o4LFE5TD031567@svn01.web.mwc.hst.phx2.redhat.com> --===============2007253257724379796== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-21 11:14:04 -0400 (Fri, 21 May 2010) New Revision: 22247 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/Parameter.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/MethodDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/ParametedTypeFactory.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/ParameterDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java Log: https://jira.jboss.org/browse/JBIDE-6310 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/Parameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/Parameter.java 2010-05-21 14:59:14 UTC (rev 22246) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/Parameter.java 2010-05-21 15:14:04 UTC (rev 22247) @@ -76,4 +76,21 @@ return definition.getAnnotationTypes(); } = + public String getValue(String annotationTypeName) { + String text =3D definition.getAnnotationText(annotationTypeName); + if(text !=3D null) { + int i =3D text.indexOf('('); + int j =3D text.lastIndexOf(')'); + if(i >=3D 0 && j > i) { + String values =3D text.substring(i + 1, j).trim(); + if(values.startsWith("\"") && values.endsWith("\"")) { + return values.substring(1, values.length() - 1); + } + //TODO improve + return values; + } + } + return null; + } + } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/MethodDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-21 14:59:14 UTC (re= v 22246) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-21 15:14:04 UTC (re= v 22247) @@ -71,7 +71,9 @@ if(nameRange !=3D null) range =3D nameRange; int paramStart =3D content.indexOf('(', range.getOffset()); if(paramStart < 0) return; - int paramEnd =3D content.indexOf(')', paramStart); + int declEnd =3D content.indexOf('{', paramStart); + if(declEnd < 0) return; + int paramEnd =3D content.lastIndexOf(')', declEnd); if(paramEnd < 0) return; String paramsString =3D content.substring(paramStart + 1, paramEnd); if(paramsString.indexOf('@') < 0) return; @@ -111,6 +113,8 @@ v.setValue(q); v.valueStartPosition =3D start + params[i].indexOf(q); v.valueLength =3D q.length(); + int s =3D q.indexOf('('); + if(s >=3D 0) q =3D q.substring(0, s).trim(); String annotationType =3D EclipseJavaUtil.resolveType(contextType, q.s= ubstring(1).trim()); if(annotationType !=3D null) pd.annotationsByTypeName.put(annotationTy= pe, v); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/ParametedTypeFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/ParametedTypeFactory.java 2010-05-21 14:59:14 UTC= (rev 22246) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/ParametedTypeFactory.java 2010-05-21 15:14:04 UTC= (rev 22247) @@ -75,6 +75,16 @@ cache.put(key, result); return result; } + String[] ps =3D context.getTypeParameterSignatures(); + for (int i =3D 0; i < ps.length; i++) { + String t =3D ps[i]; + if(t.endsWith(":")) t =3D t.substring(0, t.length() - 1); + t =3D "Q" + t + ";"; + if(t.equals(result.getSignature())) { + cache. put(key, result); + return result; + } + } } else { int endToken =3D typeSignature.lastIndexOf('>'); if(endToken < startToken) return null; @@ -112,4 +122,4 @@ cache.clear(); } = -} +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/ParameterDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/ParameterDefinition.java 2010-05-21 14:59:14 UTC = (rev 22246) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/ParameterDefinition.java 2010-05-21 15:14:04 UTC = (rev 22247) @@ -62,4 +62,11 @@ public ITextSourceReference getPosition() { return position; } + + public String getAnnotationText(String annotationTypeName) { + ITextSourceReference pos =3D getAnnotationPosition(annotationTypeName); + if(pos =3D=3D null) return null; + String text =3D methodDefinition.getTypeDefinition().getContent().substr= ing(pos.getStartPosition(), pos.getStartPosition() + pos.getLength()); + return text; + } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-21 14:59:14 UTC (rev 222= 46) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-21 15:14:04 UTC (rev 222= 47) @@ -49,6 +49,7 @@ import org.jboss.tools.cdi.core.IDecorator; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IInjectionPointField; +import org.jboss.tools.cdi.core.IInjectionPointParameter; import org.jboss.tools.cdi.core.IInterceptor; import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IParameter; @@ -63,6 +64,7 @@ import org.jboss.tools.cdi.core.IStereotypeDeclaration; import org.jboss.tools.cdi.core.ITypeDeclaration; import org.jboss.tools.cdi.core.preferences.CDIPreferences; +import org.jboss.tools.cdi.internal.core.impl.Parameter; import org.jboss.tools.cdi.internal.core.impl.SessionBean; import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.jst.web.kb.IKbProject; @@ -757,7 +759,19 @@ * other than injected field declares a @Named annotation that does not * specify the value member */ - if (!(injection instanceof IInjectionPointField)) { + if(injection instanceof IInjectionPointParameter) { + IInjectionPointParameter pinjection =3D (IInjectionPointParameter)injec= tion; + if(pinjection.isAnnotationPresent(CDIConstants.NAMED_QUALIFIER_TYPE_NAM= E)) { + String value =3D ((Parameter)pinjection).getValue(CDIConstants.NAMED_Q= UALIFIER_TYPE_NAME); + if(value =3D=3D null || value.length() =3D=3D 0) { + addError(CDIValidationMessages.PARAM_INJECTION_DECLARES_EMPTY_NAME, = + CDIPreferences.PARAM_INJECTION_DECLARES_EMPTY_NAME, = + pinjection.getAnnotationPosition(CDIConstants.NAMED_QUALIFIER_TYPE_= NAME), + injection.getResource()); + } + = + } + } else if (!(injection instanceof IInjectionPointField)) { IAnnotationDeclaration named =3D injection.getAnnotation(CDIConstants.N= AMED_QUALIFIER_TYPE_NAME); if (named !=3D null) { try { --===============2007253257724379796==-- From jbosstools-commits at lists.jboss.org Fri May 21 17:15:04 2010 Content-Type: multipart/mixed; boundary="===============4829497179542914284==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22248 - in trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui: preferences and 2 other directories. Date: Fri, 21 May 2010 17:15:04 -0400 Message-ID: <201005212115.o4LLF4Gn010330@svn01.web.mwc.hst.phx2.redhat.com> --===============4829497179542914284== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-21 17:15:03 -0400 (Fri, 21 May 2010) New Revision: 22248 Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/R= esultsXMLStorage.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/R= esultsXMLStorageInput.java Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/message= s/JBossWSUI.properties trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/message= s/JBossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/prefere= nces/JBossWSRuntimeListFieldEditor.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/J= AXWSTester.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/J= AXRSWSTestView.java Log: JBIDE-6326 - adding ability to open WS invoke results in the XML editor Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= messages/JBossWSUI.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUI.properties 2010-05-21 15:14:04 UTC (rev 22247) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUI.properties 2010-05-21 21:15:03 UTC (rev 22248) @@ -71,6 +71,7 @@ = JAXRSWSTestView_Action_URL_Label=3DAction URL: JAXRSWSTestView_Configure_Monitor_Button=3DConfigure Monitor +JAXRSWSTestView_CopyResultsMenu=3D&Copy JAXRSWSTestView_Exception_Status=3DException: = JAXRSWSTestView_HTTP_Method_Label=3DHTTP Method: JAXRSWSTestView_Invoke_Label=3DInvoke @@ -78,6 +79,8 @@ JAXRSWSTestView_JAXRS_Success_Status=3DSuccessful JAX-RS Web Service Execu= tion JAXRSWSTestView_JAXWS_Success_Status=3DSuccessful JAX-WS Web Service Execu= tion JAXRSWSTestView_Open_Monitor_Button=3DOpen Monitor +JAXRSWSTestView_Open_Response_Tag_Contents_in_XML_Editor=3DOpen &Response = tag contents in XML Editor +JAXRSWSTestView_Open_Result_in_XML_Editor=3D&Open in XML Editor JAXRSWSTestView_Request_Body_Label=3DRequest Body JAXRSWSTestView_Request_Header_Label=3DRequest Header JAXRSWSTestView_Request_Parameters_Label=3DRequest Parameters @@ -86,3 +89,4 @@ JAXRSWSTestView_Service_URL_Label=3DService URL: JAXRSWSTestView_Set_Sample_Data_Label=3DSet Sample Data JAXRSWSTestView_Web_Service_Type_Label=3DWeb Service Type: +ResultsXMLStorageInput_WS_Invocation_Results_Prefix=3DWeb Service Invocati= on Results: = Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= messages/JBossWSUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUIMessages.java 2010-05-21 15:14:04 UTC (rev 22247) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUIMessages.java 2010-05-21 21:15:03 UTC (rev 22248) @@ -94,6 +94,7 @@ public static String JBossWS_DelimitedStringList_EditValue_Dialog_Message; public static String JAXRSWSTestView_Action_URL_Label; public static String JAXRSWSTestView_Configure_Monitor_Button; + public static String JAXRSWSTestView_CopyResultsMenu; public static String JAXRSWSTestView_Exception_Status; public static String JAXRSWSTestView_HTTP_Method_Label; public static String JAXRSWSTestView_Invoke_Label; @@ -101,6 +102,8 @@ public static String JAXRSWSTestView_JAXRS_Success_Status; public static String JAXRSWSTestView_JAXWS_Success_Status; public static String JAXRSWSTestView_Open_Monitor_Button; + public static String JAXRSWSTestView_Open_Response_Tag_Contents_in_XML_Ed= itor; + public static String JAXRSWSTestView_Open_Result_in_XML_Editor; public static String JAXRSWSTestView_Request_Body_Label; public static String JAXRSWSTestView_Request_Header_Label; public static String JAXRSWSTestView_Request_Parameters_Label; @@ -109,6 +112,7 @@ public static String JAXRSWSTestView_Service_URL_Label; public static String JAXRSWSTestView_Set_Sample_Data_Label; public static String JAXRSWSTestView_Web_Service_Type_Label; + public static String ResultsXMLStorageInput_WS_Invocation_Results_Prefix; = static { NLS.initializeMessages(BUNDLE_NAME, JBossWSUIMessages.class); Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= preferences/JBossWSRuntimeListFieldEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/prefer= ences/JBossWSRuntimeListFieldEditor.java 2010-05-21 15:14:04 UTC (rev 22247) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/prefer= ences/JBossWSRuntimeListFieldEditor.java 2010-05-21 21:15:03 UTC (rev 22248) @@ -1073,7 +1073,6 @@ setDefaultRuntime(); } = - @SuppressWarnings("unchecked") private void removeRuntime(JBossWSRuntime r) { boolean used =3D JBossWSRuntimeManager.isRuntimeUsed(r.getName()); String title =3D JBossWSUIMessages.JBossWS_Runtime_Delete_Confirm_Title; @@ -1092,7 +1091,7 @@ if (added.contains(r)) { added.remove(r); } - ((List) getValue()).remove(r); + ((List) getValue()).remove(r); } if (checkedElement =3D=3D r) { checkedElement =3D null; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= utils/JAXWSTester.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXWSTester.java 2010-05-21 15:14:04 UTC (rev 22247) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXWSTester.java 2010-05-21 21:15:03 UTC (rev 22248) @@ -34,6 +34,8 @@ // the response message to pass back private String resultBody; = + private SOAPEnvelope resultSOAP; + = // the result HTTP headers to pass back private HashMap resultHeaders; = @@ -63,6 +65,10 @@ return this.resultHeaders; } = + public SOAPEnvelope getResultSOAP(){ + return this.resultSOAP; + } + = /** * Invoke the JAX-WS service * @param endpointurl @@ -91,16 +97,16 @@ } Message message =3D new Message(document); = - SOAPEnvelope envelope =3D null; + resultSOAP =3D null; = this.resultBody =3D EMPTY_STRING; = try { - envelope =3D call.invoke( message ); + resultSOAP =3D call.invoke( message ); = // Get back the response message - if (envelope !=3D null && envelope.getBody() !=3D null) { = - this.resultBody =3D envelope.getBody().toString(); + if (resultSOAP !=3D null && resultSOAP.getBody() !=3D null) { = + this.resultBody =3D resultSOAP.getBody().toString(); } = // Get back the response HTTP headers and pass back as a Map @@ -122,7 +128,7 @@ if (fault.getFaultString() !=3D null) { = this.resultBody =3D fault.getFaultString(); } - + = // Get back the response HTTP headers and pass back as a Map if (fault.getHeaders() !=3D null && !fault.getHeaders().isEmpty()) { Iterator iter =3D fault.getHeaders().iterator(); Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/uti= ls/ResultsXMLStorage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= ResultsXMLStorage.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= ResultsXMLStorage.java 2010-05-21 21:15:03 UTC (rev 22248) @@ -0,0 +1,54 @@ +/*************************************************************************= ****** = + * Copyright (c) 2010 Red Hat, Inc. = + * Distributed under license by Red Hat, Inc. All rights reserved. = + * This program is made available under the terms of the = + * Eclipse Public License v1.0 which accompanies this distribution, = + * and is available at http://www.eclipse.org/legal/epl-v10.html = + * = + * Contributors: = + * Red Hat, Inc. - initial API and implementation = + *************************************************************************= *****/ +package org.jboss.tools.ws.ui.utils; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +import org.eclipse.core.resources.IStorage; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; + +/** + * Temporary in-memory storage for WS invocation results + * to pass to the XML editor. + * @author bfitzpat + * + */ +public class ResultsXMLStorage implements IStorage { + private String string; + = + public ResultsXMLStorage(String input) { + this.string =3D input; + } + = + public InputStream getContents() throws CoreException { + return new ByteArrayInputStream(string.getBytes()); + } + = + public IPath getFullPath() { + return null; + } + = + @SuppressWarnings("rawtypes") + public Object getAdapter(Class adapter) { + return null; + } + = + public String getName() { + int len =3D Math.min(5, string.length()); + return string.substring(0, len).concat("..."); //$NON-NLS-1$ + } + = + public boolean isReadOnly() { + return true; + } +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/t= ools/ws/ui/utils/ResultsXMLStorage.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/uti= ls/ResultsXMLStorageInput.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= ResultsXMLStorageInput.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= ResultsXMLStorageInput.java 2010-05-21 21:15:03 UTC (rev 22248) @@ -0,0 +1,60 @@ +/*************************************************************************= ****** = + * Copyright (c) 2010 Red Hat, Inc. = + * Distributed under license by Red Hat, Inc. All rights reserved. = + * This program is made available under the terms of the = + * Eclipse Public License v1.0 which accompanies this distribution, = + * and is available at http://www.eclipse.org/legal/epl-v10.html = + * = + * Contributors: = + * Red Hat, Inc. - initial API and implementation = + *************************************************************************= *****/ +package org.jboss.tools.ws.ui.utils; + +import org.eclipse.core.resources.IStorage; +import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.ui.IPersistableElement; +import org.eclipse.ui.IStorageEditorInput; +import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; + +/** + * Temporary in-memory storage for WS invocation results + * to pass to the XML editor. + * @author bfitzpat + */ +public class ResultsXMLStorageInput implements IStorageEditorInput { + = + private IStorage storage; + = + public ResultsXMLStorageInput(IStorage storage) { + this.storage =3D storage; + } + = + public boolean exists() { + return true; + } + = + public ImageDescriptor getImageDescriptor() { + return null; + } + = + public String getName() { + return storage.getName(); + } + = + public IPersistableElement getPersistable() { + return null; + } + = + public IStorage getStorage() { + return storage; + } + = + public String getToolTipText() { + return JBossWSUIMessages.ResultsXMLStorageInput_WS_Invocation_Resul= ts_Prefix + storage.getName(); + } + = + @SuppressWarnings("rawtypes") + public Object getAdapter(Class adapter) { + return null; + } +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/t= ools/ws/ui/utils/ResultsXMLStorageInput.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/JAXRSWSTestView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-21 15:14:04 UTC (rev 22247) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-21 21:15:03 UTC (rev 22248) @@ -17,6 +17,10 @@ import java.util.Iterator; import java.util.Map.Entry; = +import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; + +import org.eclipse.core.resources.IStorage; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -27,6 +31,8 @@ import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; +import org.eclipse.swt.events.FocusEvent; +import org.eclipse.swt.events.FocusListener; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.KeyListener; import org.eclipse.swt.events.SelectionEvent; @@ -40,9 +46,14 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; +import org.eclipse.swt.widgets.Menu; +import org.eclipse.swt.widgets.MenuItem; import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.IStorageEditorInput; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; @@ -52,7 +63,11 @@ import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; import org.jboss.tools.ws.ui.utils.JAXRSTester; import org.jboss.tools.ws.ui.utils.JAXWSTester; +import org.jboss.tools.ws.ui.utils.ResultsXMLStorage; +import org.jboss.tools.ws.ui.utils.ResultsXMLStorageInput; import org.jboss.tools.ws.ui.utils.WSTestUtils; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; = /** * View for testing web services (JAX-WS & JAX-RS) @@ -62,6 +77,7 @@ @SuppressWarnings("restriction") public class JAXRSWSTestView extends ViewPart { = + private static final String XML_EDITOR_ID =3D "org.eclipse.wst.xml.ui.int= ernal.tabletree.XMLMultiPageEditorPart"; //$NON-NLS-1$ private static final String TCPIP_VIEW_ID =3D "org.eclipse.wst.internet.m= onitor.view";//$NON-NLS-1$ private static final String DELETE =3D "DELETE";//$NON-NLS-1$ private static final String PUT =3D "PUT";//$NON-NLS-1$ @@ -100,6 +116,11 @@ private Button openTCPIPMonitorButton; private Button addTCPIPMonitorButton; = + private SOAPEnvelope envelope; + private MenuItem openInXMLEditorAction; + private MenuItem openResponseTagInXMLEditor; + private Menu resultsTextMenu; + /** * The constructor. */ @@ -268,7 +289,7 @@ = Button sampleButton =3D new Button(buttonBar, SWT.PUSH); sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_L= abel); - sampleButton.setVisible(false); + sampleButton.setVisible(true); = sampleButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { @@ -291,7 +312,98 @@ resultTab.setText(JBossWSUIMessages.JAXRSWSTestView_Results_Body_Label); resultsText =3D new Text(resultTabGroup, SWT.BORDER | SWT.V_SCROLL | SWT= .WRAP | SWT.READ_ONLY ); resultsText.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true)); + + resultsTextMenu =3D new Menu(resultsText.getShell(), SWT.POP_UP); + = + MenuItem copyMenuAction =3D new MenuItem(resultsTextMenu, SWT.PUSH); + copyMenuAction.setText(JBossWSUIMessages.JAXRSWSTestView_CopyResultsMenu= ); + copyMenuAction.setAccelerator(SWT.CTRL + 'C'); + copyMenuAction.addSelectionListener(new SelectionListener(){ + + public void widgetDefaultSelected(SelectionEvent arg0) { + resultsText.selectAll(); + resultsText.copy(); + } + + public void widgetSelected(SelectionEvent arg0) { + widgetDefaultSelected(arg0); + } + }); + new MenuItem(resultsTextMenu, SWT.SEPARATOR); + = + openInXMLEditorAction =3D new MenuItem(resultsTextMenu, SWT.PUSH); + openInXMLEditorAction.setText(JBossWSUIMessages.JAXRSWSTestView_Open_Res= ult_in_XML_Editor); + openInXMLEditorAction.setAccelerator(SWT.CTRL + 'O'); + openInXMLEditorAction.addSelectionListener(new SelectionListener() { + + public void widgetSelected(SelectionEvent arg0) { + String string =3D resultsText.getText(); + openXMLEditor(string); + } + + public void widgetDefaultSelected(SelectionEvent arg0) { + widgetSelected(arg0); + } + }); + + openResponseTagInXMLEditor =3D new MenuItem(resultsTextMenu, SWT.PUSH); + openResponseTagInXMLEditor.setText(JBossWSUIMessages.JAXRSWSTestView_Ope= n_Response_Tag_Contents_in_XML_Editor); + openResponseTagInXMLEditor.setAccelerator(SWT.CTRL + 'R'); + openResponseTagInXMLEditor.addSelectionListener(new SelectionListener() { + + public void widgetSelected(SelectionEvent arg0) { + String string =3D null; + if (envelope !=3D null){ + try { + NodeList list =3D envelope.getBody().getChildNodes(); + for (int i =3D 0; i< list.getLength(); i++){ + Node node =3D list.item(i); + if (node.getNodeName().contains("Response")){ //$NON-NLS-1$ + NodeList list2 =3D node.getChildNodes(); + for (int j =3D 0; j 0){ + resultsTextMenu.setVisible(true); + } else { + resultsTextMenu.setVisible(false); + } + } + }); = resultHeadersTab =3D new TabItem(resultTabGroup, SWT.NONE, 1); resultHeadersTab.setText(JBossWSUIMessages.JAXRSWSTestView_Results_Heade= r_Label); @@ -306,6 +418,21 @@ setControlsForMethodType(methodCombo.getText()); setControlsForSelectedURL(); } + = + private void openXMLEditor (String text){ + IWorkbenchWindow window =3D getSite().getWorkbenchWindow(); + IStorage storage =3D new ResultsXMLStorage(text); + IStorageEditorInput input =3D new ResultsXMLStorageInput(storage); + IWorkbenchPage page =3D window.getActivePage(); + if (page !=3D null) { + try { +// page.openEditor(input, "org.eclipse.ui.DefaultTextEditor"); + page.openEditor(input, XML_EDITOR_ID); + } catch (PartInitException e) { + e.printStackTrace(); + } = + } + } = private void setControlsForSelectedURL() { if (urlCombo.getText().trim().length() > 0) { @@ -439,6 +566,10 @@ if (bodyText.getText().trim().length() =3D=3D 0) { bodyText.setText(emptySOAP); } + = + if (openResponseTagInXMLEditor !=3D null && = + !openResponseTagInXMLEditor.isDisposed()) + openResponseTagInXMLEditor.setEnabled(true); } else if (wsType.equalsIgnoreCase(JAX_RS)) { actionText.setEnabled(false); @@ -449,6 +580,9 @@ parmsTab.getControl().setEnabled(true); headerTab.getControl().setEnabled(true); methodCombo.setText(GET); + if (openResponseTagInXMLEditor !=3D null && = + !openResponseTagInXMLEditor.isDisposed()) + openResponseTagInXMLEditor.setEnabled(false); } } = @@ -505,7 +639,7 @@ } else { urlCombo.add(urlCombo.getText()); } - = + final String url =3D urlCombo.getText(); final String action =3D actionText.getText(); final String body =3D bodyText.getText(); @@ -531,7 +665,7 @@ aJob.setUser(true); = aJob.schedule(); aJob.addJobChangeListener(new IJobChangeListener() { - = + public void sleeping(IJobChangeEvent event) {}; public void scheduled(IJobChangeEvent event) {}; public void running(IJobChangeEvent event) {}; @@ -553,7 +687,7 @@ }); } } - = + public void awake(IJobChangeEvent event) {}; public void aboutToRun(IJobChangeEvent event) {}; }); @@ -565,14 +699,16 @@ */ private IStatus handleWSTest(final IProgressMonitor monitor, String url, = String action, String body) { try { - = + + envelope =3D null; monitor.worked(10); JAXWSTester tester =3D new JAXWSTester(); tester.doTest(url, action, body); monitor.worked(70); String result =3D tester.getResultBody(); + envelope =3D tester.getResultSOAP(); String cleanedUp =3D WSTestUtils.addNLsToXML(result); - = + WSTestStatus status =3D new WSTestStatus(IStatus.OK, = JBossWSUIPlugin.PLUGIN_ID, = JBossWSUIMessages.JAXRSWSTestView_JAXWS_Success_Status); @@ -656,10 +792,10 @@ = // now actually call it try { - = + // call the service tester.doTest(address, parameters, headers, method, body); - = + String result =3D tester.getResultBody(); = // put the results in the result text field @@ -691,7 +827,7 @@ status.setHeadersList(listText); monitor.worked(10); return status; - = + } catch (Exception e) { String result =3D tester.getResultBody(); = @@ -724,12 +860,12 @@ status.setHeadersList(listText); monitor.worked(10); return status; -// WSTestStatus status =3D new WSTestStatus(IStatus.ERROR, = -// JBossWSUIPlugin.PLUGIN_ID, = -// JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocalized= Message()); -// status.setResultsText(e.toString()); -// e.printStackTrace(); -// return status; + // WSTestStatus status =3D new WSTestStatus(IStatus.ERROR, = + // JBossWSUIPlugin.PLUGIN_ID, = + // JBossWSUIMessages.JAXRSWSTestView_Exception_Status + e.getLocali= zedMessage()); + // status.setResultsText(e.toString()); + // e.printStackTrace(); + // return status; } } = @@ -740,5 +876,5 @@ // set initial focus to the URL text combo urlCombo.setFocus(); } - = + } \ No newline at end of file --===============4829497179542914284==-- From jbosstools-commits at lists.jboss.org Fri May 21 17:25:19 2010 Content-Type: multipart/mixed; boundary="===============4624744915290225994==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22249 - in trunk/modeshape: site and 1 other directory. Date: Fri, 21 May 2010 17:25:19 -0400 Message-ID: <201005212125.o4LLPJtj011725@svn01.web.mwc.hst.phx2.redhat.com> --===============4624744915290225994== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 17:25:19 -0400 (Fri, 21 May 2010) New Revision: 22249 Added: trunk/modeshape/site/ trunk/modeshape/site/pom.xml trunk/modeshape/site/site.xml Log: add update site Added: trunk/modeshape/site/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/modeshape/site/pom.xml (rev 0) +++ trunk/modeshape/site/pom.xml 2010-05-21 21:25:19 UTC (rev 22249) @@ -0,0 +1,13 @@ + + 4.0.0 = + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + modeshape.site = + 0.0.1-SNAPSHOT + eclipse-update-site + Added: trunk/modeshape/site/site.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/modeshape/site/site.xml (rev 0) +++ trunk/modeshape/site/site.xml 2010-05-21 21:25:19 UTC (rev 22249) @@ -0,0 +1,12 @@ + + + To install these features, point Eclipse at this site. + + + JBoss Tools modeshape Nightly Build Update Site: contains a= ll features in this build. + + + + + + --===============4624744915290225994==-- From jbosstools-commits at lists.jboss.org Fri May 21 17:25:44 2010 Content-Type: multipart/mixed; boundary="===============6048450856073401040==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22250 - trunk/modeshape. Date: Fri, 21 May 2010 17:25:44 -0400 Message-ID: <201005212125.o4LLPiXs011790@svn01.web.mwc.hst.phx2.redhat.com> --===============6048450856073401040== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 17:25:44 -0400 (Fri, 21 May 2010) New Revision: 22250 Modified: trunk/modeshape/pom.xml Log: add site to pom Modified: trunk/modeshape/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/modeshape/pom.xml 2010-05-21 21:25:19 UTC (rev 22249) +++ trunk/modeshape/pom.xml 2010-05-21 21:25:44 UTC (rev 22250) @@ -15,6 +15,7 @@ features plugins tests + site - = \ No newline at end of file + = --===============6048450856073401040==-- From jbosstools-commits at lists.jboss.org Fri May 21 18:29:32 2010 Content-Type: multipart/mixed; boundary="===============1662947035941376166==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22251 - trunk/build. Date: Fri, 21 May 2010 18:29:32 -0400 Message-ID: <201005212229.o4LMTWlG024393@svn01.web.mwc.hst.phx2.redhat.com> --===============1662947035941376166== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 18:29:32 -0400 (Fri, 21 May 2010) New Revision: 22251 Added: trunk/build/publish.sh Log: new publishing script for use with Hudson jobs Added: trunk/build/publish.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/publish.sh (rev 0) +++ trunk/build/publish.sh 2010-05-21 22:29:32 UTC (rev 22251) @@ -0,0 +1,15 @@ +#!/bin/bash +# Hudson script used to publish Tycho-built p2 update sites + +# define target zip filename +ZIPNAME=3D${JOB_NAME}-Update-H${BUILD_NUMBER}-${BUILD_ID}.zip + +# copy into workspace for archiving +rm -fr ${WORKSPACE}/${JOB_NAME}-Update*.zip +rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/${ZIPNAME} + +# publish to download.jboss.org +if [[ $DESTINATION =3D=3D "" ]]; then DESTINATION=3D"tools(a)filemgmt.jbos= s.org:/downloads_htdocs/tools"; fi +rsync -aq --delete ${WORKSPACE}/${ZIPNAME} $DESTINATION/builds/nightly/3.2= .helios/${JOB_NAME}/ + + --===============1662947035941376166==-- From jbosstools-commits at lists.jboss.org Fri May 21 19:05:17 2010 Content-Type: multipart/mixed; boundary="===============4817324352936537428==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22252 - trunk/build. Date: Fri, 21 May 2010 19:05:17 -0400 Message-ID: <201005212305.o4LN5HML002435@svn01.web.mwc.hst.phx2.redhat.com> --===============4817324352936537428== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 19:05:17 -0400 (Fri, 21 May 2010) New Revision: 22252 Modified: trunk/build/publish.sh Log: move zip into site/ folder to allow better 'rsync --delete' Modified: trunk/build/publish.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/publish.sh 2010-05-21 22:29:32 UTC (rev 22251) +++ trunk/build/publish.sh 2010-05-21 23:05:17 UTC (rev 22252) @@ -5,11 +5,10 @@ ZIPNAME=3D${JOB_NAME}-Update-H${BUILD_NUMBER}-${BUILD_ID}.zip = # copy into workspace for archiving -rm -fr ${WORKSPACE}/${JOB_NAME}-Update*.zip -rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/${ZIPNAME} +rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site +rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${ZIPNAME} = # publish to download.jboss.org if [[ $DESTINATION =3D=3D "" ]]; then DESTINATION=3D"tools(a)filemgmt.jbos= s.org:/downloads_htdocs/tools"; fi -rsync -aq --delete ${WORKSPACE}/${ZIPNAME} $DESTINATION/builds/nightly/3.2= .helios/${JOB_NAME}/ +rsync -aq --delete ${WORKSPACE}/site/* $DESTINATION/builds/nightly/3.2.hel= ios/${JOB_NAME}/ = - --===============4817324352936537428==-- From jbosstools-commits at lists.jboss.org Fri May 21 19:19:38 2010 Content-Type: multipart/mixed; boundary="===============1662868965408582601==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22253 - trunk/build. Date: Fri, 21 May 2010 19:19:38 -0400 Message-ID: <201005212319.o4LNJcDM003511@svn01.web.mwc.hst.phx2.redhat.com> --===============1662868965408582601== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 19:19:37 -0400 (Fri, 21 May 2010) New Revision: 22253 Modified: trunk/build/publish.sh Log: Modified: trunk/build/publish.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/publish.sh 2010-05-21 23:05:17 UTC (rev 22252) +++ trunk/build/publish.sh 2010-05-21 23:19:37 UTC (rev 22253) @@ -10,5 +10,5 @@ = # publish to download.jboss.org if [[ $DESTINATION =3D=3D "" ]]; then DESTINATION=3D"tools(a)filemgmt.jbos= s.org:/downloads_htdocs/tools"; fi -rsync -aq --delete ${WORKSPACE}/site/* $DESTINATION/builds/nightly/3.2.hel= ios/${JOB_NAME}/ +rsync -arzq --delete ${WORKSPACE}/site/* $DESTINATION/builds/nightly/3.2.h= elios/${JOB_NAME}/ = --===============1662868965408582601==-- From jbosstools-commits at lists.jboss.org Fri May 21 19:38:13 2010 Content-Type: multipart/mixed; boundary="===============7725410655310103704==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22254 - trunk/build. Date: Fri, 21 May 2010 19:38:13 -0400 Message-ID: <201005212338.o4LNcCx8005882@svn01.web.mwc.hst.phx2.redhat.com> --===============7725410655310103704== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 19:38:12 -0400 (Fri, 21 May 2010) New Revision: 22254 Modified: trunk/build/publish.sh Log: Modified: trunk/build/publish.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/publish.sh 2010-05-21 23:19:37 UTC (rev 22253) +++ trunk/build/publish.sh 2010-05-21 23:38:12 UTC (rev 22254) @@ -5,10 +5,10 @@ ZIPNAME=3D${JOB_NAME}-Update-H${BUILD_NUMBER}-${BUILD_ID}.zip = # copy into workspace for archiving -rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site -rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${ZIPNAME} +rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME} +rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME= }/${ZIPNAME} = # publish to download.jboss.org if [[ $DESTINATION =3D=3D "" ]]; then DESTINATION=3D"tools(a)filemgmt.jbos= s.org:/downloads_htdocs/tools"; fi -rsync -arzq --delete ${WORKSPACE}/site/* $DESTINATION/builds/nightly/3.2.h= elios/${JOB_NAME}/ +rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/builds/nig= htly/3.2.helios/ = --===============7725410655310103704==-- From jbosstools-commits at lists.jboss.org Fri May 21 21:22:11 2010 Content-Type: multipart/mixed; boundary="===============8210110255629877945==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22255 - trunk/build. Date: Fri, 21 May 2010 21:22:11 -0400 Message-ID: <201005220122.o4M1MB1e029192@svn01.web.mwc.hst.phx2.redhat.com> --===============8210110255629877945== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 21:22:11 -0400 (Fri, 21 May 2010) New Revision: 22255 Modified: trunk/build/build.xml Log: add collect.test.results.for.hudson target so we can call this AFTER a pure= maven build to just collect tests Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-21 23:38:12 UTC (rev 22254) +++ trunk/build/build.xml 2010-05-22 01:22:11 UTC (rev 22255) @@ -516,14 +516,7 @@ All components up to date: nothing to do! To force a build of unchanged components, use -Dbuild.if.sources.unchanged= =3Dtrue = - - - - <?xml version=3D"1.0" encoding=3D"UTF-8" ?> -<testsuite failures=3D"0" time=3D"0.001" errors=3D"0" skipped=3D"0" tes= ts=3D"1" name=3D"org.jboss.tools.NoTestsRun"> - <testcase time=3D"0.001" classname=3D"org.jboss.tools.NoTestsRun" nam= e=3D"NoTestsRun"/> -</testsuite> - + @@ -551,6 +544,45 @@ = + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <?xml version=3D"1.0" encoding=3D"UTF-8" ?> +<testsuite failures=3D"0" time=3D"0.001" errors=3D"0" skipped=3D"0" tes= ts=3D"1" name=3D"org.jboss.tools.NoTestsRun"> +<testcase time=3D"0.001" classname=3D"org.jboss.tools.NoTestsRun" name= =3D"NoTestsRun"/> +</testsuite> + + + @@ -742,7 +774,7 @@ preservelastmodified=3D"true" overwrite=3D"true" > - + = @@ -754,10 +786,7 @@ - + @@ -918,7 +947,7 @@ /> - = + @@ -1194,10 +1223,26 @@ = + + + + + + + + + + + + + + - - - + --===============8210110255629877945==-- From jbosstools-commits at lists.jboss.org Fri May 21 21:43:00 2010 Content-Type: multipart/mixed; boundary="===============7468933224862818920==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22256 - trunk/build. Date: Fri, 21 May 2010 21:43:00 -0400 Message-ID: <201005220143.o4M1h0l3031373@svn01.web.mwc.hst.phx2.redhat.com> --===============7468933224862818920== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 21:43:00 -0400 (Fri, 21 May 2010) New Revision: 22256 Modified: trunk/build/build.xml Log: add collect.test.results.for.hudson target so we can call this AFTER a pure= maven build to just collect tests Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-22 01:22:11 UTC (rev 22255) +++ trunk/build/build.xml 2010-05-22 01:43:00 UTC (rev 22256) @@ -544,7 +544,7 @@ = - + --===============7468933224862818920==-- From jbosstools-commits at lists.jboss.org Fri May 21 21:52:34 2010 Content-Type: multipart/mixed; boundary="===============2536868264983206148==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22257 - trunk/build. Date: Fri, 21 May 2010 21:52:34 -0400 Message-ID: <201005220152.o4M1qYTn032360@svn01.web.mwc.hst.phx2.redhat.com> --===============2536868264983206148== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 21:52:34 -0400 (Fri, 21 May 2010) New Revision: 22257 Modified: trunk/build/build.xml Log: add collect.test.results.for.hudson target so we can call this AFTER a pure= maven build to just collect tests Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-22 01:43:00 UTC (rev 22256) +++ trunk/build/build.xml 2010-05-22 01:52:34 UTC (rev 22257) @@ -546,10 +546,11 @@ = - + @@ -558,16 +559,16 @@ - + - - - - + + + + --===============2536868264983206148==-- From jbosstools-commits at lists.jboss.org Fri May 21 22:04:59 2010 Content-Type: multipart/mixed; boundary="===============5110960198227391383==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22258 - trunk/build. Date: Fri, 21 May 2010 22:04:59 -0400 Message-ID: <201005220204.o4M24xsg006945@svn01.web.mwc.hst.phx2.redhat.com> --===============5110960198227391383== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 22:04:59 -0400 (Fri, 21 May 2010) New Revision: 22258 Modified: trunk/build/build.xml Log: add collect.test.results.for.hudson target so we can call this AFTER a pure= maven build to just collect tests Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-22 01:52:34 UTC (rev 22257) +++ trunk/build/build.xml 2010-05-22 02:04:59 UTC (rev 22258) @@ -544,14 +544,18 @@ = - + - - @@ -564,7 +568,7 @@ - + --===============5110960198227391383==-- From jbosstools-commits at lists.jboss.org Fri May 21 22:21:53 2010 Content-Type: multipart/mixed; boundary="===============8688484510055936803==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22259 - trunk/build. Date: Fri, 21 May 2010 22:21:52 -0400 Message-ID: <201005220221.o4M2LqHO009468@svn01.web.mwc.hst.phx2.redhat.com> --===============8688484510055936803== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 22:21:52 -0400 (Fri, 21 May 2010) New Revision: 22259 Modified: trunk/build/build.xml Log: add move.test.results option = Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-22 02:04:59 UTC (rev 22258) +++ trunk/build/build.xml 2010-05-22 02:21:52 UTC (rev 22259) @@ -781,6 +781,14 @@ > + + + + + + + + = --===============8688484510055936803==-- From jbosstools-commits at lists.jboss.org Fri May 21 22:27:29 2010 Content-Type: multipart/mixed; boundary="===============4193471069401698418==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22260 - trunk/build. Date: Fri, 21 May 2010 22:27:29 -0400 Message-ID: <201005220227.o4M2RTB2009938@svn01.web.mwc.hst.phx2.redhat.com> --===============4193471069401698418== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 22:27:29 -0400 (Fri, 21 May 2010) New Revision: 22260 Modified: trunk/build/build.xml Log: document how to use collect.test.results.for.hudson target; set defaults Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-22 02:21:52 UTC (rev 22259) +++ trunk/build/build.xml 2010-05-22 02:27:29 UTC (rev 22260) @@ -544,11 +544,22 @@ = + + + + + --===============4193471069401698418==-- From jbosstools-commits at lists.jboss.org Fri May 21 22:47:06 2010 Content-Type: multipart/mixed; boundary="===============3131201334440018974==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22261 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views. Date: Fri, 21 May 2010 22:47:06 -0400 Message-ID: <201005220247.o4M2l67g012007@svn01.web.mwc.hst.phx2.redhat.com> --===============3131201334440018974== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-21 22:47:06 -0400 (Fri, 21 May 2010) New Revision: 22261 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/J= AXRSWSTestView.java Log: JBIDE-6326 - adding ability to open WS invoke results in the XML editor - u= pdates to popup menu enable/disable Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/JAXRSWSTestView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-22 02:27:29 UTC (rev 22260) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-22 02:47:06 UTC (rev 22261) @@ -77,6 +77,7 @@ @SuppressWarnings("restriction") public class JAXRSWSTestView extends ViewPart { = + private static final String DEFAULT_TEXT_EDITOR_ID =3D "org.eclipse.ui.De= faultTextEditor"; //$NON-NLS-1$ private static final String XML_EDITOR_ID =3D "org.eclipse.wst.xml.ui.int= ernal.tabletree.XMLMultiPageEditorPart"; //$NON-NLS-1$ private static final String TCPIP_VIEW_ID =3D "org.eclipse.wst.internet.m= onitor.view";//$NON-NLS-1$ private static final String DELETE =3D "DELETE";//$NON-NLS-1$ @@ -120,6 +121,7 @@ private MenuItem openInXMLEditorAction; private MenuItem openResponseTagInXMLEditor; private Menu resultsTextMenu; + private MenuItem copyMenuAction; = /** * The constructor. @@ -289,7 +291,7 @@ = Button sampleButton =3D new Button(buttonBar, SWT.PUSH); sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_L= abel); - sampleButton.setVisible(true); + sampleButton.setVisible(false); = sampleButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { @@ -315,7 +317,7 @@ = resultsTextMenu =3D new Menu(resultsText.getShell(), SWT.POP_UP); = - MenuItem copyMenuAction =3D new MenuItem(resultsTextMenu, SWT.PUSH); + copyMenuAction =3D new MenuItem(resultsTextMenu, SWT.PUSH); copyMenuAction.setText(JBossWSUIMessages.JAXRSWSTestView_CopyResultsMenu= ); copyMenuAction.setAccelerator(SWT.CTRL + 'C'); copyMenuAction.addSelectionListener(new SelectionListener(){ @@ -417,8 +419,22 @@ setControlsForWSType(wsTypeCombo.getText()); setControlsForMethodType(methodCombo.getText()); setControlsForSelectedURL(); + setMenusForCurrentState(); } = + private void setMenusForCurrentState() { + if (resultsText!=3D null && !resultsText.isDisposed()){ + boolean enabled =3D resultsText.getText().trim().length() > 0; = + copyMenuAction.setEnabled(enabled); + openInXMLEditorAction.setEnabled(enabled); + if (wsTypeCombo.getText().equalsIgnoreCase(JAX_WS)) { + openResponseTagInXMLEditor.setEnabled(enabled); + } else if (wsTypeCombo.getText().equalsIgnoreCase(JAX_RS) ){ + openResponseTagInXMLEditor.setEnabled(false); + } + } + } + = private void openXMLEditor (String text){ IWorkbenchWindow window =3D getSite().getWorkbenchWindow(); IStorage storage =3D new ResultsXMLStorage(text); @@ -426,8 +442,11 @@ IWorkbenchPage page =3D window.getActivePage(); if (page !=3D null) { try { -// page.openEditor(input, "org.eclipse.ui.DefaultTextEditor"); - page.openEditor(input, XML_EDITOR_ID); + if (window.getWorkbench().getEditorRegistry().findEditor(XML_EDITOR_ID= ) !=3D null) { + page.openEditor(input, XML_EDITOR_ID); + } else { + page.openEditor(input, DEFAULT_TEXT_EDITOR_ID); + } } catch (PartInitException e) { e.printStackTrace(); } = @@ -566,10 +585,6 @@ if (bodyText.getText().trim().length() =3D=3D 0) { bodyText.setText(emptySOAP); } - = - if (openResponseTagInXMLEditor !=3D null && = - !openResponseTagInXMLEditor.isDisposed()) - openResponseTagInXMLEditor.setEnabled(true); } else if (wsType.equalsIgnoreCase(JAX_RS)) { actionText.setEnabled(false); @@ -580,10 +595,8 @@ parmsTab.getControl().setEnabled(true); headerTab.getControl().setEnabled(true); methodCombo.setText(GET); - if (openResponseTagInXMLEditor !=3D null && = - !openResponseTagInXMLEditor.isDisposed()) - openResponseTagInXMLEditor.setEnabled(false); } + setMenusForCurrentState(); } = /* @@ -692,6 +705,7 @@ public void aboutToRun(IJobChangeEvent event) {}; }); = + setMenusForCurrentState(); } = /* --===============3131201334440018974==-- From jbosstools-commits at lists.jboss.org Fri May 21 23:21:54 2010 Content-Type: multipart/mixed; boundary="===============1206114071371026062==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22262 - trunk/build. Date: Fri, 21 May 2010 23:21:54 -0400 Message-ID: <201005220321.o4M3Lsox021952@svn01.web.mwc.hst.phx2.redhat.com> --===============1206114071371026062== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 23:21:54 -0400 (Fri, 21 May 2010) New Revision: 22262 Modified: trunk/build/build.xml Log: debug Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-22 02:47:06 UTC (rev 22261) +++ trunk/build/build.xml 2010-05-22 03:21:54 UTC (rev 22262) @@ -561,12 +561,15 @@ + basedir =3D ${basedir} +WORKINGDIR =3D ${WORKINGDIR} +COMPONENT =3D ${COMPONENT} --===============1206114071371026062==-- From jbosstools-commits at lists.jboss.org Fri May 21 23:34:28 2010 Content-Type: multipart/mixed; boundary="===============1119391961481243281==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22263 - trunk/build. Date: Fri, 21 May 2010 23:34:28 -0400 Message-ID: <201005220334.o4M3YSTq022978@svn01.web.mwc.hst.phx2.redhat.com> --===============1119391961481243281== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-21 23:34:27 -0400 (Fri, 21 May 2010) New Revision: 22263 Modified: trunk/build/build.xml Log: clean leftovers from previous build Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-22 03:21:54 UTC (rev 22262) +++ trunk/build/build.xml 2010-05-22 03:34:27 UTC (rev 22263) @@ -561,15 +561,16 @@ - basedir =3D ${basedir} + basedir =3D ${basedir} WORKINGDIR =3D ${WORKINGDIR} COMPONENT =3D ${COMPONENT} + --===============1119391961481243281==-- From jbosstools-commits at lists.jboss.org Sat May 22 15:00:39 2010 Content-Type: multipart/mixed; boundary="===============6650310255060182842==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22264 - trunk/jsf/docs/userguide/en-US. Date: Sat, 22 May 2010 15:00:39 -0400 Message-ID: <201005221900.o4MJ0dS8019481@svn01.web.mwc.hst.phx2.redhat.com> --===============6650310255060182842== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-22 15:00:39 -0400 (Sat, 22 May 2010) New Revision: 22264 Modified: trunk/jsf/docs/userguide/en-US/vwt_faq.xml Log: https://jira.jboss.org/browse/TOOLSDOC-73 missing natures dialog is documented Modified: trunk/jsf/docs/userguide/en-US/vwt_faq.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/docs/userguide/en-US/vwt_faq.xml 2010-05-22 03:34:27 UTC (rev= 22263) +++ trunk/jsf/docs/userguide/en-US/vwt_faq.xml 2010-05-22 19:00:39 UTC (rev= 22264) @@ -64,4 +64,39 @@ Web > HTML Files > Editor ).
+
+ Visual Editor starts OK, but the Missing Natures dialog app= ears + +
+ Missing Nature + + + + + +
+ = + = + + = + Some functionality of Visual Editor may not work if a project doesn't hav= e org.jboss.tools.jsf.jsfnature or org.jboss= .tools.jst.web.kb.kbnature in .project conf= iguration. To fix this problem and turn off the message box execute next st= eps: + + + + Right mouse button click on a project in Package Explorer. + + + Select Configure -> Add JSF Capabilities from the= context menu. + + + Configure your project using Add JSF Capabilities wizard and press Fin= ish. + + + + +If you are shure that your project does not need JSF capabilities, just di= sable this message box by checking Do not show this dialog again!= checkbox. + + = +
+ --===============6650310255060182842==-- From jbosstools-commits at lists.jboss.org Sat May 22 15:00:54 2010 Content-Type: multipart/mixed; boundary="===============0545553325675076743==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22265 - in trunk/jsf/docs/userguide/en-US/images: faq and 1 other directory. Date: Sat, 22 May 2010 15:00:53 -0400 Message-ID: <201005221900.o4MJ0rrm019516@svn01.web.mwc.hst.phx2.redhat.com> --===============0545553325675076743== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-22 15:00:53 -0400 (Sat, 22 May 2010) New Revision: 22265 Added: trunk/jsf/docs/userguide/en-US/images/faq/ trunk/jsf/docs/userguide/en-US/images/faq/missingnauture.png Log: https://jira.jboss.org/browse/TOOLSDOC-73 missing natures dialog image Added: trunk/jsf/docs/userguide/en-US/images/faq/missingnauture.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en-US/images/faq/missingnautu= re.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============0545553325675076743==-- From jbosstools-commits at lists.jboss.org Sat May 22 15:01:42 2010 Content-Type: multipart/mixed; boundary="===============9222444999560823286==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22266 - trunk/documentation/guides/GettingStartedGuide/en-US. Date: Sat, 22 May 2010 15:01:42 -0400 Message-ID: <201005221901.o4MJ1gPf019648@svn01.web.mwc.hst.phx2.redhat.com> --===============9222444999560823286== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-22 15:01:42 -0400 (Sat, 22 May 2010) New Revision: 22266 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/gsg_faq.xml Log: imagehttps://jira.jboss.org/browse/TOOLSDOC-73 missing natures dialog is documented Modified: trunk/documentation/guides/GettingStartedGuide/en-US/gsg_faq.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/GettingStartedGuide/en-US/gsg_faq.xml 2010-0= 5-22 19:00:53 UTC (rev 22265) +++ trunk/documentation/guides/GettingStartedGuide/en-US/gsg_faq.xml 2010-0= 5-22 19:01:42 UTC (rev 22266) @@ -78,7 +78,42 @@ + = +
+ Visual Editor starts OK, but the Missing Natures dialog app= ears = +
+ Missing Nature + + + + + +
+ = + = + + = + Some functionality of Visual Editor may not work if a project doesn't hav= e org.jboss.tools.jsf.jsfnature or org.jboss= .tools.jst.web.kb.kbnature in .project conf= iguration. To fix this problem and turn off the message box execute next st= eps: + + + + Right mouse button click on a project in Package Explorer. + + + Select Configure -> Add JSF Capabilities from the= context menu. + + + Configure your project using Add JSF Capabilities wizard and press Fin= ish. + + + + +If you are shure that your project does not need JSF capabilities, just di= sable this message box by checking Do not show this dialog again!= checkbox. + + = +
+
Do I need to have JBoss Server installed to run JBoss Devel= oper Studio? = --===============9222444999560823286==-- From jbosstools-commits at lists.jboss.org Sat May 22 15:02:11 2010 Content-Type: multipart/mixed; boundary="===============9166403878939510583==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22267 - in trunk/documentation/guides/GettingStartedGuide/en-US/images: faq and 1 other directory. Date: Sat, 22 May 2010 15:02:11 -0400 Message-ID: <201005221902.o4MJ2BpT019705@svn01.web.mwc.hst.phx2.redhat.com> --===============9166403878939510583== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-22 15:02:10 -0400 (Sat, 22 May 2010) New Revision: 22267 Added: trunk/documentation/guides/GettingStartedGuide/en-US/images/faq/ trunk/documentation/guides/GettingStartedGuide/en-US/images/faq/missingn= auture.png Log: imagehttps://jira.jboss.org/browse/TOOLSDOC-73 missing natures dialog image Added: trunk/documentation/guides/GettingStartedGuide/en-US/images/faq/miss= ingnauture.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/documentation/guides/GettingStartedGuide/en-US/i= mages/faq/missingnauture.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============9166403878939510583==-- From jbosstools-commits at lists.jboss.org Sun May 23 10:36:03 2010 Content-Type: multipart/mixed; boundary="===============6690285844768482054==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22268 - trunk/jsf/docs/userguide/en-US. Date: Sun, 23 May 2010 10:36:03 -0400 Message-ID: <201005231436.o4NEa3OE006812@svn01.web.mwc.hst.phx2.redhat.com> --===============6690285844768482054== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-23 10:36:02 -0400 (Sun, 23 May 2010) New Revision: 22268 Modified: trunk/jsf/docs/userguide/en-US/editors.xml Log: https://jira.jboss.org/browse/TOOLSDOC-15 Support for XML Schema section is= updated. = Modified: trunk/jsf/docs/userguide/en-US/editors.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/docs/userguide/en-US/editors.xml 2010-05-22 19:02:10 UTC (rev= 22267) +++ trunk/jsf/docs/userguide/en-US/editors.xml 2010-05-23 14:36:02 UTC (rev= 22268) @@ -251,9 +251,12 @@
Content Assist Content assist is available when wo= rking with - = + - Seam project files + + Seam project + files + @@ -286,14 +289,16 @@ - ESB XML files + + ESB + XML files + Insert= Tag Wizard - = Notice, that code completion for EL variables has icons = illustrating what they are from. The most of this icons are described in the table be= low. @@ -314,11 +319,11 @@ - - - + + + @@ -332,11 +337,11 @@ - - - + + + @@ -350,10 +355,10 @@ - - - + + + @@ -368,11 +373,11 @@ - - - + + + @@ -380,17 +385,17 @@ Used to show navigation rules define= d in the faces-config.xml . + >faces-config.xml . - - - + + + @@ -404,11 +409,11 @@ - - - + + + @@ -438,20 +443,18 @@
- The ranking and sorting are available in EL code - completions. + The ranking and sorting are available in EL code complet= ions. As you can see, together with proposals content assist a= lso provides descriptions of selected tags or attributes.
Tag description - +
-
+
JSF Project Files When working with JSF project in JBoss Developer Stu= dio, you can use various Content Assist features while= developing: @@ -505,7 +508,6 @@
-
Content Assist for Composite Components @@ -821,22 +823,22 @@
Content Assist for EL expressions - Content Assist also provide= s an expression language (JSF EL) support. - It is used in web application pages to access the = JavaBeans components = - in the page bean and in other beans associated wit= h the web application, = - such as the session bean and the application bean.= + Content Assist also provide= s an expression language + (JSF EL) support. It is used in web application pa= ges to access the + JavaBeans components in t= he page bean and in other + beans associated with the web application, such as= the session bean and the + application bean.
EL Content Assist - +
- = - =
Content Assist for XHTML Pages The code completion for the Seam components in a Sea= m project shows the @@ -849,16 +851,16 @@ - = If XHTML file uses custom Facelets components, the C= ontent Assist should also be available for them. For details, see "C= ontent Assist for Custom Facelets Components" later in this gui= de.
- =
Content Assist for Java Files - Various tools tips provide you additional informatio= n about java elements (JavaDocs, source classes, return types, method names= , params, and etc.) when working with java files + Various tools tips provide you additional informatio= n about java elements + (JavaDocs, source classes, return types, method names,= params, and etc.) when + working with java files
Content assist for JavaDoc @@ -867,7 +869,6 @@
- =
Content Assist for Insert Tag Wizard @@ -882,7 +883,7 @@
-
= = +
Adding dynamic code assist to custom components tha= t were added to JBoss Tools Palette Here is what you need to do to add project based cod= e assist to a custom @@ -1001,8 +1002,7 @@
- = -
= +
Synchronized Source and Visual Editing JBoss Developer Studio offers the f= lexibility to edit any @@ -1527,14 +1527,14 @@ - = The - Tag Name field is for sett= ing the name of the unknown tag. + Tag Name field is for = setting the name of the + unknown tag. Note: - The given field should be filled in according to the= pattern: "taglib:tag". Also make sure = - you do not surround the name with angle brackets = - which will cause the validation error (see the figure = below). + The given field should be filled in according to the= pattern: + "taglib:tag". Also make sure you do not surr= ound the name with angle + brackets which will cause the validation error (see th= e figure below).
Validation Error in the Template Dialog @@ -1544,7 +1544,6 @@
- = Tag for Display field in the Template dialog requires specifying a @@ -1560,10 +1559,10 @@ the field to bring the CSS Di= alog for editing styles. You can observe all defined templates in the VPE - Preferences on the + Preferences on the Visual Templates - tab which you can quickly access by pressi= ng - Preferences (= + tab which you can quickly access by pressing <= link + linkend=3D"AdvancedSettings954">Preferences ( <= inlinemediaobject> @@ -1576,7 +1575,8 @@ - Here it's possible to add a new and edit or remove = any listed in the table template. + Here it's possible to add a new and edit or remove = any listed in the table + template.
VPE Toolbar @@ -1981,22 +1981,24 @@
Error Messages - Visual Page Editor provide a user f= riendly and effective error messages, which should mak= e solving problems easier. Error message contains a r= eference to the problem and its description. Also in Error area you can find a link to Visual Page Editor fo= rum and Details button whick is used to see a error tr= ace. - If the error occurs while editor loading, error message = will contain information about of what might have caused the error ( a miss= ing library or errors in source code). + Visual Page Editor provide a user f= riendly and effective + error messages, which should make= solving problems easier. + Error message contains a referenc= e to the problem and its + description. Also in Error area you c= an find a link to + Visual Page Editor forum and Details + button whick is used to see a error trace. + If the error occurs while editor loading, error message = will contain information + about of what might have caused the error ( a missing libr= ary or errors in source + code).
Visual Page Error Message - =
- =
- = - = - =
Support for Custom Facelets Components Visual Page Editor (starting from 3= .0.0.M3 version of @@ -2468,8 +2470,8 @@
JavaScript Editor - The JavaScript editor is a Source - viewer in which you can use code assist: + The JavaScript editor is a Source v= iewer in which you can use + code assist:
JavaScript Editor @@ -2478,8 +2480,8 @@
- You can also use the JavaScript editor = - with the Outline view to navigate around the file: + You can also use the JavaScript editor with the Outline view + to navigate around the file:
JavaScript Editor with the Outline view @@ -2589,6 +2591,17 @@
+ + Note: + On case you want to use your own DTD or XML Schema m= ake sure that this DTD or + XML Schema is not listed in XML Catalog. If it is, you= can't work with your DTD + and XML Scheme and JBoss Tool,which uses this DTD or X= ML Schema. More + information about XML Catalog you can find in Eclipse Documentation and on XML Catalog Tutorial page. +
--===============6690285844768482054==-- From jbosstools-commits at lists.jboss.org Mon May 24 02:08:21 2010 Content-Type: multipart/mixed; boundary="===============5741181008048442527==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22269 - trunk/jmx/tests/org.jboss.tools.jmx.ui.test. Date: Mon, 24 May 2010 02:08:21 -0400 Message-ID: <201005240608.o4O68Lc6009009@svn01.web.mwc.hst.phx2.redhat.com> --===============5741181008048442527== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-24 02:08:20 -0400 (Mon, 24 May 2010) New Revision: 22269 Modified: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml Log: org.jboss.tools.jmx.core.test mark plug-in as unpacked to fix test problem Modified: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml 2010-05-23 14:36:02= UTC (rev 22268) +++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml 2010-05-24 06:08:20= UTC (rev 22269) @@ -11,4 +11,18 @@ org.jboss.tools.jmx.ui.test = 1.1.0-SNAPSHOT eclipse-test-plugin + = + + + + org.sonatype.tycho + maven-osgi-test-plugin + + + org.jboss.tools.jmx.ui.test + + + + + --===============5741181008048442527==-- From jbosstools-commits at lists.jboss.org Mon May 24 02:24:58 2010 Content-Type: multipart/mixed; boundary="===============8248609841616848697==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22270 - in trunk/jmx/tests: org.jboss.tools.jmx.ui.test and 1 other directory. Date: Mon, 24 May 2010 02:24:58 -0400 Message-ID: <201005240624.o4O6Ow5c010473@svn01.web.mwc.hst.phx2.redhat.com> --===============8248609841616848697== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-24 02:24:57 -0400 (Mon, 24 May 2010) New Revision: 22270 Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml Log: org.jboss.tools.jmx.core.test mark plug-in as unpacked to fix test problem Modified: trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml 2010-05-24 06:08:= 20 UTC (rev 22269) +++ trunk/jmx/tests/org.jboss.tools.jmx.core.test/pom.xml 2010-05-24 06:24:= 57 UTC (rev 22270) @@ -11,4 +11,17 @@ org.jboss.tools.jmx.core.test = 1.1.0-SNAPSHOT eclipse-test-plugin + + + + org.sonatype.tycho + maven-osgi-test-plugin + + + org.jboss.tools.jmx.core.test + + + + + Modified: trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml 2010-05-24 06:08:20= UTC (rev 22269) +++ trunk/jmx/tests/org.jboss.tools.jmx.ui.test/pom.xml 2010-05-24 06:24:57= UTC (rev 22270) @@ -11,18 +11,4 @@ org.jboss.tools.jmx.ui.test = 1.1.0-SNAPSHOT eclipse-test-plugin - = - - - - org.sonatype.tycho - maven-osgi-test-plugin - - - org.jboss.tools.jmx.ui.test - - - - - --===============8248609841616848697==-- From jbosstools-commits at lists.jboss.org Mon May 24 03:14:27 2010 Content-Type: multipart/mixed; boundary="===============0046269313927707148==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22271 - in trunk/ws: plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands and 16 other directories. Date: Mon, 24 May 2010 03:14:27 -0400 Message-ID: <201005240714.o4O7ERIo021894@svn01.web.mwc.hst.phx2.redhat.com> --===============0046269313927707148== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Grid.Qian Date: 2010-05-24 03:14:25 -0400 (Mon, 24 May 2010) New Revision: 22271 Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/project/ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/project= /facet/ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/= test/project/ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/= test/project/facet/ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/= test/project/facet/JBossWSProjectFacetTest.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/= bot/test/JBossWSProjectFacetBotTest.java Removed: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/src/org/jboss/tools/ws/c= reation/ui/project/facet/ Modified: trunk/ws/plugins/org.jboss.tools.ws.core/plugin.properties trunk/ws/plugins/org.jboss.tools.ws.core/plugin.xml trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws= /creation/core/commands/ImplementationClassCreationCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws= /creation/core/commands/RemoveClientJarsCommand.java trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws= /creation/core/messages/JBossWSCreationCore.properties trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws= /creation/core/messages/JBossWSCreationCoreMessages.java trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.xml trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/message= s/JBossWSUI.properties trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/message= s/JBossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/prefere= nces/JBossWSRuntimeListFieldEditor.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/project= /facet/IMessageNotifier.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/project= /facet/JBossWSFacetInstallPage.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/project= /facet/JBossWSPropertyPage.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/project= /facet/JBossWSRuntimeConfigBlock.java trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core/= test/JBossWSCoreAllTests.java trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF Log: JBIDE-6187: to trunk (fix this issue and juint, swtbot test) Modified: trunk/ws/plugins/org.jboss.tools.ws.core/plugin.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.core/plugin.properties 2010-05-24 0= 6:24:57 UTC (rev 22270) +++ trunk/ws/plugins/org.jboss.tools.ws.core/plugin.properties 2010-05-24 0= 7:14:25 UTC (rev 22271) @@ -9,4 +9,7 @@ = = JBOSSWS_FACET_EXT_LABEL=3DJBoss Web Services Extensions -JBOSSWS_FACET_EXT_DISCRIPTION=3DPrepares the project for additional Web se= rvices support with the JBoss Web services runtime. \ No newline at end of file +JBOSSWS_FACET_EXT_DISCRIPTION=3DPrepares the project for additional Web se= rvices support with the JBoss Web services runtime. + +JBOSSWS_FACET_CORE_PRESET_LABEL=3DJBossWS Web Service Project v3.0 +JBOSSWS_FACET_CORE_PRESET_DESCRIPTION=3DConfigures a Dynamic Web Project w= ith JBossWS using Web Module v2.5 and Java v5.0 \ No newline at end of file Modified: trunk/ws/plugins/org.jboss.tools.ws.core/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.core/plugin.xml 2010-05-24 06:24:57= UTC (rev 22270) +++ trunk/ws/plugins/org.jboss.tools.ws.core/plugin.xml 2010-05-24 07:14:25= UTC (rev 22271) @@ -1,7 +1,6 @@ - %JBOSSWS_FACET_CORE_DISCRIPTION @@ -9,59 +8,46 @@ = - + + + = - = - - - - - - - - - - - - - - - - + + + + + = + + + + + + + + + - - - + + - + + + + + %JBOSSWS_FACET_CORE_PRESET_DESCRIPTION + + + + + = - + id=3D"JBossWS_Runtime"/> - = - Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/t= ools/ws/creation/core/commands/ImplementationClassCreationCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/w= s/creation/core/commands/ImplementationClassCreationCommand.java 2010-05-24= 06:24:57 UTC (rev 22270) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/w= s/creation/core/commands/ImplementationClassCreationCommand.java 2010-05-24= 07:14:25 UTC (rev 22271) @@ -444,6 +444,7 @@ = private CompilationUnit getCompilationUnitForInterface(String portTypeNam= e) throws CoreException { + System.out.println(portTypeName); IFile inFile =3D getServiceInterfaceFile(portTypeName); if (!inFile.exists()) { throw new CoreException( Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/t= ools/ws/creation/core/commands/RemoveClientJarsCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/w= s/creation/core/commands/RemoveClientJarsCommand.java 2010-05-24 06:24:57 U= TC (rev 22270) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/w= s/creation/core/commands/RemoveClientJarsCommand.java 2010-05-24 07:14:25 U= TC (rev 22271) @@ -22,7 +22,7 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperat= ion; -import org.jboss.tools.ws.core.classpath.JBossWSRuntimeClassPathInitialize= r.JBossWSRuntimeClasspathContainer; +import org.jboss.tools.ws.core.classpath.JBossWSRuntimeClasspathContainer; import org.jboss.tools.ws.core.utils.StatusUtils; import org.jboss.tools.ws.creation.core.JBossWSCreationCorePlugin; import org.jboss.tools.ws.creation.core.data.ServiceModel; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/t= ools/ws/creation/core/messages/JBossWSCreationCore.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/w= s/creation/core/messages/JBossWSCreationCore.properties 2010-05-24 06:24:57= UTC (rev 22270) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/w= s/creation/core/messages/JBossWSCreationCore.properties 2010-05-24 07:14:25= UTC (rev 22271) @@ -24,14 +24,6 @@ Label_EnableSOAP12_Binding_Extension=3DEnable SOAP 1.2 binding extension (= This option is only available for JBossWS 3.0 or later) Label_Button_Text_Remove=3DRemove Progress_Message_Generating=3DGenerating Web Service resources... -JBossWSFacetInstallPage_Title=3DJBossWS Facet {0} -JBossWSFacetInstallPage_Description=3DSelect JBossWS {0} Web Service runti= me -JBossWSFacetInstallPage_ServerSuppliedJBossWS=3DServer Supplied JBossWS Ru= ntime -JBossWSFacetInstallPage_Deploy=3D Package all JBossWS runtime jars into th= e deployment archive -JBossWSFacetInstallPage_New=3DNew... -JBossWSRuntimeConfigBlock_Duplicated_Jar=3DDuplicated jar on classpath:{0} -JBossWSRuntimeInstallPage_NoTargetRuntime=3DPlease the specify project tar= get runtime. -JBossWSRuntimeInstallPage_NoValidJBossWSRuntime=3DThe specified target run= time should be JBoss AS 5.0 or later. Client_Sample_Run_Over=3D Call Over! = Error_Message_Invalid_Binding_File=3D{0} is not a valid JAX-WS or JAXB bin= ding file @@ -44,6 +36,4 @@ Error_WS_Location=3DThe JBoss WS Runtime Location is NULL. Please set the = location on JBoss WS preferences page. Error_Create_Client_Sample=3DWhen create a client sample, a error comes up= . Please check the generated files. Error_No_Package=3DThe service implementation selected does not follow Jav= a naming conventions. This may result in not being able to generate your We= bService. -Error_WS_Chose_runtime=3DSelect a JBoss Web Service runtime. If a server s= upplied JBoss Web Service runtime is chosen ,\n the chosen server adapter m= ust be capable of providing the JBoss Web Service runtime -Error_WS_No_Runtime_Specifed=3DA JBossWS runtime has not been chosen Error_JBossWS_GenerateWizard_WSName_Same=3DThe Web Service Name has been u= sed in the web.xml of the web project. Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/t= ools/ws/creation/core/messages/JBossWSCreationCoreMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/w= s/creation/core/messages/JBossWSCreationCoreMessages.java 2010-05-24 06:24:= 57 UTC (rev 22270) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/w= s/creation/core/messages/JBossWSCreationCoreMessages.java 2010-05-24 07:14:= 25 UTC (rev 22271) @@ -18,14 +18,6 @@ public static String Command; public static String Bin; = - public static String JBossWSFacetInstallPage_Deploy; - public static String JBossWSFacetInstallPage_Description; - public static String JBossWSFacetInstallPage_New; - public static String JBossWSFacetInstallPage_ServerSuppliedJBossWS; - public static String JBossWSFacetInstallPage_Title; - public static String JBossWSRuntimeConfigBlock_Duplicated_Jar; - public static String JBossWSRuntimeInstallPage_NoTargetRuntime; - public static String JBossWSRuntimeInstallPage_NoValidJBossWSRuntime; public static String Label_Custom_Package_Name; public static String Label_Catalog_File; public static String Label_Button_Text_Seletion; = @@ -47,8 +39,6 @@ public static String Error_No_Class; public static String Error_No_Package; public static String Error_WS_Location; - public static String Error_WS_No_Runtime_Specifed; - public static String Error_WS_Chose_runtime; public static String Error_Create_Client_Sample; public static String Error_Message_No_Runtime_Specified; public static String Error_JBossWS_GenerateWizard_WSName_Same; Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST= .MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 20= 10-05-24 06:24:57 UTC (rev 22270) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/META-INF/MANIFEST.MF 20= 10-05-24 07:14:25 UTC (rev 22271) @@ -24,9 +24,7 @@ org.jboss.tools.ws.core, org.eclipse.jst.ws.creation.ui, org.eclipse.wst.common.modulecore, - org.eclipse.wst.common.project.facet.ui, - org.jboss.tools.ws.ui, - org.eclipse.wst.server.core;bundle-version=3D"1.1.3" + org.jboss.tools.ws.ui Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.creation.ui.wsrt Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2010-05-24 0= 6:24:57 UTC (rev 22270) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.ui/plugin.xml 2010-05-24 0= 7:14:25 UTC (rev 22271) @@ -1,81 +1,52 @@ - - - - + + = - + = = - + = - = = - - + - + point=3D"org.eclipse.wst.command.env.ui.widgetRegistry"> - - - - - - - - - - - - - - - - Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-05-24 = 06:24:57 UTC (rev 22270) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-05-24 = 07:14:25 UTC (rev 22271) @@ -19,6 +19,9 @@ org.eclipse.wst.common.emfworkbench.integration, org.jboss.tools.common.ui, org.eclipse.core.filesystem, + org.eclipse.wst.common.project.facet.ui, + org.eclipse.wst.server.core, + org.eclipse.core.filesystem, com.ibm.icu, org.apache.axis, javax.xml.soap, Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.xml 2010-05-24 06:24:57 U= TC (rev 22270) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/plugin.xml 2010-05-24 07:14:25 U= TC (rev 22271) @@ -38,6 +38,34 @@ + = + = + + + + + + + + + + + + + + + + 0){ //$NON-NLS-1$ - setErrorMessage(JBossWSCreationCoreMessages.JBossWSRuntimeInstallPage_= NoValidJBossWSRuntime); + + if ("3.0".compareTo(jbossWSVersion) <=3D 0) { //$NON-NLS-1$ + if ("5.0".compareTo(version) > 0) { //$NON-NLS-1$ + setErrorMessage(JBossWSUIMessages.JBossWSRuntimeInstallPage_NoValidJBo= ssWSRuntime); return; } } - = + setErrorMessage(null); - = - = + } - = - private void setInitialValues(){ - boolean isServerSupplied =3D model.getBooleanProperty(IJBossWSFacetDataM= odelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED); - String runtimeName =3D model.getStringProperty(IJBossWSFacetDataModelPro= perties.JBOSS_WS_RUNTIME_ID); - boolean isDeploy =3D model.getBooleanProperty(IJBossWSFacetDataModelProp= erties.JBOSS_WS_DEPLOY); - if(isServerSupplied){ + + private void setInitialValues() { + boolean isServerSupplied =3D model + .getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_= IS_SERVER_SUPPLIED); + String runtimeName =3D model + .getStringProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_I= D); + boolean isDeploy =3D model + .getBooleanProperty(IJBossWSFacetDataModelProperties.JBOSS_WS_DEPLOY); + if (isServerSupplied) { btnServerSupplied.setSelection(true); enableUserSupplied(false); - }else if(runtimeName !=3D null && !runtimeName.equals("")){ //$NON-NLS-1$ + } else if (runtimeName !=3D null && !runtimeName.equals("")) { //$NON-NL= S-1$ btnUserSupplied.setSelection(true); - if(isDeploy){ + if (isDeploy) { btnDeploy.setSelection(true); } - = + } initializeRuntimesCombo(cmbRuntimes, runtimeName); - = + } - = + protected void saveJBosswsRuntimeToModel(JBossWSRuntime jbws) { String duplicateMsg =3D ""; //$NON-NLS-1$ try { duplicateMsg =3D getDuplicateJars(jbws.getName()); } catch (JavaModelException e1) { - JBossWSCreationUIPlugin.getDefault().getLog().log( + JBossWSUIPlugin.getDefault().getLog().log( StatusUtils.errorStatus(e1)); } if ("".equals(duplicateMsg)) { //$NON-NLS-1$ @@ -214,11 +222,12 @@ model.setStringProperty( IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, jbws .getName()); - }else{ + } else { model.setStringProperty( IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, null); model.setStringProperty( - IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, null); = + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, + null); } } = @@ -229,13 +238,13 @@ .setBooleanProperty( IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED, true); - //remove user supplied properties + // remove user supplied properties model.setStringProperty( IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_ID, null); model.setStringProperty( - IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, null); = + IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_HOME, null); enableUserSupplied(false); - = + changePageStatus(); = } @@ -247,10 +256,10 @@ .setBooleanProperty( IJBossWSFacetDataModelProperties.JBOSS_WS_RUNTIME_IS_SERVER_SUPPLIED, false); - String runtimeId =3D cmbRuntimes.getText(); = - JBossWSRuntime jbws =3D JBossWSRuntimeManager.getInstance().findRuntimeB= yName(runtimeId); - = - = + String runtimeId =3D cmbRuntimes.getText(); + JBossWSRuntime jbws =3D JBossWSRuntimeManager.getInstance() + .findRuntimeByName(runtimeId); + if (jbws !=3D null) { saveJBosswsRuntimeToModel(jbws); } @@ -269,22 +278,22 @@ protected void initializeRuntimesCombo(Combo cmRuntime, String runtimeNam= e) { JBossWSRuntime selectedJbws =3D null; JBossWSRuntime defaultJbws =3D null; -// int selectIndex =3D 0; + // int selectIndex =3D 0; int defaultIndex =3D 0; cmRuntime.removeAll(); JBossWSRuntime[] runtimes =3D JBossWSRuntimeManager.getInstance() .getRuntimes(); for (int i =3D 0; i < runtimes.length; i++) { JBossWSRuntime jr =3D runtimes[i]; - if(jbossWSVersion.compareTo(jr.getVersion()) > 0){ + if (jbossWSVersion.compareTo(jr.getVersion()) > 0) { continue; } cmRuntime.add(jr.getName()); cmRuntime.setData(jr.getName(), jr); - = - if(jr.getName().equals(runtimeName)){ + + if (jr.getName().equals(runtimeName)) { selectedJbws =3D jr; -// selectIndex =3D i; + // selectIndex =3D i; } // get default jbossws runtime if (jr.isDefault()) { @@ -292,11 +301,11 @@ defaultIndex =3D i; } } - = - if(selectedJbws !=3D null){ - cmRuntime.setText(runtimeName); - saveJBosswsRuntimeToModel(selectedJbws); - }else if(defaultJbws !=3D null){ + + if (selectedJbws !=3D null) { + cmRuntime.setText(runtimeName); + saveJBosswsRuntimeToModel(selectedJbws); + } else if (defaultJbws !=3D null) { cmRuntime.select(defaultIndex); saveJBosswsRuntimeToModel(defaultJbws); } @@ -306,9 +315,10 @@ * create a new jbossws runtime and set user supplied runtime to the new = one */ protected void newJBossWSRuntime() { - List exists =3D new ArrayList(Arrays.asL= ist(JBossWSRuntimeManager.getInstance().getRuntimes())); + List exists =3D new ArrayList(Arrays + .asList(JBossWSRuntimeManager.getInstance().getRuntimes())); List added =3D new ArrayList(); - = + JBossWSRuntimeListFieldEditor.JBossWSRuntimeNewWizard newRtwizard =3D ne= w JBossWSRuntimeListFieldEditor.JBossWSRuntimeNewWizard( exists, added) { public boolean performFinish() { @@ -324,57 +334,57 @@ .getActiveShell(), newRtwizard); if (dialog.open() =3D=3D WizardDialog.OK) { initializeRuntimesCombo(cmbRuntimes, null); - //cmbRuntimes.select(0); + // cmbRuntimes.select(0); } } = protected void changePageStatus() { - = + if (btnUserSupplied.getSelection() && cmbRuntimes.getSelectionIndex() =3D=3D -1) { - setErrorMessage(JBossWSCreationCoreMessages.Error_WS_No_Runtime_Specife= d); + setErrorMessage(JBossWSUIMessages.Error_WS_No_Runtime_Specifed); } else if (!btnUserSupplied.getSelection() && !btnServerSupplied.getSelection()) { - setErrorMessage(JBossWSCreationCoreMessages.Error_WS_Chose_runtime); - }else if(btnUserSupplied.getSelection()){ + setErrorMessage(JBossWSUIMessages.Error_WS_Chose_runtime); + } else if (btnUserSupplied.getSelection()) { String duplicateMsg =3D ""; //$NON-NLS-1$ try { duplicateMsg =3D getDuplicateJars(cmbRuntimes.getText()); } catch (JavaModelException e1) { - JBossWSCreationUIPlugin.getDefault().getLog().log(StatusUtils.errorSta= tus(e1)); + JBossWSUIPlugin.getDefault().getLog().log( + StatusUtils.errorStatus(e1)); } - if(!duplicateMsg.equals("")){ //$NON-NLS-1$ + if (!duplicateMsg.equals("")) { //$NON-NLS-1$ setErrorMessage(MessageFormat - .format(JBossWSCreationCoreMessages.JBossWSRuntimeConfigBlock_Duplic= ated_Jar, = + .format( + JBossWSUIMessages.Error_JBossWSRuntimeConfigBlock_Duplicated_Jar, duplicateMsg)); - }else{ + } else { setErrorMessage(null); } - } - else if(btnServerSupplied.getSelection()){ + } else if (btnServerSupplied.getSelection()) { validateTargetRuntime(); - } - else{ + } else { setErrorMessage(null); } - = - //notify the parent property page to set error message - if(notifier !=3D null){ - notifier.notify(errMsg); = + + // notify the parent property page to set error message + if (notifier !=3D null) { + notifier.notify(errMsg); } } = - private void setErrorMessage(String msg){ + private void setErrorMessage(String msg) { this.errMsg =3D msg; } - = + public boolean isPageComplete() { - if(errMsg !=3D null && !"".equals(errMsg)){ //$NON-NLS-1$ + if (errMsg !=3D null && !"".equals(errMsg)) { //$NON-NLS-1$ return false; } if (btnServerSupplied.getSelection() || (btnUserSupplied.getSelection() && cmbRuntimes - .getSelectionIndex() !=3D -1)) { + .getSelectionIndex() !=3D -1)) { return true; } else { return false; @@ -384,51 +394,59 @@ public void propertyChanged(DataModelEvent event) { = } - = - protected String getDuplicateJars(String jbwsName) throws JavaModelExcept= ion{ - String prjName =3D model.getStringProperty(IFacetDataModelProperties.FAC= ET_PROJECT_NAME); - = - if(prjName =3D=3D null || "".equals(prjName)){ //$NON-NLS-1$ + + protected String getDuplicateJars(String jbwsName) + throws JavaModelException { + String prjName =3D model + .getStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME); + + if (prjName =3D=3D null || "".equals(prjName)) { //$NON-NLS-1$ return ""; //$NON-NLS-1$ } - IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject= (prjName); - if(!project.exists()){ + IProject project =3D ResourcesPlugin.getWorkspace().getRoot().getProject( + prjName); + if (!project.exists()) { return ""; //$NON-NLS-1$ } - = + List allExistingJars =3D new ArrayList(); List runtimeJars =3D new ArrayList(); = - JBossWSRuntime jbws =3D JBossWSRuntimeManager.getInstance().findRuntimeB= yName(jbwsName); - if(jbws.isUserConfigClasspath()){ + JBossWSRuntime jbws =3D JBossWSRuntimeManager.getInstance() + .findRuntimeByName(jbwsName); + if (jbws.isUserConfigClasspath()) { runtimeJars.addAll(jbws.getLibraries()); - }else{ - runtimeJars.addAll(JBossWSRuntimeManager.getInstance().getAllRuntimeJar= s(jbws)); + } else { + runtimeJars.addAll(JBossWSRuntimeManager.getInstance() + .getAllRuntimeJars(jbws)); } - = + IJavaProject javaProject =3D JavaCore.create(project); IClasspathEntry[] entries =3D javaProject.getRawClasspath(); - for(IClasspathEntry entry: entries){ - if(entry.getEntryKind() =3D=3D IClasspathEntry.CPE_CONTAINER){ - if(JBossWSCoreMessages.JBossWS_Runtime_Lib.equals(entry.getPath().segm= ent(0))){ - continue; + for (IClasspathEntry entry : entries) { + if (entry.getEntryKind() =3D=3D IClasspathEntry.CPE_CONTAINER) { + if (JBossWSCoreMessages.JBossWS_Runtime_Lib.equals(entry + .getPath().segment(0))) { + continue; } - IClasspathContainer container =3D JavaCore.getClasspathContainer(entry= .getPath(), javaProject); - for(IClasspathEntry containedEntry: container.getClasspathEntries()){ + IClasspathContainer container =3D JavaCore.getClasspathContainer( + entry.getPath(), javaProject); + for (IClasspathEntry containedEntry : container + .getClasspathEntries()) { allExistingJars.add(containedEntry.getPath().toOSString()); } - }else if(entry.getEntryKind() =3D=3D IClasspathEntry.CPE_LIBRARY){ + } else if (entry.getEntryKind() =3D=3D IClasspathEntry.CPE_LIBRARY) { allExistingJars.add(entry.getPath().toOSString()); } } - = - for(String jarName: runtimeJars){ - if(allExistingJars.contains(jarName)){ + + for (String jarName : runtimeJars) { + if (allExistingJars.contains(jarName)) { return jarName; } } - = - return ""; //$NON-NLS-1$ - = + + return ""; //$NON-NLS-1$ + } } Modified: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/w= s/core/test/JBossWSCoreAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core= /test/JBossWSCoreAllTests.java 2010-05-24 06:24:57 UTC (rev 22270) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core= /test/JBossWSCoreAllTests.java 2010-05-24 07:14:25 UTC (rev 22271) @@ -16,6 +16,7 @@ import junit.framework.TestSuite; = import org.jboss.tools.ws.core.test.classpath.JBossWSRuntimeManagerTest; +import org.jboss.tools.ws.core.test.project.facet.JBossWSProjectFacetTest; = public class JBossWSCoreAllTests extends TestCase { public static final String PLUGIN_ID =3D "org.jboss.tools.ws.creation.cor= e.test"; @@ -23,6 +24,7 @@ { TestSuite suite =3D new TestSuite(JBossWSCoreAllTests.class.getName()); suite.addTestSuite(JBossWSRuntimeManagerTest.class); + suite.addTestSuite(JBossWSProjectFacetTest.class); return suite; } } \ No newline at end of file Added: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/c= ore/test/project/facet/JBossWSProjectFacetTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core= /test/project/facet/JBossWSProjectFacetTest.java (r= ev 0) +++ trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jboss/tools/ws/core= /test/project/facet/JBossWSProjectFacetTest.java 2010-05-24 07:14:25 UTC (r= ev 22271) @@ -0,0 +1,56 @@ +package org.jboss.tools.ws.core.test.project.facet; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IWorkspace; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.wst.common.project.facet.core.IFacetedProject; +import org.eclipse.wst.common.project.facet.core.IProjectFacet; +import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; +import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; + +public class JBossWSProjectFacetTest extends TestCase { + protected static final IWorkspace ws =3D ResourcesPlugin.getWorkspace(); + private static final IProjectFacet wsFacet; + private static final IProjectFacetVersion wsVersion; + private IFacetedProject wsProj; + static { + wsFacet =3D ProjectFacetsManager.getProjectFacet("jbossws.core"); + wsVersion =3D wsFacet.getVersion("3.0"); + } + + @Override + protected void setUp() throws Exception { + // TODO Auto-generated method stub + super.setUp(); + wsProj =3D createFacetedProject("wsFacetTestProject"); + } + + public void testWSFacet() throws CoreException{ + wsProj.installProjectFacet(ProjectFacetsManager.getProjectFacet("jst.jav= a").getVersion("5.0"), null, null); + wsProj.installProjectFacet(ProjectFacetsManager.getProjectFacet("jst.web= ").getVersion("2.5"), null, null); + wsProj.installProjectFacet(wsVersion, null, null); + assertTrue(wsProj.hasProjectFacet(wsFacet)); + wsProj.uninstallProjectFacet(wsVersion, null, null); + assertFalse(wsProj.hasProjectFacet(wsVersion)); + } + = + protected void tearDown() throws Exception { + wsProj.getProject().delete(true, null); + super.tearDown(); + } + + protected IFacetedProject createFacetedProject(String name) + throws CoreException + + { + assertFalse(ws.getRoot().getProject(name).exists()); + final IFacetedProject fpj =3D ProjectFacetsManager.create(name, null, + null); + final IProject pj =3D fpj.getProject(); + assertTrue(pj.exists()); + return fpj; + } +} Property changes on: trunk/ws/tests/org.jboss.tools.ws.core.test/src/org/jb= oss/tools/ws/core/test/project/facet/JBossWSProjectFacetTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF 2010= -05-24 06:24:57 UTC (rev 22270) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/META-INF/MANIFEST.MF 2010= -05-24 07:14:25 UTC (rev 22271) @@ -15,9 +15,10 @@ org.eclipse.swtbot.junit4_x;bundle-version=3D"2.0.0", org.eclipse.swtbot.swt.finder;bundle-version=3D"2.0.0", org.eclipse.ui.ide;bundle-version=3D"3.5.1", - org.eclipse.ui.forms;bundle-version=3D"3.4.1", + org.eclipse.ui.forms;bundle-version=3D"3.4.1", org.junit4;bundle-version=3D"4.5.0", - org.jboss.tools.ws.ui;bundle-version=3D"1.1.0" + org.jboss.tools.ws.ui;bundle-version=3D"1.1.0", + org.eclipse.core.resources Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Eclipse-RegisterBuddy: org.apache.log4j Added: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws= /ui/bot/test/JBossWSProjectFacetBotTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui= /bot/test/JBossWSProjectFacetBotTest.java (rev 0) +++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui= /bot/test/JBossWSProjectFacetBotTest.java 2010-05-24 07:14:25 UTC (rev 2227= 1) @@ -0,0 +1,107 @@ +package org.jboss.tools.ws.ui.bot.test; + +import java.io.IOException; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; + +public class JBossWSProjectFacetBotTest extends TestCase { + private static SWTWorkbenchBot bot; + private static final String JBOSSWS_HOME_DEFAULT =3D "D:/softinstall/jbos= s-5.1.0.GA"; + public static final String JBOSSWS_42_HOME =3D "jbosstools.test.jboss.hom= e.5.1"; + public static final String JBOSS_AS_42_HOME =3D System.getProperty( + JBOSSWS_42_HOME, JBOSSWS_HOME_DEFAULT); + private IProject project; + + protected void setUp() throws Exception { + bot =3D new SWTWorkbenchBot(); + bot.viewByTitle("Welcome").close(); + createServerRuntime(); + } + + public void testNewWizard() throws IOException, CoreException { + bot.menu("File").menu("New").menu("Project...").click(); + bot.shell("New Project").activate(); + SWTBotTree tree =3D bot.tree(); + tree.expandNode("Web").expandNode("Dynamic Web Project").select(); + assertTrue(bot.button("Next >").isEnabled()); + bot.button("Next >").click(); + bot.shell("New Dynamic Web Project").activate(); + assertFalse(bot.button("Finish").isEnabled()); + = + bot.textWithLabel("Project name:").setText("A"); + assertTrue(bot.button("Finish").isEnabled()); + bot.comboBoxInGroup("Dynamic web module version").setSelection("2.5"); + bot.comboBoxInGroup("Configuration").setSelection("JBossWS Web Servic= e Project v3.0"); + assertFalse(bot.button("Finish").isEnabled()); + bot.button("Next >").click(); + bot.button("Next >").click(); + bot.button("Next >").click(); + bot.radio(0).click(); + bot.sleep(6000); + assertTrue(bot.button("Finish").isEnabled()); + bot.button("Finish").click(); + = + project =3D ResourcesPlugin.getWorkspace().getRoot().getProject("A"); + assertNotNull(project); + = + } + + protected void tearDown() throws Exception { + bot =3D null; + } + + protected void createServerRuntime() { + if (!isServerRuntimeDefined(bot, "AS4.2Runtime")) { + bot.menu("File").menu("New").menu("Other...").click(); + bot.shell("New").activate(); + SWTBotTree tree =3D bot.tree(); + bot.sleep(1000); + tree.expandNode("Server").select("Server"); + bot.button("Next >").click(); + SWTBotTree tree2 =3D bot.tree(); + tree2.expandNode("JBoss Community").select("JBoss AS 5.1"); + bot.textWithLabel("Server name:").setText("AS4.2Server"); + bot.button("Next >").click(); + bot.textWithLabel("Name").setText("AS4.2Runtime"); + bot.textWithLabel("Home Directory").setText(JBOSS_AS_42_HOME); + bot.button("Finish").click(); + bot.sleep(2000); + } + } + + public static boolean isServerRuntimeDefined(SWTWorkbenchBot bot, + String runtimeName) { + + boolean serverRuntimeNotDefined =3D true; + + bot.menu("Window").menu("Preferences").click(); + bot.shell("Preferences").activate(); + bot.tree().expandNode("Server").select("Runtime Environments"); + + SWTBotTable tbRuntimeEnvironments =3D bot.table(); + int numRows =3D tbRuntimeEnvironments.rowCount(); + if (numRows > 0) { + int currentRow =3D 0; + while (serverRuntimeNotDefined && currentRow < numRows) { + if (tbRuntimeEnvironments.cell(currentRow, 0).equalsIgnoreCase( + runtimeName)) { + serverRuntimeNotDefined =3D false; + } else { + currentRow++; + } + } + } + + bot.button("OK").click(); + + return !serverRuntimeNotDefined; + + } +} Property changes on: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/= jboss/tools/ws/ui/bot/test/JBossWSProjectFacetBotTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============0046269313927707148==-- From jbosstools-commits at lists.jboss.org Mon May 24 04:33:04 2010 Content-Type: multipart/mixed; boundary="===============6302555755016684938==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22272 - trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands. Date: Mon, 24 May 2010 04:33:04 -0400 Message-ID: <201005240833.o4O8X41n004740@svn01.web.mwc.hst.phx2.redhat.com> --===============6302555755016684938== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Grid.Qian Date: 2010-05-24 04:33:04 -0400 (Mon, 24 May 2010) New Revision: 22272 Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws= /creation/core/commands/RemoveClientJarsCommand.java Log: JBIDE-6187: fix the build failure Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/t= ools/ws/creation/core/commands/RemoveClientJarsCommand.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/w= s/creation/core/commands/RemoveClientJarsCommand.java 2010-05-24 07:14:25 U= TC (rev 22271) +++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/w= s/creation/core/commands/RemoveClientJarsCommand.java 2010-05-24 08:33:04 U= TC (rev 22272) @@ -22,7 +22,7 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperat= ion; -import org.jboss.tools.ws.core.classpath.JBossWSRuntimeClasspathContainer; +import org.jboss.tools.ws.core.classpath.JBossWSRuntimeClassPathInitialize= r.JBossWSRuntimeClasspathContainer; import org.jboss.tools.ws.core.utils.StatusUtils; import org.jboss.tools.ws.creation.core.JBossWSCreationCorePlugin; import org.jboss.tools.ws.creation.core.data.ServiceModel; --===============6302555755016684938==-- From jbosstools-commits at lists.jboss.org Mon May 24 06:43:14 2010 Content-Type: multipart/mixed; boundary="===============4268440948451135778==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22273 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl. Date: Mon, 24 May 2010 06:43:14 -0400 Message-ID: <201005241043.o4OAhENP030621@svn01.web.mwc.hst.phx2.redhat.com> --===============4268440948451135778== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-24 06:43:14 -0400 (Mon, 24 May 2010) New Revision: 22273 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/CDIProject.java Log: https://jira.jboss.org/browse/JBIDE-6311 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/CDIProject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/CDIProject.java 2010-05-24 08:33:04 UTC (rev 22272) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/CDIProject.java 2010-05-24 10:43:14 UTC (rev 22273) @@ -248,6 +248,7 @@ } = boolean isParameter =3D injectionPoints instanceof InjectionPointParamet= er; + boolean isNew =3D false; = Set qs =3D injectionPoints.getQualifierDeclaratio= ns(); List qs2 =3D null; @@ -256,8 +257,21 @@ Set qs_ =3D ((InjectionPointParameter)injectionPoints).getQ= ualifiers(); for (IQualifier q: qs_) { IType t =3D q.getSourceType(); - if(t !=3D null) qs2.add(t); + if(t !=3D null) { + if(CDIConstants.NEW_QUALIFIER_TYPE_NAME.equals(t.getFullyQualifiedNam= e())) { + isNew =3D true; + } else { + qs2.add(t); + } + } } + } else { + for (IQualifierDeclaration d: qs) { + if(CDIConstants.NEW_QUALIFIER_TYPE_NAME.equals(d.getType().getFullyQua= lifiedName())) { + isNew =3D true; + break; + } = + } } = Set beans =3D new HashSet(); @@ -265,6 +279,14 @@ beans.addAll(allBeans); } for (IBean b: beans) { + if(isNew) { + //TODO improve + IType bType =3D b.getBeanClass(); + if(type.equals(bType)) { + result.add(b); + } + continue; + } Set types =3D b.getLegalTypes(); if(containsType(types, type)) { try { --===============4268440948451135778==-- From jbosstools-commits at lists.jboss.org Mon May 24 07:22:59 2010 Content-Type: multipart/mixed; boundary="===============3307645811682827010==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22274 - in trunk: cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck and 1 other directories. Date: Mon, 24 May 2010 07:22:59 -0400 Message-ID: <201005241122.o4OBMxMA008763@svn01.web.mwc.hst.phx2.redhat.com> --===============3307645811682827010== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-24 07:22:59 -0400 (Mon, 24 May 2010) New Revision: 22274 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valida= tion/ELValidator.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-24 10:43:14 UTC (rev 22273) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-24 11:22:59 UTC (rev 22274) @@ -91,15 +91,15 @@ - non-static field of a session bean class is annotated @Produces - interceptor or decorator has a field annotated @Produces = - - - 3.5.1. Declaring a resource - producer field declaration specifies an EL name (together with one of = @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) - matching object in the Java EE component environment is not of the same = type = as the producer field declaration = + + + 3.6. Additional built-in beans - Java EE component class has an injection point of type UserTransaction = and qualifier @Default, and may not validly make use of the JTA UserTran= saction = Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-24 10:43:14 UTC (rev 22273) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-24 11:22:59 UTC (rev 22274) @@ -742,6 +742,13 @@ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.RESOURCE_PRODUCER_FIELD_SETS_E= L_NAME, 15, 19, 24, 27, 31); } = + /* + * 3.5.1. Declaring a resource + * - matching object in the Java EE component environment is not of the = same type as the producer field declaration + * = + * Cannot implement this validation rule. + */ + /** * 3.9.1. Declaring an initializer method * - an initializer method has a parameter annotated @Disposes Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web= /validation/ELValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/ELValidator.java 2010-05-24 10:43:14 UTC (rev 22273) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/valid= ation/ELValidator.java 2010-05-24 11:22:59 UTC (rev 22274) @@ -263,6 +263,7 @@ } = private void validateEL(ELReference el) { + displaySubtask(JSFValidationMessages.VALIDATING_EL_FILE, new String[]{el= .getResource().getProject().getName(), el.getResource().getName()}); el.deleteMarkers(); for (ELExpression expresion : el.getEl()) { validateELExpression(el, expresion); --===============3307645811682827010==-- From jbosstools-commits at lists.jboss.org Mon May 24 07:33:28 2010 Content-Type: multipart/mixed; boundary="===============7918929344384391251==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22275 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl. Date: Mon, 24 May 2010 07:33:28 -0400 Message-ID: <201005241133.o4OBXSJS009781@svn01.web.mwc.hst.phx2.redhat.com> --===============7918929344384391251== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-24 07:33:28 -0400 (Mon, 24 May 2010) New Revision: 22275 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/CDIProject.java Log: https://jira.jboss.org/browse/JBIDE-6311 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/CDIProject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/CDIProject.java 2010-05-24 11:22:59 UTC (rev 22274) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/CDIProject.java 2010-05-24 11:33:28 UTC (rev 22275) @@ -282,7 +282,7 @@ if(isNew) { //TODO improve IType bType =3D b.getBeanClass(); - if(type.equals(bType)) { + if(bType !=3D null && bType.equals(type.getType())) { result.add(b); } continue; --===============7918929344384391251==-- From jbosstools-commits at lists.jboss.org Mon May 24 08:14:52 2010 Content-Type: multipart/mixed; boundary="===============1774355270231013981==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22276 - in trunk/cdi/plugins: org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink and 1 other directory. Date: Mon, 24 May 2010 08:14:52 -0400 Message-ID: <201005241214.o4OCEqAu020189@svn01.web.mwc.hst.phx2.redhat.com> --===============1774355270231013981== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-24 08:14:51 -0400 (Mon, 24 May 2010) New Revision: 22276 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/t= ext/ext/hyperlink/InjectedPointHyperlinkDetector.java Log: https://jira.jboss.org/browse/JBIDE-6311 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDIUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-24 11:33:28 UTC (rev 22275) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-24 12:14:51 UTC (rev 22276) @@ -23,6 +23,7 @@ import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.ILocalVariable; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; @@ -75,7 +76,7 @@ * @param element */ public static IInjectionPoint findInjectionPoint(Set beans, IJavaE= lement element) { - if (!(element instanceof IField) && (element instanceof IMethod)) { + if (!(element instanceof IField) && (element instanceof IMethod) && (ele= ment instanceof ILocalVariable)) { return null; } = @@ -90,6 +91,10 @@ if (((IInjectionPointMethod) iPoint).getMethod() !=3D null && ((IInje= ctionPointMethod) iPoint).getMethod().equals(element)) { return iPoint; } + }else if(element instanceof ILocalVariable && iPoint instanceof IInjec= tionPointParameter){ + if (((IInjectionPointParameter) iPoint).getName().equals(element.getE= lementName())) { + return iPoint; + } } } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tool= s/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2010-05-24 11:33:28 = UTC (rev 22275) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2010-05-24 12:14:51 = UTC (rev 22276) @@ -19,6 +19,7 @@ import org.eclipse.jdt.core.ICodeAssist; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.ILocalVariable; import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; @@ -94,12 +95,7 @@ } } = - if (element instanceof IAnnotatable && element instanceof IMember) { - IAnnotatable annotatable =3D (IAnnotatable)element; - = - if(!findAnnotation(annotatable, ((IMember)element).getDeclaringType()= )) - continue; - = + if(findAnnotation(element)){ hyperlinks.add(new InjectedPointListHyperlink(file, textViewer, wordR= egion, element, document)); } } @@ -113,15 +109,39 @@ return null; } = - private boolean findAnnotation(IAnnotatable annotatable, IType type){ - try{ - IAnnotation[] annotations =3D annotatable.getAnnotations(); - for(IAnnotation annotation : annotations){ - if(annotation !=3D null && annotation.getElementName() !=3D null && CD= IConstants.INJECT_ANNOTATION_TYPE_NAME.equals(EclipseJavaUtil.resolveType(t= ype, annotation.getElementName()))) - return true; + private IMember findMember(IJavaElement element){ + IJavaElement elem =3D element; + while(elem !=3D null){ + if(elem instanceof IMember) + return (IMember)elem; + elem =3D elem.getParent(); + } + return null; + } + = + private boolean findAnnotation(IJavaElement element){ + if(element instanceof IAnnotatable){ + IAnnotatable annotatable =3D (IAnnotatable) element; + IType type =3D null; + if(element instanceof IMember){ + type =3D ((IMember)element).getDeclaringType(); + try{ + IAnnotation[] annotations =3D annotatable.getAnnotations(); + for(IAnnotation annotation : annotations){ + if(annotation !=3D null && annotation.getElementName() !=3D null && = CDIConstants.INJECT_ANNOTATION_TYPE_NAME.equals(EclipseJavaUtil.resolveType= (type, annotation.getElementName()))) + return true; + } + }catch (JavaModelException jme) { + CDIExtensionsPlugin.log(jme); + } + }else if(element instanceof ILocalVariable){ + IMember member =3D findMember(element); + if(member =3D=3D null) + return false; + type =3D member.getDeclaringType(); + return true; } - }catch (JavaModelException jme) { - CDIExtensionsPlugin.log(jme); + = } return false; = --===============1774355270231013981==-- From jbosstools-commits at lists.jboss.org Mon May 24 08:39:33 2010 Content-Type: multipart/mixed; boundary="===============6003573065259211567==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22277 - in branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui: xpl and 1 other directory. Date: Mon, 24 May 2010 08:39:33 -0400 Message-ID: <201005241239.o4OCdXS9022715@svn01.web.mwc.hst.phx2.redhat.com> --===============6003573065259211567== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-24 08:39:33 -0400 (Mon, 24 May 2010) New Revision: 22277 Modified: branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/j= boss/ide/eclipse/as/ui/JBossServerUIPlugin.java branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/j= boss/ide/eclipse/as/ui/xpl/JavaMainTabClone.java Log: JBIDE-6218 - astools compilation error Modified: branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossu= i/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/= jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2010-05-24 12:14:51 UTC (r= ev 22276) +++ branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/= jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2010-05-24 12:39:33 UTC (r= ev 22277) @@ -75,7 +75,7 @@ } = if( !prefs.getBoolean(IPreferenceKeys.DISABLE_SHOW_SERVER_VIEW)) { - new ServerUIPreferences().setShowOnActivity(false); + ServerUIPreferences.getInstance().setShowOnActivity(false); prefs.setValue(IPreferenceKeys.DISABLE_SHOW_SERVER_VIEW, true); } savePluginPreferences(); Modified: branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossu= i/org/jboss/ide/eclipse/as/ui/xpl/JavaMainTabClone.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/= jboss/ide/eclipse/as/ui/xpl/JavaMainTabClone.java 2010-05-24 12:14:51 UTC (= rev 22276) +++ branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/= jboss/ide/eclipse/as/ui/xpl/JavaMainTabClone.java 2010-05-24 12:39:33 UTC (= rev 22277) @@ -11,6 +11,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; +import org.eclipse.debug.internal.ui.SWTFactory; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaModel; import org.eclipse.jdt.core.IJavaProject; @@ -22,7 +23,6 @@ import org.eclipse.jdt.debug.ui.IJavaDebugUIConstants; import org.eclipse.jdt.internal.debug.ui.IJavaDebugHelpContextIds; import org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin; -import org.eclipse.jdt.internal.debug.ui.SWTFactory; import org.eclipse.jdt.internal.debug.ui.launcher.DebugTypeSelectionDialog; import org.eclipse.jdt.internal.debug.ui.launcher.LauncherMessages; import org.eclipse.jdt.internal.debug.ui.launcher.MainMethodSearchEngine; --===============6003573065259211567==-- From jbosstools-commits at lists.jboss.org Mon May 24 08:46:25 2010 Content-Type: multipart/mixed; boundary="===============7339129713609394067==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22278 - in trunk/cdi/tests: org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test and 1 other directory. Date: Mon, 24 May 2010 08:46:25 -0400 Message-ID: <201005241246.o4OCkPUg024272@svn01.web.mwc.hst.phx2.redhat.com> --===============7339129713609394067== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-24 08:46:25 -0400 (Mon, 24 May 2010) New Revision: 22278 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/decora= tors/invocation/producer/method/CustomProducerImpl.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/CdiTextExtAllTests.java Log: https://jira.jboss.org/browse/JBIDE-6311 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/de= corators/invocation/producer/method/CustomProducerImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/decor= ators/invocation/producer/method/CustomProducerImpl.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/decor= ators/invocation/producer/method/CustomProducerImpl.java 2010-05-24 12:46:2= 5 UTC (rev 22278) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.jsr299.tck.tests.decorators.invocation.producer.method; + +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.New; +import javax.enterprise.inject.Produces; + + +/** + * @author pmuir + * + */ +public class CustomProducerImpl implements Producer +{ + = + private static boolean disposedCorrectly =3D false; + = + /** + * @param log the log to set + */ + public static void reset() + { + disposedCorrectly =3D false; + } + = + @Produces + public Foo produce() + { + return new Foo("foo!"); + } + = + @Produces + public Foo produce2(@New(Foo.class) Foo order) + { + return new Foo("foo!"); + } + = + public void dispose(@Disposes Foo foo) + { + disposedCorrectly =3D foo.getFoo().equals("decorated"); + } + = + /** + * @return the disposedCorrectly + */ + public static boolean isDisposedCorrectly() + { + return disposedCorrectly; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/decorators/invocation/producer/method/CustomProducerImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/CdiTextExtAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/CdiTextExtAllTests.java 2010-05-24 12:39:33 UTC (rev 22277) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/CdiTextExtAllTests.java 2010-05-24 12:46:25 UTC (rev 22278) @@ -9,6 +9,7 @@ TestSuite suite =3D new TestSuite(CdiTextExtAllTests.class.getName()); suite.addTest(InjectedPointHyperlinkDetectorTest.suite()); suite.addTest(ProducerDisposerHyperlinkDetectorTest.suite()); + suite.addTest(InjectedPointInProducerMethodHyperlinkDetectorTest.suite()= ); return suite; } } Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tool= s/cdi/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java 20= 10-05-24 12:46:25 UTC (rev 22278) @@ -0,0 +1,110 @@ +package org.jboss.tools.cdi.text.ext.test; + +import java.util.ArrayList; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.jface.text.source.ISourceViewer; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.texteditor.DocumentProviderRegistry; +import org.eclipse.ui.texteditor.IDocumentProvider; +import org.eclipse.ui.texteditor.ITextEditor; +import org.jboss.tools.cdi.core.test.tck.TCKTest; +import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetect= or; + +public class InjectedPointInProducerMethodHyperlinkDetectorTest extends Hy= perlinkDetectorTest{ + private static final String PROJECT_NAME =3D "/tests/decorators/invocatio= n/producer/method"; + private static final String FILE_NAME =3D "JavaSource/org/jboss/jsr299/tc= k/tests/decorators/invocation/producer/method/CustomProducerImpl.java"; + + public static Test suite() { + return new TestSuite(InjectedPointInProducerMethodHyperlinkDetectorTest.= class); + } + + public void testProducerDisposerHyperlinkDetector() throws Exception { + IProject project =3D TCKTest.importPreparedProject(PROJECT_NAME); + doTest(project); + TCKTest.cleanProject(PROJECT_NAME); + } + + private void doTest(IProject project) throws Exception { + IFile javaFile =3D project.getFile(FILE_NAME); + + TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile !=3D null)); + TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile.exists())); + + FileEditorInput editorInput =3D new FileEditorInput(javaFile); + + IDocumentProvider documentProvider =3D null; + Throwable exception =3D null; + try { + documentProvider =3D DocumentProviderRegistry.getDefault().getDocumentP= rovider(editorInput); + } catch (Exception x) { + exception =3D x; + x.printStackTrace(); + } + assertNull("An exception caught: " + (exception !=3D null? exception.get= Message() : ""), exception); + + assertNotNull("The document provider for the file \"" + FILE_NAME + "\" = is not loaded", documentProvider); + + try { + documentProvider.connect(editorInput); + } catch (Exception x) { + exception =3D x; + x.printStackTrace(); + assertTrue("The document provider is not able to be initialized with th= e editor input", false); + } + assertNull("An exception caught: " + (exception !=3D null? exception.get= Message() : ""), exception); + + IDocument document =3D documentProvider.getDocument(editorInput); + + assertNotNull("The document for the file \"" + FILE_NAME + "\" is not lo= aded", document); + + InjectedPointHyperlinkDetector elPartitioner =3D new InjectedPointHyperl= inkDetector(); + + ArrayList regionList =3D new ArrayList(); + regionList.add(new Region(1374, 5)); // order + regionList.add(new Region(1462, 3)); = + regionList.add(new Region(1498, 3)); = + + IEditorPart part =3D openFileInEditor(javaFile); + ISourceViewer viewer =3D null; + if(part instanceof JavaEditor){ + viewer =3D ((JavaEditor)part).getViewer(); + } + + elPartitioner.setContext(new TestContext((ITextEditor)part)); + + int counter =3D 0; + for (int i =3D 0; i < document.getLength(); i++) { + TestData testData =3D new TestData(document, i); + IHyperlink[] links =3D elPartitioner.detectHyperlinks(viewer, testData.= getHyperlinkRegion(), true); + + boolean recognized =3D links !=3D null; + + if (recognized) { + counter++; + if(!findOffsetInRegions(i, regionList)){ + fail("Wrong detection for offset - "+i); + } + } else { + for(Region region : regionList){ + if(i >=3D region.getOffset() && i <=3D region.getOffset()+region.getL= ength()) + fail("Wrong detection for region - "+region.getOffset()+" : "+region= .getLength()+" region - "+i); + } + } + } + + assertEquals("Wrong recognized region count: ", 14, counter); + + documentProvider.disconnect(editorInput); + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/= org/jboss/tools/cdi/text/ext/test/InjectedPointInProducerMethodHyperlinkDet= ectorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============7339129713609394067==-- From jbosstools-commits at lists.jboss.org Mon May 24 08:48:21 2010 Content-Type: multipart/mixed; boundary="===============7857280618903855489==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22279 - branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.ui/src/org/jboss/tools/esb/project/ui/wizards/pages. Date: Mon, 24 May 2010 08:48:21 -0400 Message-ID: <201005241248.o4OCmLKf024368@svn01.web.mwc.hst.phx2.redhat.com> --===============7857280618903855489== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-24 08:48:21 -0400 (Mon, 24 May 2010) New Revision: 22279 Modified: branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.ui/src/org/j= boss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java Log: JBIDE-6220 - compilation errors Modified: branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.ui/sr= c/org/jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.ui/src/org/= jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2010-05-2= 4 12:46:25 UTC (rev 22278) +++ branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.ui/src/org/= jboss/tools/esb/project/ui/wizards/pages/ESBProjectFirstPage.java 2010-05-2= 4 12:48:21 UTC (rev 22279) @@ -10,12 +10,14 @@ *************************************************************************= *****/ package org.jboss.tools.esb.project.ui.wizards.pages; = +import java.util.HashMap; import java.util.HashSet; +import java.util.Map; import java.util.Set; = +import org.eclipse.jdt.core.JavaCore; import org.eclipse.jface.dialogs.IDialogSettings; -import org.eclipse.jst.common.project.facet.JavaFacetUtils; -import org.eclipse.jst.common.project.facet.core.internal.JavaFacetUtil; +import org.eclipse.jst.common.project.facet.core.JavaFacet; import org.eclipse.jst.j2ee.internal.plugin.J2EEUIPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; @@ -61,30 +63,49 @@ = } = + @Override protected IDialogSettings getDialogSettings() { return J2EEUIPlugin.getDefault().getDialogSettings(); } = = @Override - protected Set getFacetConfiguration( final IProject= FacetVersion primaryFacetVersion ) - { + protected Set getFacetConfiguration( final IProject= FacetVersion primaryFacetVersion ) { final Set config =3D new HashSet(); IFacetedProjectWorkingCopy fpjwc =3D (IFacetedProjectWorkingCopy) this.m= odel .getProperty(FACETED_PROJECT_WORKING_COPY); for (IProjectFacet fixedFacet : fpjwc.getFixedProjectFacets()) { if (fixedFacet =3D=3D primaryFacetVersion.getProjectFacet()) { config.add(primaryFacetVersion); - } else if (fixedFacet =3D=3D JavaFacetUtils.JAVA_FACET) { - String compilerLevel =3D JavaFacetUtil.getCompilerLevel(); - IProjectFacetVersion facetVersion =3D JavaFacetUtil.compilerLevelToFac= et(compilerLevel); - config.add(facetVersion); + } else if (fixedFacet =3D=3D JavaFacet.FACET) { + IProjectFacetVersion v =3D getDefaultJavaVersion(); + config.add(getDefaultJavaVersion()); } else { config.add(fpjwc.getHighestAvailableVersion(fixedFacet)); } } - = return config; } = + = + private static final Map EXEC_ENV_TO_FACE= T_VER=3D new HashMap(); + static { + EXEC_ENV_TO_FACET_VER.put( "1.3",JavaFacet.VERSION_1_3 ); //$NON-NLS-= 1$ + EXEC_ENV_TO_FACET_VER.put( "1.4",JavaFacet.VERSION_1_4 ); //$NON-NLS-= 1$ + EXEC_ENV_TO_FACET_VER.put( "1.5",JavaFacet.VERSION_1_5 ); //$NON-NLS-= 1$ + EXEC_ENV_TO_FACET_VER.put( "1.6",JavaFacet.VERSION_1_6 ); //$NON-NLS-= 1$ + EXEC_ENV_TO_FACET_VER.put( "1.7",JavaFacet.VERSION_1_7 ); //$NON-NLS-= 1$ + } + = + protected IProjectFacetVersion getDefaultJavaVersion() { + IProjectFacetVersion val =3D EXEC_ENV_TO_FACET_VER.get(getCompilerLevel(= )); + return val =3D=3D null ? JavaFacet.VERSION_1_5 : val; = + } + = + public static String getCompilerLevel() { + String level =3D JavaCore.getOption( JavaCore.COMPILER_COMPLIANCE = ); + if( level =3D=3D null ) = + level =3D (String) JavaCore.getDefaultOptions().get( JavaCore.COM= PILER_COMPLIANCE ); + return level; + } } --===============7857280618903855489==-- From jbosstools-commits at lists.jboss.org Mon May 24 09:37:42 2010 Content-Type: multipart/mixed; boundary="===============7559711251226720076==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22280 - trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tools/drools/ui/bot/test/smoke. Date: Mon, 24 May 2010 09:37:42 -0400 Message-ID: <201005241337.o4ODbgJe003614@svn01.web.mwc.hst.phx2.redhat.com> --===============7559711251226720076== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vpakan(a)redhat.com Date: 2010-05-24 09:37:42 -0400 (Mon, 24 May 2010) New Revision: 22280 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/tool= s/drools/ui/bot/test/smoke/RuleFlowTest.java Log: Removed testing of Tools which were removed from Rule Flow Editor. Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jbo= ss/tools/drools/ui/bot/test/smoke/RuleFlowTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-24 12:48:21 UTC (rev = 22279) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/src/org/jboss/too= ls/drools/ui/bot/test/smoke/RuleFlowTest.java 2010-05-24 13:37:42 UTC (rev = 22280) @@ -57,7 +57,7 @@ private static final String NODES_NODE_NAME =3D "nodes"; private static final String CONNECTIONS_NODE_NAME =3D "connections"; private static final String CONNECTION_NODE_NAME =3D "connection"; - private static final int NODES_NODE_CHILDREN_COUNT =3D 14; + private static final int NODES_NODE_CHILDREN_COUNT =3D 7; private static final int CONNECTIONS_NODE_CHILDREN_COUNT =3D 1; private static final int ROOT_NODE_CHILDREN_COUNT =3D 3; /** @@ -122,8 +122,13 @@ // Draw each component String[] tools =3D new String[]{"Start Event","End Event","Rule Task", "Gateway [diverge]","Gateway [converge]","Reusable Sub-Process", - "Script Task","Timer Event","Error Event","Message Event","User Task= ", - "Embedded Sub-Process","Log","Email"}; + "Script Task" + /* + ,"Timer Event","Error Event","Message Event","User Task", + = + "Embedded Sub-Process","Log","Email" + */ + }; int xspacing =3D 100; int xoffset =3D 10; int yspacing =3D 100; @@ -367,19 +372,28 @@ private static List getMandatoryNodesOfNodesNode(){ LinkedList allowedNodes =3D new LinkedList(); allowedNodes.add("split"); + /* allowedNodes.add("timerNode"); allowedNodes.add("humanTask"); + */ allowedNodes.add("ruleSet"); allowedNodes.add("actionNode"); + /* allowedNodes.add("composite"); + */ allowedNodes.add("end"); + /* allowedNodes.add("workItem"); allowedNodes.add("fault"); + */ allowedNodes.add("subProcess"); allowedNodes.add("start"); + /* allowedNodes.add("workItem"); allowedNodes.add("eventNode"); + */ allowedNodes.add("join"); + = return allowedNodes; } = --===============7559711251226720076==-- From jbosstools-commits at lists.jboss.org Mon May 24 09:46:58 2010 Content-Type: multipart/mixed; boundary="===============5838818172923793665==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22281 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition and 2 other directories. Date: Mon, 24 May 2010 09:46:58 -0400 Message-ID: <201005241346.o4ODkwgZ004951@svn01.web.mwc.hst.phx2.redhat.com> --===============5838818172923793665== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-24 09:46:57 -0400 (Mon, 24 May 2010) New Revision: 22281 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= IClassBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/MethodDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : bean class has more than one constructor annotated @Inject Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/IClassBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IClassBean.java 2010-05-24 13:37:42 UTC (rev 22280) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IClassBean.java 2010-05-24 13:46:57 UTC (rev 22281) @@ -34,9 +34,9 @@ Set getDisposers(); = /** - * Returns a set of bean constructor of the bean. + * Returns a set of bean constructors of the bean. * = - * @return a set of bean constructor of the bean. + * @return a set of bean constructors of the bean. */ Set getBeanConstructor(); = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/MethodDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-24 13:37:42 UTC (re= v 22280) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-24 13:46:57 UTC (re= v 22281) @@ -47,7 +47,7 @@ } = public boolean isConstructor() { - return isConstructor(); + return isConstructor; } = protected void init(IType contextType, DefinitionContext context) throws = CoreException { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-24 13:37:42 UTC (rev 222= 80) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-24 13:46:57 UTC (rev 222= 81) @@ -343,8 +343,31 @@ validateSessionBean((ISessionBean) bean); } validateMixedClassBean(bean); + validateConstructors(bean); } = + private void validateConstructors(IClassBean bean) { + Set constructors =3D bean.getBeanConstructor(); + if(constructors.size()>1) { + Set injects =3D new HashSet(); + for (IBeanMethod constructor : constructors) { + IAnnotationDeclaration inject =3D constructor.getAnnotation(CDIConstan= ts.INJECT_ANNOTATION_TYPE_NAME); + if(inject!=3Dnull) { + injects.add(inject); + } + } + /* + * 3.7.1. Declaring a bean constructor + * - bean class has more than one constructor annotated @Inject + */ + if(injects.size()>1) { + for (IAnnotationDeclaration inject : injects) { + addError(CDIValidationMessages.MULTIPLE_INJECTION_CONSTRUCTORS, CDIPr= eferences.MULTIPLE_INJECTION_CONSTRUCTORS, inject, bean.getResource()); + } + } + } + } + private void validateDisposers(IClassBean bean) { Set disposers =3D bean.getDisposers(); if (disposers.isEmpty()) { @@ -367,8 +390,7 @@ Set disposerDeclarations =3D CDIUtil.getAnnota= tionPossitions(disposerMethod, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); for (ITextSourceReference declaration : disposerDeclarations) { - addError(CDIValidationMessages.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDI= Preferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, declaration, bean - .getResource()); + addError(CDIValidationMessages.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDI= Preferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, declaration, bean.getResource(= )); } } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-24 13:37:42 UTC (rev 22280) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-24 13:46:57 UTC (rev 22281) @@ -97,14 +97,14 @@ - matching object in the Java EE component environment is not of the same = type = as the producer field declaration = - - - 3.6. Additional built-in beans - Java EE component class has an injection point of type UserTransaction = and qualifier @Default, and may not validly make use of the JTA UserTran= saction = according to the Java EE platform specification = + + + 3.7.1. Declaring a bean constructor - bean class has more than one constructor annotated @Inject - bean constructor has a parameter annotated @Disposes, or @Observes Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-24 13:37:42 UTC (rev 22280) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-24 13:46:57 UTC (rev 22281) @@ -746,10 +746,28 @@ * 3.5.1. Declaring a resource * - matching object in the Java EE component environment is not of the = same type as the producer field declaration * = - * Cannot implement this validation rule. + * TODO needs some investigation. */ = + /* + * 3.6. Additional built-in beans + * - Java EE component class has an injection point of type UserTransacti= on and qualifier @Default, and may not validly make use of the JTA UserTran= saction according to the Java EE platform specification + * = + * TODO needs some investigation. + */ + /** + * 3.7.1. Declaring a bean constructor + * - bean class has more than one constructor annotated @Inject + * = + * @throws Exception + */ + public void testTooManyInitializerAnnotatedConstructor() throws Exception= { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/simple/definition/tooManyInitializerAnnotatedConstructors/G= oose_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.MULTIPLE_INJECTION_CONSTRUCTOR= S, 24, 29); + } + + /** * 3.9.1. Declaring an initializer method * - an initializer method has a parameter annotated @Disposes * = --===============5838818172923793665==-- From jbosstools-commits at lists.jboss.org Mon May 24 10:05:13 2010 Content-Type: multipart/mixed; boundary="===============5003432135656114439==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22282 - in trunk/cdi/tests: org.jboss.tools.cdi.core.test/resources/tck/tests/jbt and 2 other directories. Date: Mon, 24 May 2010 10:05:12 -0400 Message-ID: <201005241405.o4OE5CWB013142@svn01.web.mwc.hst.phx2.redhat.com> --===============5003432135656114439== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-24 10:05:12 -0400 (Mon, 24 May 2010) New Revision: 22282 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/op= enon/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/op= enon/CustomProducerImpl.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/op= enon/Foo.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/op= enon/Producer.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/op= enon/ProducerDecorator.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/op= enon/ProducerImpl.java Removed: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/decora= tors/invocation/producer/method/CustomProducerImpl.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/HyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/InjectedPointHyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java Log: https://jira.jboss.org/browse/JBIDE-6311 Deleted: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/= decorators/invocation/producer/method/CustomProducerImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/decor= ators/invocation/producer/method/CustomProducerImpl.java 2010-05-24 13:46:5= 7 UTC (rev 22281) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/decor= ators/invocation/producer/method/CustomProducerImpl.java 2010-05-24 14:05:1= 2 UTC (rev 22282) @@ -1,66 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.jsr299.tck.tests.decorators.invocation.producer.method; - -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.New; -import javax.enterprise.inject.Produces; - - -/** - * @author pmuir - * - */ -public class CustomProducerImpl implements Producer -{ - = - private static boolean disposedCorrectly =3D false; - = - /** - * @param log the log to set - */ - public static void reset() - { - disposedCorrectly =3D false; - } - = - @Produces - public Foo produce() - { - return new Foo("foo!"); - } - = - @Produces - public Foo produce2(@New(Foo.class) Foo order) - { - return new Foo("foo!"); - } - = - public void dispose(@Disposes Foo foo) - { - disposedCorrectly =3D foo.getFoo().equals("decorated"); - } - = - /** - * @return the disposedCorrectly - */ - public static boolean isDisposedCorrectly() - { - return disposedCorrectly; - } - -} Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/openon/CustomProducerImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/o= penon/CustomProducerImpl.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/o= penon/CustomProducerImpl.java 2010-05-24 14:05:12 UTC (rev 22282) @@ -0,0 +1,50 @@ +package org.jboss.jsr299.tck.tests.jbt.openon; + +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.New; +import javax.enterprise.inject.Produces; + + +/** + * @author pmuir + * + */ +public class CustomProducerImpl implements Producer +{ + = + private static boolean disposedCorrectly =3D false; + = + /** + * @param log the log to set + */ + public static void reset() + { + disposedCorrectly =3D false; + } + = + @Produces + public Foo produce() + { + return new Foo("foo!"); + } + = + @Produces + public Foo produce2(@New(Foo.class) Foo order) + { + return new Foo("foo!"); + } + = + public void dispose(@Disposes Foo foo) + { + disposedCorrectly =3D foo.getFoo().equals("decorated"); + } + = + /** + * @return the disposedCorrectly + */ + public static boolean isDisposedCorrectly() + { + return disposedCorrectly; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/openon/CustomProducerImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/openon/Foo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/o= penon/Foo.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/o= penon/Foo.java 2010-05-24 14:05:12 UTC (rev 22282) @@ -0,0 +1,25 @@ +package org.jboss.jsr299.tck.tests.jbt.openon; + +/** + * @author pmuir + * + */ +public class Foo +{ + = + private String foo; + = + public Foo(String foo) + { + this.foo =3D foo; + } + = + /** + * @return the foo + */ + public String getFoo() + { + return foo; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/openon/Foo.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/openon/Producer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/o= penon/Producer.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/o= penon/Producer.java 2010-05-24 14:05:12 UTC (rev 22282) @@ -0,0 +1,15 @@ +package org.jboss.jsr299.tck.tests.jbt.openon; + + +/** + * @author pmuir + * + */ +public interface Producer +{ + = + public Foo produce(); + = + public void dispose(Foo foo); + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/openon/Producer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/openon/ProducerDecorator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/o= penon/ProducerDecorator.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/o= penon/ProducerDecorator.java 2010-05-24 14:05:12 UTC (rev 22282) @@ -0,0 +1,38 @@ +package org.jboss.jsr299.tck.tests.jbt.openon; + +import javax.decorator.Decorator; +import javax.decorator.Delegate; +import javax.inject.Inject; + + +/** + * @author pmuir + * + */ +(a)Decorator +public class ProducerDecorator implements Producer +{ + = + @Inject @Delegate + private Producer producer; + = + public Foo produce() + { + return new Foo(producer.produce().getFoo() + "!!"); + } + = + /** + * @param message the message to set + */ + public static void reset() + { + = + } + = + public void dispose(Foo foo) + { + producer.dispose(new Foo("decorated")); + } + + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/openon/ProducerDecorator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/openon/ProducerImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/o= penon/ProducerImpl.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/o= penon/ProducerImpl.java 2010-05-24 14:05:12 UTC (rev 22282) @@ -0,0 +1,43 @@ +package org.jboss.jsr299.tck.tests.jbt.openon; + +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; + + +/** + * @author pmuir + * + */ +public class ProducerImpl implements Producer +{ + = + private static boolean disposedCorrectly =3D false; + = + /** + * @param log the log to set + */ + public static void reset() + { + disposedCorrectly =3D false; + } + = + @Produces + public Foo produce() + { + return new Foo("foo!"); + } + = + public void dispose(@Disposes Foo foo) + { + disposedCorrectly =3D foo.getFoo().equals("decorated"); + } + = + /** + * @return the disposedCorrectly + */ + public static boolean isDisposedCorrectly() + { + return disposedCorrectly; + } + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/openon/ProducerImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/HyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/HyperlinkDetectorTest.java 2010-05-24 13:46:57 UTC (rev 22= 281) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/HyperlinkDetectorTest.java 2010-05-24 14:05:12 UTC (rev 22= 282) @@ -38,7 +38,8 @@ .getActiveWorkbenchWindow().getActivePage(); return IDE.openEditor(page, input, true); } catch (PartInitException pie) { - = + pie.printStackTrace(); + fail(pie.getMessage()); } } return null; @@ -67,7 +68,10 @@ IRegion region =3D null; try { region =3D JavaWordFinder.findWord(document, offset); - } catch (Exception x) {} + } catch (Exception x) { + x.printStackTrace(); + fail(x.getMessage()); + } = return region; } Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-24 13:46:5= 7 UTC (rev 22281) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-24 14:05:1= 2 UTC (rev 22282) @@ -3,35 +3,22 @@ import java.util.ArrayList; = import junit.framework.Test; -import junit.framework.TestCase; import junit.framework.TestSuite; = import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; -import org.eclipse.jdt.internal.ui.text.JavaWordFinder; import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; import org.eclipse.jface.text.hyperlink.IHyperlink; import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.ide.IDE; import org.eclipse.ui.part.FileEditorInput; import org.eclipse.ui.texteditor.DocumentProviderRegistry; import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; -import org.eclipse.wst.sse.core.StructuredModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IModelManager; -import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.jboss.tools.cdi.core.test.tck.TCKTest; import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetect= or; -import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; -import org.jboss.tools.common.text.ext.util.AxisUtil; = public class InjectedPointHyperlinkDetectorTest extends HyperlinkDetectorT= est { private static final String PROJECT_NAME =3D "/tests/lookup/injectionpoin= t"; @@ -56,25 +43,21 @@ FileEditorInput editorInput =3D new FileEditorInput(javaFile); = IDocumentProvider documentProvider =3D null; - Throwable exception =3D null; try { documentProvider =3D DocumentProviderRegistry.getDefault().getDocumentP= rovider(editorInput); } catch (Exception x) { - exception =3D x; x.printStackTrace(); + fail("An exception caught: " + x.getMessage()); } - assertNull("An exception caught: " + (exception !=3D null? exception.get= Message() : ""), exception); = assertNotNull("The document provider for the file \"" + FILE_NAME + "\" = is not loaded", documentProvider); = try { documentProvider.connect(editorInput); } catch (Exception x) { - exception =3D x; x.printStackTrace(); - assertTrue("The document provider is not able to be initialized with th= e editor input", false); + fail("The document provider is not able to be initialized with the edit= or input\nAn exception caught: "+x.getMessage()); } - assertNull("An exception caught: " + (exception !=3D null? exception.get= Message() : ""), exception); = IDocument document =3D documentProvider.getDocument(editorInput); = Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java 20= 10-05-24 13:46:57 UTC (rev 22281) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java 20= 10-05-24 14:05:12 UTC (rev 22282) @@ -21,8 +21,8 @@ import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetect= or; = public class InjectedPointInProducerMethodHyperlinkDetectorTest extends Hy= perlinkDetectorTest{ - private static final String PROJECT_NAME =3D "/tests/decorators/invocatio= n/producer/method"; - private static final String FILE_NAME =3D "JavaSource/org/jboss/jsr299/tc= k/tests/decorators/invocation/producer/method/CustomProducerImpl.java"; + private static final String PROJECT_NAME =3D "/tests/jbt/openon"; + private static final String FILE_NAME =3D "JavaSource/org/jboss/jsr299/tc= k/tests/jbt/openon/CustomProducerImpl.java"; = public static Test suite() { return new TestSuite(InjectedPointInProducerMethodHyperlinkDetectorTest.= class); @@ -43,25 +43,21 @@ FileEditorInput editorInput =3D new FileEditorInput(javaFile); = IDocumentProvider documentProvider =3D null; - Throwable exception =3D null; try { documentProvider =3D DocumentProviderRegistry.getDefault().getDocumentP= rovider(editorInput); } catch (Exception x) { - exception =3D x; x.printStackTrace(); + fail("An exception caught: " + x.getMessage()); } - assertNull("An exception caught: " + (exception !=3D null? exception.get= Message() : ""), exception); = assertNotNull("The document provider for the file \"" + FILE_NAME + "\" = is not loaded", documentProvider); = try { documentProvider.connect(editorInput); } catch (Exception x) { - exception =3D x; x.printStackTrace(); - assertTrue("The document provider is not able to be initialized with th= e editor input", false); + fail("The document provider is not able to be initialized with the edit= or input\nAn exception caught: "+x.getMessage()); } - assertNull("An exception caught: " + (exception !=3D null? exception.get= Message() : ""), exception); = IDocument document =3D documentProvider.getDocument(editorInput); = @@ -70,9 +66,9 @@ InjectedPointHyperlinkDetector elPartitioner =3D new InjectedPointHyperl= inkDetector(); = ArrayList regionList =3D new ArrayList(); - regionList.add(new Region(1374, 5)); // order - regionList.add(new Region(1462, 3)); = - regionList.add(new Region(1498, 3)); = + regionList.add(new Region(571, 5)); // order + regionList.add(new Region(659, 3)); = + regionList.add(new Region(695, 3)); = = IEditorPart part =3D openFileInEditor(javaFile); ISourceViewer viewer =3D null; Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java 2010-05-24 13:4= 6:57 UTC (rev 22281) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java 2010-05-24 14:0= 5:12 UTC (rev 22282) @@ -43,25 +43,21 @@ FileEditorInput editorInput =3D new FileEditorInput(javaFile); = IDocumentProvider documentProvider =3D null; - Throwable exception =3D null; try { documentProvider =3D DocumentProviderRegistry.getDefault().getDocumentP= rovider(editorInput); } catch (Exception x) { - exception =3D x; x.printStackTrace(); + fail("An exception caught: " + x.getMessage()); } - assertNull("An exception caught: " + (exception !=3D null? exception.get= Message() : ""), exception); = assertNotNull("The document provider for the file \"" + FILE_NAME + "\" = is not loaded", documentProvider); = try { documentProvider.connect(editorInput); } catch (Exception x) { - exception =3D x; x.printStackTrace(); - assertTrue("The document provider is not able to be initialized with th= e editor input", false); + fail("The document provider is not able to be initialized with the edit= or input\nAn exception caught: "+x.getMessage()); } - assertNull("An exception caught: " + (exception !=3D null? exception.get= Message() : ""), exception); = IDocument document =3D documentProvider.getDocument(editorInput); = --===============5003432135656114439==-- From jbosstools-commits at lists.jboss.org Mon May 24 10:08:59 2010 Content-Type: multipart/mixed; boundary="===============7484005804254734728==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22283 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory. Date: Mon, 24 May 2010 10:08:59 -0400 Message-ID: <201005241408.o4OE8xQS013272@svn01.web.mwc.hst.phx2.redhat.com> --===============7484005804254734728== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-24 10:08:59 -0400 (Mon, 24 May 2010) New Revision: 22283 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/BeanMember.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/MethodDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/ParametedTypeFactory.java Log: https://jira.jboss.org/browse/JBIDE-6263 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/BeanMember.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanMember.java 2010-05-24 14:05:12 UTC (rev 22282) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanMember.java 2010-05-24 14:08:59 UTC (rev 22283) @@ -41,7 +41,7 @@ String returnType =3D member instanceof IField ? ((IField)member).getTy= peSignature() : member instanceof IMethod ? ((IMethod)member).getReturnType() : nul= l; if(returnType !=3D null) { - ParametedType p =3D getCDIProject().getNature().getTypeFactory().getPa= rametedType(member.getDeclaringType(), returnType); + ParametedType p =3D getCDIProject().getNature().getTypeFactory().getPa= rametedType(member, returnType); if(p !=3D null) { = int offset =3D -1; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/MethodDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-24 14:05:12 UTC (re= v 22282) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-24 14:08:59 UTC (re= v 22283) @@ -89,7 +89,7 @@ = ParameterDefinition pd =3D new ParameterDefinition(); = - ParametedType type =3D context.getProject().getTypeFactory().getParamet= edType(contextType, ps[i]); + ParametedType type =3D context.getProject().getTypeFactory().getParamet= edType(method, ps[i]); = pd.methodDefinition =3D this; pd.name =3D parameterNames[i]; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/ParametedTypeFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/ParametedTypeFactory.java 2010-05-24 14:05:12 UTC= (rev 22282) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/ParametedTypeFactory.java 2010-05-24 14:08:59 UTC= (rev 22283) @@ -6,8 +6,11 @@ import java.util.StringTokenizer; = import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IMember; +import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.ISourceRange; import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.ITypeParameter; import org.eclipse.jdt.core.JavaModelException; import org.jboss.tools.cdi.internal.core.impl.ParametedType; import org.jboss.tools.cdi.internal.core.impl.TypeDeclaration; @@ -46,10 +49,12 @@ return parametedType; } = - public ParametedType getParametedType(IType context, String typeSignature= ) throws JavaModelException { + public ParametedType getParametedType(IMember context, String typeSignatu= re) throws JavaModelException { if(typeSignature =3D=3D null) return null; + = + IType contextType =3D context instanceof IType ? (IType)context : contex= t.getDeclaringType(); = - String key =3D context =3D=3D null || context.isBinary() || "QObject;".e= quals(typeSignature) ? typeSignature : context.getFullyQualifiedName() + "+= " + typeSignature; + String key =3D context =3D=3D null || context.isBinary() || "QObject;".e= quals(typeSignature) ? typeSignature : contextType.getFullyQualifiedName() = + "+" + typeSignature; if(cache.containsKey(key)) return cache.get(key); ParametedType result =3D new ParametedType(); result.setFactory(this); @@ -64,7 +69,7 @@ = int startToken =3D typeSignature.indexOf('<'); if(startToken < 0) { - String resovedTypeName =3D EclipseJavaUtil.resolveTypeAsString(context,= typeSignature); + String resovedTypeName =3D EclipseJavaUtil.resolveTypeAsString(contextT= ype, typeSignature); if(resovedTypeName =3D=3D null) return null; if(!context.isBinary()) { result.setSignature(result.getArrayPrefix() + "Q" + resovedTypeName + = ";"); @@ -75,13 +80,25 @@ cache.put(key, result); return result; } - String[] ps =3D context.getTypeParameterSignatures(); + if(context instanceof IMethod) { + String[] ps =3D ((IMethod)context).getTypeParameterSignatures(); + for (int i =3D 0; i < ps.length; i++) { + String t =3D ps[i]; + if(t.endsWith(":")) t =3D t.substring(0, t.length() - 1); + t =3D "Q" + t + ";"; + if(t.equals(result.getSignature())) { + cache.put(key, result); + return result; + } + } + } + String[] ps =3D contextType.getTypeParameterSignatures(); for (int i =3D 0; i < ps.length; i++) { String t =3D ps[i]; if(t.endsWith(":")) t =3D t.substring(0, t.length() - 1); t =3D "Q" + t + ";"; if(t.equals(result.getSignature())) { - cache. put(key, result); + cache.put(key, result); return result; } } @@ -90,7 +107,7 @@ if(endToken < startToken) return null; String typeName =3D typeSignature.substring(0, startToken) + typeSignat= ure.substring(endToken + 1); String params =3D typeSignature.substring(startToken + 1, endToken); - String resovedTypeName =3D EclipseJavaUtil.resolveTypeAsString(context,= typeName); + String resovedTypeName =3D EclipseJavaUtil.resolveTypeAsString(contextT= ype, typeName); if(resovedTypeName =3D=3D null) return null; IType type =3D EclipseJavaUtil.findType(context.getJavaProject(), resov= edTypeName); if(type !=3D null) { --===============7484005804254734728==-- From jbosstools-commits at lists.jboss.org Mon May 24 10:18:09 2010 Content-Type: multipart/mixed; boundary="===============7229784354888250108==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22284 - trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test. Date: Mon, 24 May 2010 10:18:09 -0400 Message-ID: <201005241418.o4OEI9NO014425@svn01.web.mwc.hst.phx2.redhat.com> --===============7229784354888250108== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-24 10:18:08 -0400 (Mon, 24 May 2010) New Revision: 22284 Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/HyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/InjectedPointHyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java Log: https://jira.jboss.org/browse/JBIDE-6311 Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/HyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/HyperlinkDetectorTest.java 2010-05-24 14:08:59 UTC (rev 22= 283) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/HyperlinkDetectorTest.java 2010-05-24 14:18:08 UTC (rev 22= 284) @@ -17,12 +17,13 @@ import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IModelManager; import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; +import org.jboss.tools.cdi.core.test.tck.TCKTest; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.AxisUtil; = import junit.framework.TestCase; = -public class HyperlinkDetectorTest extends TestCase { +public class HyperlinkDetectorTest extends TCKTest { protected boolean findOffsetInRegions(int offset, ArrayList regio= nList){ for(Region region : regionList){ if(offset >=3D region.getOffset() && offset <=3D region.getOffset()+reg= ion.getLength()) Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-24 14:08:5= 9 UTC (rev 22283) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-24 14:18:0= 8 UTC (rev 22284) @@ -6,7 +6,6 @@ import junit.framework.TestSuite; = import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.Region; @@ -21,22 +20,15 @@ import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetect= or; = public class InjectedPointHyperlinkDetectorTest extends HyperlinkDetectorT= est { - private static final String PROJECT_NAME =3D "/tests/lookup/injectionpoin= t"; private static final String FILE_NAME =3D "JavaSource/org/jboss/jsr299/tc= k/tests/lookup/injectionpoint/LoggerConsumer.java"; = public static Test suite() { return new TestSuite(InjectedPointHyperlinkDetectorTest.class); } = - public void testInjectedPointHyperlinkDetector() throws Exception { - IProject project =3D TCKTest.importPreparedProject(PROJECT_NAME); - doTest(project); - TCKTest.cleanProject(PROJECT_NAME); - } + public void testInjectedPointHyperlinkDetector() throws Exception { + IFile javaFile =3D tckProject.getFile(FILE_NAME); = - private void doTest(IProject project) throws Exception { - IFile javaFile =3D project.getFile(FILE_NAME); - TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile !=3D null)); TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile.exists())); = Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java 20= 10-05-24 14:08:59 UTC (rev 22283) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java 20= 10-05-24 14:18:08 UTC (rev 22284) @@ -6,7 +6,6 @@ import junit.framework.TestSuite; = import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.Region; @@ -21,22 +20,15 @@ import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetect= or; = public class InjectedPointInProducerMethodHyperlinkDetectorTest extends Hy= perlinkDetectorTest{ - private static final String PROJECT_NAME =3D "/tests/jbt/openon"; private static final String FILE_NAME =3D "JavaSource/org/jboss/jsr299/tc= k/tests/jbt/openon/CustomProducerImpl.java"; = public static Test suite() { return new TestSuite(InjectedPointInProducerMethodHyperlinkDetectorTest.= class); } = - public void testProducerDisposerHyperlinkDetector() throws Exception { - IProject project =3D TCKTest.importPreparedProject(PROJECT_NAME); - doTest(project); - TCKTest.cleanProject(PROJECT_NAME); - } + public void testProducerDisposerHyperlinkDetector() throws Exception { + IFile javaFile =3D tckProject.getFile(FILE_NAME); = - private void doTest(IProject project) throws Exception { - IFile javaFile =3D project.getFile(FILE_NAME); - TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile !=3D null)); TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile.exists())); = Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java 2010-05-24 14:0= 8:59 UTC (rev 22283) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java 2010-05-24 14:1= 8:08 UTC (rev 22284) @@ -21,22 +21,15 @@ import org.jboss.tools.cdi.text.ext.hyperlink.ProducerDisposerHyperlinkDet= ector; = public class ProducerDisposerHyperlinkDetectorTest extends HyperlinkDetect= orTest{ - private static final String PROJECT_NAME =3D "/tests/decorators/invocatio= n/producer/method"; private static final String FILE_NAME =3D "JavaSource/org/jboss/jsr299/tc= k/tests/decorators/invocation/producer/method/ProducerImpl.java"; = public static Test suite() { return new TestSuite(ProducerDisposerHyperlinkDetectorTest.class); } = - public void testProducerDisposerHyperlinkDetector() throws Exception { - IProject project =3D TCKTest.importPreparedProject(PROJECT_NAME); - doTest(project); - TCKTest.cleanProject(PROJECT_NAME); - } + public void testProducerDisposerHyperlinkDetector() throws Exception { + IFile javaFile =3D tckProject.getFile(FILE_NAME); = - private void doTest(IProject project) throws Exception { - IFile javaFile =3D project.getFile(FILE_NAME); - TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile !=3D null)); TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile.exists())); = --===============7229784354888250108==-- From jbosstools-commits at lists.jboss.org Mon May 24 10:46:13 2010 Content-Type: multipart/mixed; boundary="===============9056002384185110557==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22285 - trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/wizard. Date: Mon, 24 May 2010 10:46:12 -0400 Message-ID: <201005241446.o4OEkC4q017770@svn01.web.mwc.hst.phx2.redhat.com> --===============9056002384185110557== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vpakan(a)redhat.com Date: 2010-05-24 10:46:12 -0400 (Mon, 24 May 2010) New Revision: 22285 Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/= ui/bot/test/wizard/NewXHTMLPageWizardTest.java trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/= ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java Log: Reflect changes in UI for JBT 3.1. version Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/too= ls/vpe/ui/bot/test/wizard/NewXHTMLPageWizardTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/wizard/NewXHTMLPageWizardTest.java 2010-05-24 14:18:08 UTC (re= v 22284) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/wizard/NewXHTMLPageWizardTest.java 2010-05-24 14:46:12 UTC (re= v 22285) @@ -39,14 +39,11 @@ this.bot.menu("File").menu("New").menu("Other...").click(); //$NON-NLS= -1$//$NON-NLS-2$//$NON-NLS-3$ this.bot.shell("New").activate(); //$NON-NLS-1$ SWTBotTree importTree =3D this.bot.tree(); - importTree.expandNode("JBoss Tools Web").select("XHTML Page"); //$NON-N= LS-1$//$NON-NLS-2$ + importTree.expandNode("JBoss Tools Web").select("XHTML File"); //$NON-N= LS-1$//$NON-NLS-2$ this.bot.button(WidgetVariables.NEXT_BUTTON).click(); - this.bot.shell("New XHTML Page"); //$NON-NLS-1$ -// this.bot.textWithMessage("File name:").setText("test.xhtml"); //$NON-N= LS-1$ - this.bot.textWithLabel("File name:").setText("test"); //$NON-NLS-1$ //$N= ON-NLS-2$ + this.bot.shell("New File XHTML"); //$NON-NLS-1$ + this.bot.textWithLabel("Name*").setText("test"); //$NON-NLS-1$ //$NON-NL= S-2$ this.bot.button(WidgetVariables.NEXT_BUTTON).click(); - this.bot.checkBox("Use XHTML Template").click(); //$NON-NLS-1$ - this.bot.button(WidgetVariables.NEXT_BUTTON).click(); this.bot.button(WidgetVariables.FINISH_BUTTON).click(); assertEquals("Active Editor Title should be" ,"test.xhtml", this.bot.act= iveEditor().getTitle()); //$NON-NLS-1$ //$NON-NLS-2$ } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/too= ls/vpe/ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-05-2= 4 14:18:08 UTC (rev 22284) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe= /ui/bot/test/wizard/VPESourceCodeTemplatesPreferencePageTest.java 2010-05-2= 4 14:46:12 UTC (rev 22285) @@ -32,10 +32,10 @@ .expandNode("JBoss Tools") //$NON-NLS-1$ .expandNode("Web") //$NON-NLS-1$ .expandNode("Editors") //$NON-NLS-1$ - .expandNode("Visual Page Editor") //$NON-NLS-1$ - .select("Templates").click(); //$NON-NLS-1$ + .expandNode("Visual Page Editor").select(); //$NON-NLS-1$ + bot.tabItem("Templates").activate(); //$NON-NLS-1$ try{ - this.bot.button("New...").click(); //$NON-NLS-1$ + this.bot.button("Add").click(); //$NON-NLS-1$ this.bot.button("Cancel").click(); //$NON-NLS-1$ } catch(WidgetNotFoundException ex){ fail("Preference Page has not been created"+ex);//$NON-NLS-1$ --===============9056002384185110557==-- From jbosstools-commits at lists.jboss.org Mon May 24 11:03:52 2010 Content-Type: multipart/mixed; boundary="===============4390742654178206444==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22286 - trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test. Date: Mon, 24 May 2010 11:03:52 -0400 Message-ID: <201005241503.o4OF3qHm025981@svn01.web.mwc.hst.phx2.redhat.com> --===============4390742654178206444== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-24 11:03:51 -0400 (Mon, 24 May 2010) New Revision: 22286 Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/CDITextExtTestSuite.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/CdiTextExtAllTests.java Log: https://jira.jboss.org/browse/JBIDE-6311 Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tool= s/cdi/text/ext/test/CDITextExtTestSuite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/CDITextExtTestSuite.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/CDITextExtTestSuite.java 2010-05-24 15:03:51 UTC (rev 2228= 6) @@ -0,0 +1,26 @@ +/*************************************************************************= ****** + * 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.cdi.text.ext.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + + +public class CDITextExtTestSuite extends TestSuite { + + public static Test suite() { + TestSuite suite =3D new TestSuite("CDI Text Ext Tests"); + suite.addTest(InjectedPointHyperlinkDetectorTest.suite()); + suite.addTest(ProducerDisposerHyperlinkDetectorTest.suite()); + suite.addTest(InjectedPointInProducerMethodHyperlinkDetectorTest.suite()= ); + return suite; + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/= org/jboss/tools/cdi/text/ext/test/CDITextExtTestSuite.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/CdiTextExtAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/CdiTextExtAllTests.java 2010-05-24 14:46:12 UTC (rev 22285) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/CdiTextExtAllTests.java 2010-05-24 15:03:51 UTC (rev 22286) @@ -1,15 +1,15 @@ package org.jboss.tools.cdi.text.ext.test; = = +import org.jboss.tools.cdi.core.test.CDICoreTestSetup; + import junit.framework.Test; import junit.framework.TestSuite; = public class CdiTextExtAllTests { public static Test suite() { TestSuite suite =3D new TestSuite(CdiTextExtAllTests.class.getName()); - suite.addTest(InjectedPointHyperlinkDetectorTest.suite()); - suite.addTest(ProducerDisposerHyperlinkDetectorTest.suite()); - suite.addTest(InjectedPointInProducerMethodHyperlinkDetectorTest.suite()= ); + suite.addTest(new CDICoreTestSetup(CDITextExtTestSuite.suite())); return suite; } } --===============4390742654178206444==-- From jbosstools-commits at lists.jboss.org Mon May 24 11:23:02 2010 Content-Type: multipart/mixed; boundary="===============4659122549698637267==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22287 - trunk/jsf/docs/userguide/en-US/images/visual_page. Date: Mon, 24 May 2010 11:23:01 -0400 Message-ID: <201005241523.o4OFN1Gj028527@svn01.web.mwc.hst.phx2.redhat.com> --===============4659122549698637267== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-24 11:23:01 -0400 (Mon, 24 May 2010) New Revision: 22287 Added: trunk/jsf/docs/userguide/en-US/images/visual_page/export_template.png trunk/jsf/docs/userguide/en-US/images/visual_page/import_template.png Log: https://jira.jboss.org/browse/TOOLSDOC-8 - added new images for the "Export= /Import of the Templates for Unknown Tags" section. Added: trunk/jsf/docs/userguide/en-US/images/visual_page/export_template.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en-US/images/visual_page/expo= rt_template.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jsf/docs/userguide/en-US/images/visual_page/import_template.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jsf/docs/userguide/en-US/images/visual_page/impo= rt_template.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============4659122549698637267==-- From jbosstools-commits at lists.jboss.org Mon May 24 11:23:30 2010 Content-Type: multipart/mixed; boundary="===============1199447610237121954==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22288 - trunk/jsf/docs/userguide/en-US. Date: Mon, 24 May 2010 11:23:30 -0400 Message-ID: <201005241523.o4OFNUb5028539@svn01.web.mwc.hst.phx2.redhat.com> --===============1199447610237121954== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-24 11:23:30 -0400 (Mon, 24 May 2010) New Revision: 22288 Modified: trunk/jsf/docs/userguide/en-US/editors.xml Log: https://jira.jboss.org/browse/TOOLSDOC-8 - added the "Export/Import of the = Templates for Unknown Tags" section. Modified: trunk/jsf/docs/userguide/en-US/editors.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/docs/userguide/en-US/editors.xml 2010-05-24 15:23:01 UTC (rev= 22287) +++ trunk/jsf/docs/userguide/en-US/editors.xml 2010-05-24 15:23:30 UTC (rev= 22288) @@ -1503,7 +1503,7 @@
- Visual Templates + Visual Templates for Unknown Tags The VPE also makes it possible to create visual template= s for unknown tags. To call the Template dialog for a t= ag, right-click on it in Visual mode and select @@ -1578,6 +1578,50 @@ Here it's possible to add a new and edit or remove = any listed in the table template.
+ = +
+ Export/Import of the Templates for Unknown Tags + If you have a number of custom tags for which you have d= efined visual templates, you may need to share = + the templates definitions with other team members. In this cas= e you can use export/import functionality for unknown tag templates. + = + To export all visual templates you defined for unknown t= ags, navigate to + File > Export > Other > Unknown tags te= mplates. Here is what the wizard looks like. + = +
+ Export of Unknown Tags Templates + + + + + +
+ = + At this point click + Browse to set the path= where to save the external XML file with templates = + and then press + Finish + + to complete the export. + = + For import, use the similar steps. Follow to + File > Import > Other > Unknown tags te= mplates to open the import wizard. + Click + Browse to point to the= XML file which stores the custom tags templates and = + then hit + Finish to complete the= import. + + = +
+ Import of Custom Tags Templates + + + + + +
+
+ = + =
VPE Toolbar The Visual Page Editor toolbar includes the next buttons= : --===============1199447610237121954==-- From jbosstools-commits at lists.jboss.org Mon May 24 11:30:37 2010 Content-Type: multipart/mixed; boundary="===============6683085940940973730==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22289 - trunk/jsf/docs/userguide/en-US/images/visual_page. Date: Mon, 24 May 2010 11:30:37 -0400 Message-ID: <201005241530.o4OFUb6t029438@svn01.web.mwc.hst.phx2.redhat.com> --===============6683085940940973730== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-24 11:30:36 -0400 (Mon, 24 May 2010) New Revision: 22289 Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_9.png Log: https://jira.jboss.org/browse/TOOLSDOC-8 - updated the image as the one tab= title was changed. Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/visual_page_9.p= ng =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============6683085940940973730==-- From jbosstools-commits at lists.jboss.org Mon May 24 11:39:30 2010 Content-Type: multipart/mixed; boundary="===============7820177760577735847==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22290 - branches/3.2.helios/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test. Date: Mon, 24 May 2010 11:39:29 -0400 Message-ID: <201005241539.o4OFdTSk030029@svn01.web.mwc.hst.phx2.redhat.com> --===============7820177760577735847== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-24 11:39:29 -0400 (Mon, 24 May 2010) New Revision: 22290 Modified: branches/3.2.helios/as/tests/org.jboss.ide.eclipse.as.archives.integrati= on.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeployT= est.java Log: JBIDE-6218 - astools compilation error Modified: branches/3.2.helios/as/tests/org.jboss.ide.eclipse.as.archives.in= tegration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/Build= DeployTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/as/tests/org.jboss.ide.eclipse.as.archives.integrat= ion.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeploy= Test.java 2010-05-24 15:30:36 UTC (rev 22289) +++ branches/3.2.helios/as/tests/org.jboss.ide.eclipse.as.archives.integrat= ion.test/src/org/jboss/ide/eclipse/as/archives/integration/test/BuildDeploy= Test.java 2010-05-24 15:39:29 UTC (rev 22290) @@ -236,7 +236,7 @@ swc.setAttribute(DeployableServer.TEMP_DEPLOY_DIRECTORY, tempDeploy.toO= SString()); swc.setRuntime(runtime); swc.setAutoPublishTime(1); - swc.setAutoPublishSetting(Server.AUTO_PUBLISH_ENABLE); + swc.setAutoPublishSetting(Server.AUTO_PUBLISH_RESOURCE); } server =3D wc.save(true, new NullProgressMonitor()); = --===============7820177760577735847==-- From jbosstools-commits at lists.jboss.org Mon May 24 11:56:44 2010 Content-Type: multipart/mixed; boundary="===============0002075957752509211==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22291 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views. Date: Mon, 24 May 2010 11:56:44 -0400 Message-ID: <201005241556.o4OFuii8032589@svn01.web.mwc.hst.phx2.redhat.com> --===============0002075957752509211== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-24 11:56:44 -0400 (Mon, 24 May 2010) New Revision: 22291 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/J= AXRSWSTestView.java Log: JBIDE-6326 - fixing issue with menu Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/JAXRSWSTestView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-24 15:39:29 UTC (rev 22290) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-24 15:56:44 UTC (rev 22291) @@ -323,7 +323,8 @@ copyMenuAction.addSelectionListener(new SelectionListener(){ = public void widgetDefaultSelected(SelectionEvent arg0) { - resultsText.selectAll(); + if (resultsText.getSelectionCount() =3D=3D 0) + resultsText.selectAll(); resultsText.copy(); } = @@ -399,11 +400,12 @@ } = public void focusGained(FocusEvent arg0) { - if (resultsText.getText().trim().length() > 0){ - resultsTextMenu.setVisible(true); - } else { - resultsTextMenu.setVisible(false); - } + setMenusForCurrentState(); +// if (resultsText.getText().trim().length() > 0){ +// resultsTextMenu.setVisible(true); +// } else { +// resultsTextMenu.setVisible(false); +// } } }); = --===============0002075957752509211==-- From jbosstools-commits at lists.jboss.org Mon May 24 13:06:46 2010 Content-Type: multipart/mixed; boundary="===============8785122886012807402==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22292 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 5 other directories. Date: Mon, 24 May 2010 13:06:46 -0400 Message-ID: <201005241706.o4OH6khx020342@svn01.web.mwc.hst.phx2.redhat.com> --===============8785122886012807402== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-24 13:06:45 -0400 (Mon, 24 May 2010) New Revision: 22292 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDICoreBuilder.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= IClassBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/ClassBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/TypeDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDIValidationMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/event/= broken/observer/isInitializer/AustralianTerrier_Broken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= s: 1. Bean class has more than one constructor annotated @Inject; 2. Bean c= onstructor has a parameter annotated @Disposes; 3. Bean constructor has a p= arameter annotated @Observes; 4. Observer method is annotated @Inject; 5. M= ethod has more than one parameter annotated @Observes Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDICoreBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDICoreBuilder.java 2010-05-24 15:56:44 UTC (rev 22291) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDICoreBuilder.java 2010-05-24 17:06:45 UTC (rev 22292) @@ -324,8 +324,10 @@ if(srcs[i].isPrefixOf(path)) { if(f.getName().endsWith(".java")) { ICompilationUnit unit =3D EclipseUtil.getCompilationUnit(f); - IType[] ts =3D unit.getTypes(); - fileSet.add(f.getFullPath(), ts); + if(unit!=3Dnull) { + IType[] ts =3D unit.getTypes(); + fileSet.add(f.getFullPath(), ts); + } } return false; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/IClassBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IClassBean.java 2010-05-24 15:56:44 UTC (rev 22291) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IClassBean.java 2010-05-24 17:06:45 UTC (rev 22292) @@ -38,7 +38,7 @@ * = * @return a set of bean constructors of the bean. */ - Set getBeanConstructor(); + Set getBeanConstructors(); = /** * Obtains the interceptor bindings of the bean. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/ClassBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ClassBean.java 2010-05-24 15:56:44 UTC (rev 22291) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ClassBean.java 2010-05-24 17:06:45 UTC (rev 22292) @@ -15,7 +15,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -31,7 +30,6 @@ import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration; -import org.jboss.tools.cdi.core.IObserverMethod; import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IProducer; import org.jboss.tools.cdi.core.IQualifierDeclaration; @@ -42,7 +40,6 @@ import org.jboss.tools.cdi.core.ITypeDeclaration; import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition; -import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFact= ory; import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; import org.jboss.tools.common.model.project.ext.impl.ValueInfo; import org.jboss.tools.common.text.ITextSourceReference; @@ -102,13 +99,22 @@ return (TypeDefinition)definition; } = - public Set getBeanConstructor() { + public Set getBeanConstructors() { Set result =3D new HashSet(); + IBeanMethod defaultConstructor =3D null; for (BeanMethod m: methods) { if(m.getDefinition().isConstructor()) { - result.add(m); + if(m.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME)=3D=3Dnull= && m.getMethod().getNumberOfParameters()=3D=3D0) { + defaultConstructor =3D m; + } else { + result.add(m); + } } } + // If a bean class does not explicitly declare a constructor using @Inje= ct, the constructor that accepts no parameters is the bean constructor. + if(result.isEmpty() && defaultConstructor!=3Dnull) { + result.add(defaultConstructor); + } return result; } = @@ -180,7 +186,7 @@ public Set getObserverMethods() { Set result =3D new HashSet(); for (BeanMethod m: methods) { - if(m.isDisposer()) { + if(m.isObserver()) { result.add(m); } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/TypeDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/TypeDefinition.java 2010-05-24 15:56:44 UTC (rev = 22291) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/TypeDefinition.java 2010-05-24 17:06:45 UTC (rev = 22292) @@ -57,7 +57,7 @@ MethodDefinition m =3D new MethodDefinition(); m.setTypeDefinition(this); m.setMethod(ms[i], context); - if(m.isCDIAnnotated()) { + if(m.isCDIAnnotated() || (ms[i].isConstructor() && ms[i].getNumberOfPar= ameters()=3D=3D0)) { methods.add(m); } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-24 15:56:44 UTC (rev 222= 91) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-24 17:06:45 UTC (rev 222= 92) @@ -271,6 +271,7 @@ if (reporter.isCancelled() || file =3D=3D null || !file.isAccessible()) { return; } + displaySubtask(CDIValidationMessages.VALIDATING_RESOURCE, new String[] {= file.getProject().getName(), file.getName()}); Set beans =3D cdiProject.getBeans(file.getFullPath()); for (IBean bean : beans) { validateBean(bean); @@ -337,6 +338,7 @@ = private void validateClassBean(IClassBean bean) { validateDisposers(bean); + validateObserves(bean); if (!(bean instanceof ISessionBean)) { validateManagedBean(bean); } else { @@ -347,7 +349,7 @@ } = private void validateConstructors(IClassBean bean) { - Set constructors =3D bean.getBeanConstructor(); + Set constructors =3D bean.getBeanConstructors(); if(constructors.size()>1) { Set injects =3D new HashSet(); for (IBeanMethod constructor : constructors) { @@ -368,6 +370,52 @@ } } = + private void validateObserves(IClassBean bean) { + Set observes =3D bean.getObserverMethods(); + if (observes.isEmpty()) { + return; + } + for (IBeanMethod observer : observes) { + List params =3D observer.getParameters(); + Set declarations =3D new HashSet(); + for (IParameter param : params) { + ITextSourceReference declaration =3D param.getAnnotationPosition(CDICo= nstants.OBSERVERS_ANNOTATION_TYPE_NAME); + if (declaration !=3D null) { + declarations.add(declaration); + } + } + /* + * 10.4.2. Declaring an observer method + * - method has more than one parameter annotated @Observes + */ + if(declarations.size()>1) { + for (ITextSourceReference declaration : declarations) { + addError(CDIValidationMessages.MULTIPLE_OBSERVING_PARAMETERS, CDIPref= erences.MULTIPLE_OBSERVING_PARAMETERS, declaration, bean.getResource()); + } + } + /* + * 3.7.1. Declaring a bean constructor + * - bean constructor has a parameter annotated @Observes + * = + * 10.4.2. Declaring an observer method + * - observer method is annotated @Inject + */ + IAnnotationDeclaration injectDeclaration =3D observer.getAnnotation(CDI= Constants.INJECT_ANNOTATION_TYPE_NAME); + try { + if (injectDeclaration !=3D null) { + String pref =3D observer.getMethod().isConstructor()?CDIPreferences.C= ONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED:CDIPreferences.OBSERVER_ANNOTATED_= INJECT; + String message =3D observer.getMethod().isConstructor()?CDIValidation= Messages.CONSTRUCTOR_PARAMETER_ANNOTATED_OBSERVES:CDIValidationMessages.OBS= ERVER_ANNOTATED_INJECT; + addError(message, pref, injectDeclaration, bean.getResource()); + for (ITextSourceReference declaration : declarations) { + addError(message, pref, declaration, bean.getResource()); + } + } + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + } + } + private void validateDisposers(IClassBean bean) { Set disposers =3D bean.getDisposers(); if (disposers.isEmpty()) { @@ -387,8 +435,7 @@ * disposer methods for a single producer method */ for (IBeanMethod disposerMethod : disposerMethods) { - Set disposerDeclarations =3D CDIUtil.getAnnota= tionPossitions(disposerMethod, - CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); + Set disposerDeclarations =3D CDIUtil.getAnnota= tionPossitions(disposerMethod, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); for (ITextSourceReference declaration : disposerDeclarations) { addError(CDIValidationMessages.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDI= Preferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, declaration, bean.getResource(= )); } @@ -436,8 +483,7 @@ } if (observesExists) { for (ITextSourceReference declaration : declarations) { - addError(CDIValidationMessages.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED= , CDIPreferences.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED, declaration, - bean.getResource()); + addError(CDIValidationMessages.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED= , CDIPreferences.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED, declaration, bean.= getResource()); } } = @@ -447,13 +493,22 @@ * = * 3.9.1. Declaring an initializer method - an initializer method * has a parameter annotated @Disposes + * = + * 3.7.1. Declaring a bean constructor + * - bean constructor has a parameter annotated @Disposes */ IAnnotationDeclaration injectDeclaration =3D disposer.getAnnotation(CDI= Constants.INJECT_ANNOTATION_TYPE_NAME); - if (injectDeclaration !=3D null) { - addError(CDIValidationMessages.DISPOSER_ANNOTATED_INJECT, CDIPreferenc= es.DISPOSER_ANNOTATED_INJECT, injectDeclaration, bean.getResource()); - for (ITextSourceReference declaration : disposerDeclarations) { - addError(CDIValidationMessages.DISPOSER_ANNOTATED_INJECT, CDIPreferen= ces.DISPOSER_ANNOTATED_INJECT, declaration, bean.getResource()); + try { + if (injectDeclaration !=3D null) { + String pref =3D disposer.getMethod().isConstructor()?CDIPreferences.C= ONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED:CDIPreferences.DISPOSER_ANNOTATED_= INJECT; + String message =3D disposer.getMethod().isConstructor()?CDIValidation= Messages.CONSTRUCTOR_PARAMETER_ANNOTATED_DISPOSES:CDIValidationMessages.DIS= POSER_ANNOTATED_INJECT; + addError(message, pref, injectDeclaration, bean.getResource()); + for (ITextSourceReference declaration : disposerDeclarations) { + addError(message, pref, declaration, bean.getResource()); + } } + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); } = /* @@ -983,14 +1038,12 @@ } } if (!hasDefaultConstructor) { - addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, C= DIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, - specializesDeclaration, bean.getResource()); + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, C= DIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, specializesDeclaration, be= an.getResource()); } } } else { // The specializing bean extends nothing - addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDI= Preferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, specializesDeclaration, - bean.getResource()); + addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDI= Preferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, specializesDeclaration, bean= .getResource()); } } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); @@ -1095,8 +1148,7 @@ } } if (!typeWasFound) { - addError(CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION, CD= IPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION, typedDeclaration, - bean.getResource()); + addError(CDIValidationMessages.ILLEGAL_TYPE_IN_TYPED_DECLARATION, CD= IPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION, typedDeclaration, bean.getR= esource()); } } } @@ -1135,8 +1187,7 @@ } if (declarationMap.size() > 1) { for (IStereotypeDeclaration stereotypeDeclaration : declarationMap.val= ues()) { - addError(CDIValidationMessages.MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT= _SCOPE, CDIPreferences.MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE, - stereotypeDeclaration, bean.getResource()); + addError(CDIValidationMessages.MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT= _SCOPE, CDIPreferences.MISSING_SCOPE_WHEN_THERE_IS_NO_DEFAULT_SCOPE, stereo= typeDeclaration, bean.getResource()); } } } @@ -1221,8 +1272,7 @@ Set scopeDeclarations =3D stereotype.getScopeDeclarat= ions(); if (scopeDeclarations.size() > 1) { for (IScopeDeclaration scope : scopeDeclarations) { - addError(CDIValidationMessages.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE= , CDIPreferences.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE, scope, - stereotype.getResource()); + addError(CDIValidationMessages.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE= , CDIPreferences.STEREOTYPE_DECLARES_MORE_THAN_ONE_SCOPE, scope, stereotype= .getResource()); } } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDIValidationMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-24 15:56:44 UTC (re= v 22291) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-24 17:06:45 UTC (re= v 22292) @@ -65,7 +65,8 @@ public static String MULTIPLE_DISPOSERS_FOR_PRODUCER; public static String ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN; public static String MULTIPLE_INJECTION_CONSTRUCTORS; - public static String CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED; + public static String CONSTRUCTOR_PARAMETER_ANNOTATED_OBSERVES; + public static String CONSTRUCTOR_PARAMETER_ANNOTATED_DISPOSES; public static String GENERIC_METHOD_ANNOTATED_INJECT; public static String MULTIPLE_OBSERVING_PARAMETERS; public static String ILLEGAL_OBSERVER_IN_SESSION_BEAN; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-24 15:56:44 UTC (rev 22291) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-24 17:06:45 UTC (rev 22292) @@ -44,7 +44,8 @@ MULTIPLE_DISPOSERS_FOR_PRODUCER=3DThere are multiple disposer methods for = a single producer method ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN=3DNon-static field of a session bea= n class is annotated @Produces MULTIPLE_INJECTION_CONSTRUCTORS=3DBean class has more than one constructor= annotated @Inject -CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED=3DBean constructor has a paramet= er annotated @Disposes, or @Observes +CONSTRUCTOR_PARAMETER_ANNOTATED_DISPOSES=3DBean constructor has a paramete= r annotated @Disposes +CONSTRUCTOR_PARAMETER_ANNOTATED_OBSERVES=3DBean constructor has a paramete= r annotated @Observes GENERIC_METHOD_ANNOTATED_INJECT=3DGeneric method of a bean is annotated @I= nject MULTIPLE_OBSERVING_PARAMETERS=3DMethod has more than one parameter annotat= ed @Observes ILLEGAL_OBSERVER_IN_SESSION_BEAN=3DNon-static method of a session bean cla= ss has a parameter annotated @Observes, and the method is not a business me= thod of the EJB Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-24 15:56:44 UTC (rev 22291) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-24 17:06:45 UTC (rev 22292) @@ -78,7 +78,7 @@ new String[][]{ {CDIPreferences.PRODUCER_ANNOTATED_INJECT, CDIPreferencesMessages.CDIVa= lidatorConfigurationBlock_pb_producerAnnotatedInject_label}, {CDIPreferences.PRODUCER_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferencesM= essages.CDIValidatorConfigurationBlock_pb_producerParameterIllegallyAnnotat= ed_label}, -// {CDIPreferences.OBSERVER_ANNOTATED_INJECT, CDIPreferencesMessages.CDI= ValidatorConfigurationBlock_pb_observerAnnotatedInject_label}, + {CDIPreferences.OBSERVER_ANNOTATED_INJECT, CDIPreferencesMessages.CDIVa= lidatorConfigurationBlock_pb_observerAnnotatedInject_label}, {CDIPreferences.OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferencesM= essages.CDIValidatorConfigurationBlock_pb_observerParameterIllegallyAnnotat= ed_label}, {CDIPreferences.ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN, CDIPreferences= Messages.CDIValidatorConfigurationBlock_pb_illegalProducerMethodInSessionBe= an_label}, {CDIPreferences.MULTIPLE_DISPOSING_PARAMETERS, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_multipleDisposingParameters_label}, @@ -87,10 +87,10 @@ {CDIPreferences.NO_PRODUCER_MATCHING_DISPOSER, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_noProducerMatchingDisposer_label}, {CDIPreferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_multipleDisposersForProducer_label}, {CDIPreferences.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN, CDIPreferencesM= essages.CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBean= _label}, -// {CDIPreferences.MULTIPLE_INJECTION_CONSTRUCTORS, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label}, -// {CDIPreferences.CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED, CDIPrefere= ncesMessages.CDIValidatorConfigurationBlock_pb_constructorParameterIllegall= yAnnotated_label}, + {CDIPreferences.MULTIPLE_INJECTION_CONSTRUCTORS, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label}, + {CDIPreferences.CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferenc= esMessages.CDIValidatorConfigurationBlock_pb_constructorParameterIllegallyA= nnotated_label}, // {CDIPreferences.GENERIC_METHOD_ANNOTATED_INJECT, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label}, -// {CDIPreferences.MULTIPLE_OBSERVING_PARAMETERS, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_multipleObservingParameters_label}, + {CDIPreferences.MULTIPLE_OBSERVING_PARAMETERS, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_multipleObservingParameters_label}, // {CDIPreferences.ILLEGAL_OBSERVER_IN_SESSION_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_illegalObserverInSessionBean_label}, // {CDIPreferences.ILLEGAL_CONDITIONAL_OBSERVER, CDIPreferencesMessages.= CDIValidatorConfigurationBlock_pb_illegalConditionalObserver_label}, }, Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests= /event/broken/observer/isInitializer/AustralianTerrier_Broken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/event= /broken/observer/isInitializer/AustralianTerrier_Broken.java 2010-05-24 15:= 56:44 UTC (rev 22291) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/event= /broken/observer/isInitializer/AustralianTerrier_Broken.java 2010-05-24 17:= 06:45 UTC (rev 22292) @@ -22,7 +22,8 @@ = class AustralianTerrier_Broken { - public @Inject void observesAfterBeanDiscovery(@Observes AfterBeanDisco= very discovery) + @Inject + public void observesAfterBeanDiscovery(@Observes AfterBeanDiscovery dis= covery) { } } Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-24 15:56:44 UTC (rev 22291) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-24 17:06:45 UTC (rev 22292) @@ -768,6 +768,28 @@ } = /** + * 3.7.1. Declaring a bean constructor + * - bean constructor has a parameter annotated @Disposes + * = + * @throws Exception + */ + public void testConstructorHasDisposesParameter() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/simple/definition/constructorHasDisposesParameter/Disposing= Constructor.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.CONSTRUCTOR_PARAMETER_ANNOTATE= D_DISPOSES, 24, 25); + } + + /** + * 3.7.1. Declaring a bean constructor + * - bean constructor has a parameter annotated @Observes + * = + * @throws Exception + */ + public void testConstructorHasObservesParameter() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /implementation/simple/definition/constructorHasObservesParameter/Observing= Constructor.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.CONSTRUCTOR_PARAMETER_ANNOTATE= D_OBSERVES, 25, 26); + } + + /** * 3.9.1. Declaring an initializer method * - an initializer method has a parameter annotated @Disposes * = @@ -792,6 +814,17 @@ = /** * 10.4.2. Declaring an observer method + * - method has more than one parameter annotated @Observes + * = + * @throws Exception + */ + public void testObserverMethodMustHaveOnlyOneEventParameter() throws Exce= ption { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /event/broken/observer/tooManyParameters/YorkshireTerrier_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.MULTIPLE_OBSERVING_PARAMETERS,= 24, 24); + } + + /** + * 10.4.2. Declaring an observer method * - an observer method is annotated @Produces * = * @throws Exception @@ -803,6 +836,17 @@ = /** * 10.4.2. Declaring an observer method + * - observer method is annotated @Inject + * = + * @throws Exception + */ + public void testObserverMethodAnnotatedInitializerFails() throws Exceptio= n { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /event/broken/observer/isInitializer/AustralianTerrier_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.OBSERVER_ANNOTATED_INJECT, 25,= 26); + } + + /** + * 10.4.2. Declaring an observer method * - a observer method is annotated @Disposes. * = * @throws Exception --===============8785122886012807402==-- From jbosstools-commits at lists.jboss.org Mon May 24 13:18:22 2010 Content-Type: multipart/mixed; boundary="===============0492705903184008165==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22293 - in trunk/cdi: plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 1 other directories. Date: Mon, 24 May 2010 13:18:22 -0400 Message-ID: <201005241718.o4OHIMC7021379@svn01.web.mwc.hst.phx2.redhat.com> --===============0492705903184008165== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-24 13:18:22 -0400 (Mon, 24 May 2010) New Revision: 22293 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : Non-static method of a session bean class has a parameter annotated @Obse= rves, and the method is not a business method of the EJB Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-24 17:06:45 UTC (rev 222= 92) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-24 17:18:22 UTC (rev 222= 93) @@ -413,6 +413,8 @@ } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); } + + validateSessionBeanMethod(bean, observer, declarations, CDIValidationMe= ssages.ILLEGAL_OBSERVER_IN_SESSION_BEAN, CDIPreferences.ILLEGAL_OBSERVER_IN= _SESSION_BEAN); } } = @@ -431,8 +433,8 @@ boundDisposers.addAll(disposerMethods); if (disposerMethods.size() > 1) { /* - * 3.3.7. Disposer method resolution - there are multiple - * disposer methods for a single producer method + * 3.3.7. Disposer method resolution + * - there are multiple disposer methods for a single producer method */ for (IBeanMethod disposerMethod : disposerMethods) { Set disposerDeclarations =3D CDIUtil.getAnnota= tionPossitions(disposerMethod, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); @@ -448,8 +450,8 @@ List params =3D disposer.getParameters(); = /* - * 3.3.6. Declaring a disposer method - method has more than one - * parameter annotated @Disposes + * 3.3.6. Declaring a disposer method + * - method has more than one parameter annotated @Disposes */ Set disposerDeclarations =3D new HashSet(); for (IParameter param : params) { @@ -465,11 +467,11 @@ } = /* - * 3.3.6. Declaring a disposer method - a disposer method has a - * parameter annotated @Observes. + * 3.3.6. Declaring a disposer method + * - a disposer method has a parameter annotated @Observes. * = - * 10.4.2. Declaring an observer method - a observer method has a - * parameter annotated @Disposes. + * 10.4.2. Declaring an observer method + * - a observer method has a parameter annotated @Disposes. */ Set declarations =3D new HashSet(); boolean observesExists =3D false; @@ -488,11 +490,11 @@ } = /* - * 3.3.6. Declaring a disposer method - a disposer method is - * annotated @Inject. + * 3.3.6. Declaring a disposer method + * - a disposer method is annotated @Inject. * = - * 3.9.1. Declaring an initializer method - an initializer method - * has a parameter annotated @Disposes + * 3.9.1. Declaring an initializer method + * - an initializer method has a parameter annotated @Disposes * = * 3.7.1. Declaring a bean constructor * - bean constructor has a parameter annotated @Disposes @@ -512,16 +514,15 @@ } = /* - * 3.3.6. Declaring a disposer method - a non-static method of a - * session bean class has a parameter annotated @Disposes, and the - * method is not a business method of the session bean + * 3.3.6. Declaring a disposer method + * - a non-static method of a session bean class has a parameter annot= ated @Disposes, and the method is not a business method of the session bean */ validateSessionBeanMethod(bean, disposer, disposerDeclarations, CDIVali= dationMessages.ILLEGAL_DISPOSER_IN_SESSION_BEAN, CDIPreferences.ILLEGAL_DISPOSER_IN_SESSION_BEAN); = /* - * 3.3.6. Declaring a disposer method - decorators may not declare - * disposer methods + * 3.3.6. Declaring a disposer method + * - decorators may not declare disposer methods */ if (bean instanceof IDecorator) { IDecorator decorator =3D (IDecorator) bean; @@ -534,8 +535,8 @@ } = /* - * 3.3.6. Declaring a disposer method - interceptors may not declare - * disposer methods + * 3.3.6. Declaring a disposer method + * - interceptors may not declare disposer methods */ if (bean instanceof IInterceptor) { IInterceptor interceptor =3D (IInterceptor) bean; @@ -549,9 +550,8 @@ } = /* - * 3.3.7. Disposer method resolution - there is no producer method - * declared by the (same) bean class that is assignable to the - * disposed parameter of a disposer method + * 3.3.7. Disposer method resolution + * - there is no producer method declared by the (same) bean class tha= t is assignable to the disposed parameter of a disposer method */ if (!boundDisposers.contains(disposer)) { for (ITextSourceReference declaration : disposerDeclarations) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-24 17:06:45 UTC (rev 22292) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-24 17:18:22 UTC (rev 22293) @@ -91,7 +91,7 @@ {CDIPreferences.CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferenc= esMessages.CDIValidatorConfigurationBlock_pb_constructorParameterIllegallyA= nnotated_label}, // {CDIPreferences.GENERIC_METHOD_ANNOTATED_INJECT, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label}, {CDIPreferences.MULTIPLE_OBSERVING_PARAMETERS, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_multipleObservingParameters_label}, -// {CDIPreferences.ILLEGAL_OBSERVER_IN_SESSION_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_illegalObserverInSessionBean_label}, + {CDIPreferences.ILLEGAL_OBSERVER_IN_SESSION_BEAN, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalObserverInSessionBean_label}, // {CDIPreferences.ILLEGAL_CONDITIONAL_OBSERVER, CDIPreferencesMessages.= CDIValidatorConfigurationBlock_pb_illegalConditionalObserver_label}, }, CDICorePlugin.PLUGIN_ID Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-24 17:06:45 UTC (rev 22292) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-24 17:18:22 UTC (rev 22293) @@ -856,6 +856,17 @@ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.OBSERVER_PARAMETER_ILLEGALLY_A= NNOTATED, 28, 28); } = + /** + * 10.4.2. Declaring an observer method + * - non-static method of a session bean class has a parameter annotated= @Observes, and the method is not a business method of the EJB + * = + * @throws Exception + */ + public void testObserverMethodOnEnterpriseBeanNotBusinessMethodOrStaticFa= ils() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /event/broken/observer/notBusinessMethod/TibetanTerrier_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.ILLEGAL_OBSERVER_IN_SESSION_BE= AN, 25); + } + public static int getMarkersNumber(IResource resource) { return AbstractResourceMarkerTest.getMarkersNumberByGroupName(resource, = null); } --===============0492705903184008165==-- From jbosstools-commits at lists.jboss.org Mon May 24 14:43:56 2010 Content-Type: multipart/mixed; boundary="===============1307235480329476626==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22294 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 2 other directories. Date: Mon, 24 May 2010 14:43:55 -0400 Message-ID: <201005241843.o4OIhtGt005320@svn01.web.mwc.hst.phx2.redhat.com> --===============1307235480329476626== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-24 14:43:55 -0400 (Mon, 24 May 2010) New Revision: 22294 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/InjectionPointTest.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/CDICoreTestSuite.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/TCKTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/browse/JBIDE-5808 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDIUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-24 17:18:22 UTC (rev 22293) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-24 18:43:55 UTC (rev 22294) @@ -443,6 +443,23 @@ return null; } = + /** + * Returns all the injection point parameters of the bean class. + * = + * @param bean + * @return + */ + public static Set getInjectionPointParameters(I= ClassBean bean) { + Set points =3D bean.getInjectionPoints(); + Set params =3D new HashSet(); + for (IInjectionPoint injection : points) { + if(injection instanceof IInjectionPointParameter) { + params.add((IInjectionPointParameter)injection); + } + } + return params; + } + private static IType getSuperClass(IType type) throws JavaModelException { String superclassName =3D type.getSuperclassName(); if(superclassName!=3Dnull) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-24 17:18:22 UTC (rev 222= 93) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-24 18:43:55 UTC (rev 222= 94) @@ -832,9 +832,8 @@ = private void validateInjectionPoint(IInjectionPoint injection) { /* - * 3.11. The qualifier @Named at injection points - injection point - * other than injected field declares a @Named annotation that does not - * specify the value member + * 3.11. The qualifier @Named at injection points + * - injection point other than injected field declares a @Named annota= tion that does not specify the value member */ if(injection instanceof IInjectionPointParameter) { IInjectionPointParameter pinjection =3D (IInjectionPointParameter)injec= tion; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-24 17:18:22 UTC (rev 22293) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-24 18:43:55 UTC (rev 22294) @@ -102,9 +102,6 @@ and qualifier @Default, and may not validly make use of the JTA UserTran= saction = according to the Java EE platform specification = - - - 3.7.1. Declaring a bean constructor - bean class has more than one constructor annotated @Inject - bean constructor has a parameter annotated @Disposes, or @Observes @@ -112,6 +109,9 @@ 3.8.1. Declaring an injected field - injected field is annotated @Produces = + + + 3.9.1. Declaring an initializer method - generic method of a bean is annotated @Inject (initializer method is a n= on-abstract, = non-static, non-generic method of a bean class) Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/CDICoreTestSuite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/CDICoreTestSuite.java 2010-05-24 17:18:22 UTC (rev 22293) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/CDICoreTestSuite.java 2010-05-24 18:43:55 UTC (rev 22294) @@ -18,6 +18,7 @@ import org.jboss.tools.cdi.core.test.tck.EnterpriseQualifierDefinitionTest; import org.jboss.tools.cdi.core.test.tck.EnterpriseScopeDefinitionTest; import org.jboss.tools.cdi.core.test.tck.EnterpriseStereotypeDefinitionTes= t; +import org.jboss.tools.cdi.core.test.tck.InjectionPointTest; import org.jboss.tools.cdi.core.test.tck.NameDefinitionTest; import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest; import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest; @@ -44,6 +45,7 @@ suite.addTestSuite(EnterpriseStereotypeDefinitionTest.class); suite.addTestSuite(StereotypeInheritenceTest.class); suite.addTestSuite(ProducerMethodDefinitionTest.class); + suite.addTestSuite(InjectionPointTest.class); suite.addTestSuite(ValidationTest.class); return suite; } Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cd= i/core/test/tck/InjectionPointTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/InjectionPointTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/InjectionPointTest.java 2010-05-24 18:43:55 UTC (rev 22294) @@ -0,0 +1,43 @@ +/*************************************************************************= ****** = + * 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.cdi.core.test.tck; + +import java.util.Set; + +import org.jboss.tools.cdi.core.CDIUtil; +import org.jboss.tools.cdi.core.IClassBean; +import org.jboss.tools.cdi.core.IInjectionPointParameter; + +/** + * @author Alexey Kazakov + */ +public class InjectionPointTest extends TCKTest { + + /** + * Section 3.7.1 - Declaring a bean constructor + * - All parameters of a bean constructor are injection points. + */ + public void testQualifierTypeAnnotatedConstructor() { + IClassBean bean =3D getClassBean("JavaSource/org/jboss/jsr299/tck/tests/= implementation/simple/lifecycle/Duck.java"); + Set points =3D CDIUtil.getInjectionPointParame= ters(bean); + assertEquals("There should be two injection point parameters in the bean= .", 2, points.size()); + } + + /** + * Section 3.9.1 - Declaring an initializer method + * - All initializer method parameters are injection points. + */ + public void testBindingTypeOnInitializerParameter() { + IClassBean bean =3D getClassBean("JavaSource/org/jboss/jsr299/tck/tests/= implementation/enterprise/lifecycle/Mainz.java"); + Set points =3D CDIUtil.getInjectionPointParame= ters(bean); + assertEquals("There should be two injection point parameters in the bean= .", 1, points.size()); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/= jboss/tools/cdi/core/test/tck/InjectionPointTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/TCKTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/TCKTest.java 2010-05-24 17:18:22 UTC (rev 22293) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/TCKTest.java 2010-05-24 18:43:55 UTC (rev 22294) @@ -2,6 +2,7 @@ = import java.io.File; import java.io.FileFilter; +import java.util.HashSet; import java.util.Set; = import junit.framework.TestCase; @@ -22,6 +23,9 @@ import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.core.IClassBean; +import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.core.IInjectionPointParameter; import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.core.IQualifierDeclaration; @@ -115,6 +119,18 @@ return beans; } = + protected IClassBean getClassBean(String path) { + IFile file =3D tckProject.getFile(path); + Set beans =3D cdiProject.getBeans(file.getFullPath()); + for (IBean bean : beans) { + if(bean instanceof IClassBean) { + return (IClassBean)bean; + } + } + fail("Can't find a class bean in " + path); + return null; + } + protected IQualifierDeclaration getQualifierDeclarationFromBeanClass(Stri= ng beanClassFilePath, String annotationTypeName) throws JavaModelException { IFile file =3D tckProject.getFile(beanClassFilePath); Set beans =3D cdiProject.getBeans(file.getFullPath()); Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-24 17:18:22 UTC (rev 22293) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-24 18:43:55 UTC (rev 22294) @@ -691,6 +691,9 @@ * 3.4.2. Declaring a producer field * - producer field is annotated @Inject * = + * 3.8.1. Declaring an injected field + * - injected field is annotated @Produces + * = * @throws Exception */ public void testProducerAnnotatedInject() throws Exception { --===============1307235480329476626==-- From jbosstools-commits at lists.jboss.org Mon May 24 15:24:15 2010 Content-Type: multipart/mixed; boundary="===============6525055254828414822==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22295 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory. Date: Mon, 24 May 2010 15:24:15 -0400 Message-ID: <201005241924.o4OJOF5v016020@svn01.web.mwc.hst.phx2.redhat.com> --===============6525055254828414822== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-24 15:24:14 -0400 (Mon, 24 May 2010) New Revision: 22295 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= IParameter.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/InjectionPointMethod.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/Parameter.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/ProducerMethod.java Log: https://jira.jboss.org/browse/JBIDE-5808 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/IParameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IParameter.java 2010-05-24 18:43:55 UTC (rev 22294) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IParameter.java 2010-05-24 19:24:14 UTC (rev 22295) @@ -52,5 +52,12 @@ * @return the element annotation of the given annotation type, or a null * value */ - public ITextSourceReference getAnnotationPosition(String annotationTypeNa= me); + ITextSourceReference getAnnotationPosition(String annotationTypeName); + + /** + * Returns the bean method which has this parameter. + * = + * @return the bean method which has this parameter + */ + IBeanMethod getBeanMethod(); } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/InjectionPointMethod.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/InjectionPointMethod.java 2010-05-24 18:43:55 UTC (rev 22294) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/InjectionPointMethod.java 2010-05-24 19:24:14 UTC (rev 22295) @@ -29,4 +29,8 @@ return getDelegateAnnotation() !=3D null; } = -} + @Override + protected Parameter newParameter() { + return new InjectionPointParameter(); + } +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/Parameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/Parameter.java 2010-05-24 18:43:55 UTC (rev 22294) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/Parameter.java 2010-05-24 19:24:14 UTC (rev 22295) @@ -5,6 +5,7 @@ = import org.eclipse.jdt.core.IMember; import org.jboss.tools.cdi.core.IAnnotationDeclaration; +import org.jboss.tools.cdi.core.IBeanMethod; import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IParameter; @@ -93,4 +94,11 @@ return null; } = -} + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.IParameter#getBeanMethod() + */ + public IBeanMethod getBeanMethod() { + return beanMethod; + } +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/ProducerMethod.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ProducerMethod.java 2010-05-24 18:43:55 UTC (rev 22294) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ProducerMethod.java 2010-05-24 19:24:14 UTC (rev 22295) @@ -46,11 +46,13 @@ = public ProducerMethod() {} = + @Override public void setDefinition(MethodDefinition definition) { super.setDefinition(definition); produces =3D definition.getProducesAnnotation(); } = + @Override protected Parameter newParameter() { return new InjectionPointParameter(); } --===============6525055254828414822==-- From jbosstools-commits at lists.jboss.org Mon May 24 17:14:40 2010 Content-Type: multipart/mixed; boundary="===============1738556073660018175==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22296 - branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet. Date: Mon, 24 May 2010 17:14:40 -0400 Message-ID: <201005242114.o4OLEexK008893@svn01.web.mwc.hst.phx2.redhat.com> --===============1738556073660018175== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-24 17:14:40 -0400 (Mon, 24 May 2010) New Revision: 22296 Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org= /jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDele= gate.java Log: https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds rich= faces fragments to web.xml Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInst= allDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/or= g/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDel= egate.java 2010-05-24 19:24:14 UTC (rev 22295) +++ branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/or= g/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDel= egate.java 2010-05-24 21:14:40 UTC (rev 22296) @@ -349,8 +349,8 @@ if (isSeamFacet) { return true; } - if (!libraryConfig.isAddRichfacesCapabilities()) { - return false; + if (libraryConfig.isAddRichfacesCapabilities()) { + return true; } } = --===============1738556073660018175==-- From jbosstools-commits at lists.jboss.org Mon May 24 17:18:11 2010 Content-Type: multipart/mixed; boundary="===============8897068168357789775==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22297 - trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet. Date: Mon, 24 May 2010 17:18:11 -0400 Message-ID: <201005242118.o4OLIBr2009465@svn01.web.mwc.hst.phx2.redhat.com> --===============8897068168357789775== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-24 17:18:11 -0400 (Mon, 24 May 2010) New Revision: 22297 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/p= ortlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java Log: https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds rich= faces fragments to web.xml Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/= tools/portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/= portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 201= 0-05-24 21:14:40 UTC (rev 22296) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/= portlet/core/internal/project/facet/JSFPortletFacetInstallDelegate.java 201= 0-05-24 21:18:11 UTC (rev 22297) @@ -349,8 +349,8 @@ if (isSeamFacet) { return true; } - if (!libraryConfig.isAddRichfacesCapabilities()) { - return false; + if (libraryConfig.isAddRichfacesCapabilities()) { + return true; } } = --===============8897068168357789775==-- From jbosstools-commits at lists.jboss.org Mon May 24 17:22:52 2010 Content-Type: multipart/mixed; boundary="===============9212971171019902011==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22298 - branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/project/facet. Date: Mon, 24 May 2010 17:22:51 -0400 Message-ID: <201005242122.o4OLMpLd009926@svn01.web.mwc.hst.phx2.redhat.com> --===============9212971171019902011== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-24 17:22:51 -0400 (Mon, 24 May 2010) New Revision: 22298 Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/s= rc/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInsta= llDelegate.java Log: https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds rich= faces fragments to web.xml Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .core/src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFac= etInstallDelegate.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInst= allDelegate.java 2010-05-24 21:18:11 UTC (rev 22297) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/internal/project/facet/JSFPortletFacetInst= allDelegate.java 2010-05-24 21:22:51 UTC (rev 22298) @@ -349,8 +349,8 @@ if (isSeamFacet) { return true; } - if (!libraryConfig.isAddRichfacesCapabilities()) { - return false; + if (libraryConfig.isAddRichfacesCapabilities()) { + return true; } } = --===============9212971171019902011==-- From jbosstools-commits at lists.jboss.org Tue May 25 01:48:19 2010 Content-Type: multipart/mixed; boundary="===============2757530871410556190==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22299 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util. Date: Tue, 25 May 2010 01:48:19 -0400 Message-ID: <201005250548.o4P5mJ56020247@svn01.web.mwc.hst.phx2.redhat.com> --===============2757530871410556190== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-25 01:48:18 -0400 (Tue, 25 May 2010) New Revision: 22299 Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/= ResourcesUtils.java Log: revert to previous revision Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tes= t/util/ResourcesUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util= /ResourcesUtils.java 2010-05-24 21:22:51 UTC (rev 22298) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util= /ResourcesUtils.java 2010-05-25 05:48:18 UTC (rev 22299) @@ -195,7 +195,7 @@ * @param path the path * @param projectName the project name */ - static public IProject importProjectIntoWorkspace(String path, String pro= jectName) throws IOException { + static public IProject importProjectIntoWorkspace(String path, String pro= jectName) { = IProject project =3D null; = @@ -219,16 +219,10 @@ unimportedFiles.add(".svn"); //$NON-NLS-1$ = importProvider.setUnimportedFiles(unimportedFiles); - = - File file =3D new File(path); - = - if(!file.isDirectory()) { - throw new IOException("Cannot import test project from " + file); - } = // create import operation ImportOperation importOp =3D new ImportOperation(project - .getFullPath(), file, importProvider, overwrite); + .getFullPath(), new File(path), importProvider, overwrite); = // import files just to project folder ( without old structure ) importOp.setCreateContainerStructure(false); --===============2757530871410556190==-- From jbosstools-commits at lists.jboss.org Tue May 25 03:54:26 2010 Content-Type: multipart/mixed; boundary="===============6990060768952421576==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] Remote work for responsible persons (US) Date: Tue, 25 May 2010 03:54:24 -0400 Message-ID: <201005250754.o4P7sOAl018943@lists01.dmz-a.mwc.hst.phx2.redhat.com> --===============6990060768952421576== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable --===============6990060768952421576== Content-Type: text/html MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.html" PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMCBUcmFuc2l0aW9uYWwv L0VOIj4KPEhUTUw+PEhFQUQ+CjxNRVRBIGh0dHAtZXF1aXY9Q29udGVudC1UeXBlIGNvbnRlbnQ9 InRleHQvaHRtbDsgY2hhcnNldD1XaW5kb3dzLTEyNTIiPgo8L0hFQUQ+CjxCT0RZPk15IG5hbWUg aXMgTGlzYSBhbmQgb3VyIGNvbXBhbnkgaXMgbG9va2luZyB0byBmdWxmaWxsIHNldmVyYWwgcGFy dCB0aW1lIHBvc2l0aW9ucyBpbiB5b3VyIHJlZ2lvbi48YnI+CldlIGFyZSBvbmUgb2YgdGhlIGxh cmdlc3QgaW50ZXJuZXQgc29sdXRpb25zIHJlc2VsbGVycyBvbiB0aGUgbWFya2V0IGFuZCBhcmUg bG9va2luZzxicj4KdG8gYnVpbGQgc3Ryb25nIHN1cHBvcnQgdGVhbSBpbiBVbml0ZWQgU3RhdGVz IHRvIHByb3ZpZGUgdGhlIGJlc3QgQ3VzdG9tZXIgQ2FyZS48YnI+Cjxicj4KVGl0bGUgb2YgdGhl IGN1cnJlbnQgcG9zaXRpb24gYXZhaWxhYmxlIGlzIMKTUGF5bWVudCBQcm9jZXNzaW5nIEFzc2lz dGFudMKUIGFuZCB3ZSBoYXZlIHNldmVuIG9wZW5pbmdzLjxicj4KPGJyPgo8Yj5BbiBpZGVhbCBh cHBsaWNhbnQgZm9yIHRoaXMgcG9zaXRpb24gbXVzdCBtZWV0IHRoZSBmb2xsb3dpbmcgcmVxdWly ZW1lbnRzOjwvYj48YnI+CiogQXQgbGVhc3QgMjIgeWVhcnMgb2YgYWdlIDxicj4KKiBSZXNpZGVu dCBvZiBVbml0ZWQgU3RhdGVzIG9mIEFtZXJpY2E8YnI+CiogVmVyeSBvYnNlcnZhbnQgYW5kIGFi bGUgdG8gZm9jdXMgb24gZGV0YWlscyA8YnI+CiogUGF0aWVudDxicj4KKiBUcnVzdHdvcnRoeTxi cj4KKiBQcmFjdGljYWwgPGJyPgoqIExvdmVzIHRvIGxlYXJuPGJyPgoqIEV4cGxhaW5zIHdlbGwg aW4gd3JpdGluZyA8YnI+CiogSGFuZGxlcyBkZWFkbGluZXM8YnI+CiogQmFuayBhY2NvdW50PGJy PgoqIEZ1bGwgaW50ZXJuZXQgYWNjZXNzIChhdCBob21lIG9yIGF0IHdvcmspIDxicj4KPGJyPgo8 Yj5CZW5lZml0czo8L2I+PGJyPgoqIDUwJSBvZiB0aGUgbW9udGhseSBjZWxsIHBob25lIGJpbGwg aXMgY292ZXJlZCBieSB0aGUgY29tcGFueTxicj4KKiBNb250aGx5IHNhbGFyeSBzdGFydGluZyBh dCAkMjAwMChhZnRlciBhIG1vbnRoIGV2YWx1YXRpb24gcGVyaW9kKTxicj4KKiA1JSBjb21taXNz aW9uIGZvciBldmVyeSBwcm9jZXNzZWQgdHJhbnNmZXI8YnI+CiogQmFua2luZywgV2VzdGVybiBV bmlvbiBhbmQgTW9uZXkgR3JhbSBmZWVzIGlzIGJlIGNvdmVyZWQgYnkgdGhlIGNvbXBhbnk8YnI+ Cjxicj4KSWYgeW91IGFyZSBpbnRlcmVzdGVkIHBsZWFzZSByZXBseSB0bzogPGI+RGlhbm5Aam9i NC11cy5jb208L2I+PC9CT0RZPjwvSFRNTD4K --===============6990060768952421576==-- From jbosstools-commits at lists.jboss.org Tue May 25 04:59:54 2010 Content-Type: multipart/mixed; boundary="===============7534957416842107799==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22300 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: messages and 1 other directory. Date: Tue, 25 May 2010 04:59:54 -0400 Message-ID: <201005250859.o4P8xsSv028353@svn01.web.mwc.hst.phx2.redhat.com> --===============7534957416842107799== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2010-05-25 04:59:54 -0400 (Tue, 25 May 2010) New Revision: 22300 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wiz= ards/ExportUnknownTagsTemplatesWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wiz= ards/ImportUnknownTagsTemplatesWizardPage.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/V= peUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/m= essages.properties Log: https://jira.jboss.org/browse/JBIDE-2795 , Dialogs' titles were changed, "F= ile name:" label were added. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/wizards/ExportUnknownTagsTemplatesWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wi= zards/ExportUnknownTagsTemplatesWizardPage.java 2010-05-25 05:48:18 UTC (re= v 22299) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wi= zards/ExportUnknownTagsTemplatesWizardPage.java 2010-05-25 08:59:54 UTC (re= v 22300) @@ -30,6 +30,7 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; @@ -78,7 +79,7 @@ * Two columns. */ Composite composite =3D new Composite(parent, SWT.NONE); - composite.setLayout(new GridLayout(2, false)); + composite.setLayout(new GridLayout(3, false)); composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, tru= e, 1, 1)); composite.setFont(parent.getFont()); = @@ -88,7 +89,7 @@ tagsTable =3D new Table(composite, SWT.BORDER); TableLayout layout =3D new TableLayout(); tagsTable.setLayout(layout); - tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, tru= e, 2, 1)); + tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, tru= e, 3, 1)); tagsTable.setHeaderVisible(true); tagsTable.setLinesVisible(true); = @@ -108,20 +109,28 @@ VpeImportExportWizardsUtils.updateTagsTable(tagsTable, tagsList, true); = /* - * Add path output and browse button = + * Add label = */ + Label fileNamaLabel =3D new Label(composite, SWT.NONE); = + fileNamaLabel.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, false, fa= lse, 1, 1)); + fileNamaLabel.setText(VpeUIMessages.FILE_NAME_LABEL); + /* + * Add output path + */ final Text pathText =3D new Text(composite, SWT.BORDER); - pathText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1= )); + pathText.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true, false, 1= , 1)); pathText.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { pathString =3D ((Text)e.getSource()).getText(); setPageComplete(isPageComplete()); } }); - = + /* + * Add browse button + */ Button browseButton =3D new Button(composite, SWT.NONE); browseButton.setText(VpeUIMessages.BROWSE_BUTTON_TEXT); - browseButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false,= 1, 1)); + browseButton.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, fal= se, 1, 1)); browseButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { FileDialog dialog =3D new FileDialog(PlatformUI.getWorkbench() Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/wizards/ImportUnknownTagsTemplatesWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wi= zards/ImportUnknownTagsTemplatesWizardPage.java 2010-05-25 05:48:18 UTC (re= v 22299) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/wi= zards/ImportUnknownTagsTemplatesWizardPage.java 2010-05-25 08:59:54 UTC (re= v 22300) @@ -31,6 +31,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.FileDialog; +import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; @@ -76,16 +77,22 @@ * Two columns. */ Composite composite =3D new Composite(parent, SWT.NONE); - composite.setLayout(new GridLayout(2, false)); + composite.setLayout(new GridLayout(3, false)); composite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, tru= e, 1, 1)); composite.setFont(parent.getFont()); = /* - * Add path output and browse button = + * Add label = */ + Label fileNamaLabel =3D new Label(composite, SWT.NONE); = + fileNamaLabel.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, false, fa= lse, 1, 1)); + fileNamaLabel.setText(VpeUIMessages.FILE_NAME_LABEL); + /* + * Add output path = + */ final Text pathText =3D new Text(composite, SWT.BORDER); pathText.setEditable(true); - pathText.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 1, 1= )); + pathText.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, true, false, 1= , 1)); pathText.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { pathString =3D ((Text)e.getSource()).getText(); @@ -119,10 +126,12 @@ setPageComplete(isPageComplete()); } }); - = + /* + * Add browse button + */ Button browseButton =3D new Button(composite, SWT.NONE); browseButton.setText(VpeUIMessages.BROWSE_BUTTON_TEXT); - browseButton.setLayoutData(new GridData(SWT.FILL, SWT.TOP, false, false,= 1, 1)); + browseButton.setLayoutData(new GridData(SWT.FILL, SWT.BOTTOM, false, fal= se, 1, 1)); browseButton.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { FileDialog dialog =3D new FileDialog(PlatformUI.getWorkbench() @@ -145,7 +154,7 @@ tagsTable =3D new Table(composite, SWT.BORDER); TableLayout layout =3D new TableLayout(); tagsTable.setLayout(layout); - tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, tru= e, 2, 2)); + tagsTable.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, tru= e, 3, 1)); tagsTable.setHeaderVisible(true); tagsTable.setLinesVisible(true); = Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/VpeUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= VpeUIMessages.java 2010-05-25 05:48:18 UTC (rev 22299) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= VpeUIMessages.java 2010-05-25 08:59:54 UTC (rev 22300) @@ -152,6 +152,7 @@ public static String SELECT_ALL; public static String DESELECT_ALL; public static String BROWSE_BUTTON_TEXT; + public static String FILE_NAME_LABEL; public static String NONE_TEMPLATES_WERE_ADDED; public static String COULD_NOT_SET_TABLE_SELECTION; public static String CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT; Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-25 05:48:18 UTC (rev 22299) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-25 08:59:54 UTC (rev 22300) @@ -135,10 +135,11 @@ SELECT_ALL=3DSelect All DESELECT_ALL=3DDeselect All BROWSE_BUTTON_TEXT=3DBrowse... -EXPORT_UNKNOWN_TAGS_PAGE_TITLE=3DUnknown tags templates -EXPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=3DExport unknown tags templates to ex= ternal file -IMPORT_UNKNOWN_TAGS_PAGE_TITLE=3DUnknown tags templates -IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=3DImport unknown tags templates from = external file +FILE_NAME_LABEL=3DFile name: +EXPORT_UNKNOWN_TAGS_PAGE_TITLE=3DExport Unknown Tags Templates +EXPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=3DExport unknown tags templates to th= e external file +IMPORT_UNKNOWN_TAGS_PAGE_TITLE=3DImport Unknown Tags Templates +IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=3DImport unknown tags templates from = the external file NONE_TEMPLATES_WERE_ADDED=3DNone of the templates were added. COULD_NOT_SET_TABLE_SELECTION=3DCould not set table selection. LIST_IS_EMPTY=3DList is empty --===============7534957416842107799==-- From jbosstools-commits at lists.jboss.org Tue May 25 06:20:52 2010 Content-Type: multipart/mixed; boundary="===============5010835955653226614==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22301 - in branches/3.2.helios: jbpm/features/org.jboss.tools.jbpm4.tests.sdk.feature and 1 other directories. Date: Tue, 25 May 2010 06:20:52 -0400 Message-ID: <201005251020.o4PAKqCN017445@svn01.web.mwc.hst.phx2.redhat.com> --===============5010835955653226614== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: max.andersen(a)jboss.com Date: 2010-05-25 06:20:51 -0400 (Tue, 25 May 2010) New Revision: 22301 Modified: branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm3.tests.sdk.featur= e/.project branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm4.tests.sdk.featur= e/.project branches/3.2.helios/modeshape/features/org.jboss.tools.modeshape.rest.te= st.sdk.feature/.project Log: JBIDE-6342 broken .project files Modified: branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm3.tests.sdk= .feature/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm3.tests.sdk.featu= re/.project 2010-05-25 08:59:54 UTC (rev 22300) +++ branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm3.tests.sdk.featu= re/.project 2010-05-25 10:20:51 UTC (rev 22301) @@ -1,6 +1,6 @@ - org.jboss.tools.jbpm3.tests.feature + org.jboss.tools.jbpm3.tests.sdk.feature Modified: branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm4.tests.sdk= .feature/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm4.tests.sdk.featu= re/.project 2010-05-25 08:59:54 UTC (rev 22300) +++ branches/3.2.helios/jbpm/features/org.jboss.tools.jbpm4.tests.sdk.featu= re/.project 2010-05-25 10:20:51 UTC (rev 22301) @@ -1,6 +1,6 @@ - org.jboss.tools.jbpm4.tests.feature + org.jboss.tools.jbpm4.tests.sdk.feature Modified: branches/3.2.helios/modeshape/features/org.jboss.tools.modeshape.= rest.test.sdk.feature/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/modeshape/features/org.jboss.tools.modeshape.rest.t= est.sdk.feature/.project 2010-05-25 08:59:54 UTC (rev 22300) +++ branches/3.2.helios/modeshape/features/org.jboss.tools.modeshape.rest.t= est.sdk.feature/.project 2010-05-25 10:20:51 UTC (rev 22301) @@ -1,6 +1,6 @@ - org.jboss.tools.modeshape.rest.test.feature + org.jboss.tools.modeshape.rest.test.sdk.feature --===============5010835955653226614==-- From jbosstools-commits at lists.jboss.org Tue May 25 07:18:22 2010 Content-Type: multipart/mixed; boundary="===============0216170844027516441==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22302 - in branches/3.2.helios/jmx: features and 1 other directories. Date: Tue, 25 May 2010 07:18:22 -0400 Message-ID: <201005251118.o4PBIMQq030098@svn01.web.mwc.hst.phx2.redhat.com> --===============0216170844027516441== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: max.andersen(a)jboss.com Date: 2010-05-25 07:18:21 -0400 (Tue, 25 May 2010) New Revision: 22302 Modified: branches/3.2.helios/jmx/ branches/3.2.helios/jmx/features/ branches/3.2.helios/jmx/plugins/ Log: svn ignore target folders Property changes on: branches/3.2.helios/jmx ___________________________________________________________________ Name: svn:ignore - test + test target Property changes on: branches/3.2.helios/jmx/features ___________________________________________________________________ Name: svn:ignore + target Property changes on: branches/3.2.helios/jmx/plugins ___________________________________________________________________ Name: svn:ignore + target --===============0216170844027516441==-- From jbosstools-commits at lists.jboss.org Tue May 25 07:23:15 2010 Content-Type: multipart/mixed; boundary="===============3201996316391562658==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22303 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory. Date: Tue, 25 May 2010 07:23:14 -0400 Message-ID: <201005251123.o4PBNEG0030613@svn01.web.mwc.hst.phx2.redhat.com> --===============3201996316391562658== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-25 07:23:14 -0400 (Tue, 25 May 2010) New Revision: 22303 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/BeanMethod.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/MethodDefinition.java Log: https://jira.jboss.org/browse/JBIDE-6339 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/BeanMethod.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanMethod.java 2010-05-25 11:18:21 UTC (rev 22302) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanMethod.java 2010-05-25 11:23:14 UTC (rev 22303) @@ -49,7 +49,7 @@ } = protected Parameter newParameter() { - return new Parameter(); + return ((MethodDefinition)definition).isConstructor() ? new InjectionPoi= ntParameter() : new Parameter(); } = public IMethod getMethod() { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/MethodDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-25 11:18:21 UTC (re= v 22302) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-25 11:23:14 UTC (re= v 22303) @@ -58,9 +58,13 @@ = } = + boolean parametersAreInjectionPoints() { + return isConstructor || getProducesAnnotation() !=3D null || getInjectAn= notation() !=3D null; + } + void loadParamDefinitions(IType contextType, DefinitionContext context) t= hrows CoreException { if(method =3D=3D null) return; - boolean isProducer =3D getProducesAnnotation() !=3D null; + boolean parametersAreInjectionPoints =3D parametersAreInjectionPoints(); String[] parameterNames =3D method.getParameterNames(); if(parameterNames =3D=3D null || parameterNames.length =3D=3D 0) return; if(contextType =3D=3D null || contextType.isBinary()) return; @@ -82,7 +86,7 @@ int start =3D paramStart + 1; = for (int i =3D 0; i < params.length; i++) { - if(params[i].indexOf('@') < 0 && !isProducer) { + if(params[i].indexOf('@') < 0 && !parametersAreInjectionPoints) { start +=3D params[i].length() + 1; continue; //do not need parameters without annotation } --===============3201996316391562658==-- From jbosstools-commits at lists.jboss.org Tue May 25 09:31:23 2010 Content-Type: multipart/mixed; boundary="===============2654347176745478696==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22304 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl: definition and 1 other directory. Date: Tue, 25 May 2010 09:31:23 -0400 Message-ID: <201005251331.o4PDVNeM025527@svn01.web.mwc.hst.phx2.redhat.com> --===============2654347176745478696== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-25 09:31:22 -0400 (Tue, 25 May 2010) New Revision: 22304 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/BeanMethod.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/ClassBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/MethodDefinition.java Log: https://jira.jboss.org/browse/JBIDE-6339 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/BeanMethod.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanMethod.java 2010-05-25 11:23:14 UTC (rev 22303) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanMethod.java 2010-05-25 13:31:22 UTC (rev 22304) @@ -49,7 +49,7 @@ } = protected Parameter newParameter() { - return ((MethodDefinition)definition).isConstructor() ? new InjectionPoi= ntParameter() : new Parameter(); + return ((MethodDefinition)definition).parametersAreInjectionPoints() ? n= ew InjectionPointParameter() : new Parameter(); } = public IMethod getMethod() { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/ClassBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ClassBean.java 2010-05-25 11:23:14 UTC (rev 22303) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ClassBean.java 2010-05-25 13:31:22 UTC (rev 22304) @@ -31,6 +31,7 @@ import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration; import org.jboss.tools.cdi.core.IParametedType; +import org.jboss.tools.cdi.core.IParameter; import org.jboss.tools.cdi.core.IProducer; import org.jboss.tools.cdi.core.IQualifierDeclaration; import org.jboss.tools.cdi.core.IScope; @@ -244,6 +245,13 @@ if(m instanceof IInjectionPoint) { result.add((IInjectionPoint)m); } + List ps =3D m.getParameters(); + for (IParameter p: ps) { + if(p instanceof IInjectionPoint) { + result.add((IInjectionPoint)p); + } + } + = } return result; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/MethodDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-25 11:23:14 UTC (re= v 22303) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-25 13:31:22 UTC (re= v 22304) @@ -58,8 +58,8 @@ = } = - boolean parametersAreInjectionPoints() { - return isConstructor || getProducesAnnotation() !=3D null || getInjectAn= notation() !=3D null; + public boolean parametersAreInjectionPoints() { + return getProducesAnnotation() !=3D null || getInjectAnnotation() !=3D n= ull; } = void loadParamDefinitions(IType contextType, DefinitionContext context) t= hrows CoreException { @@ -80,13 +80,17 @@ int paramEnd =3D content.lastIndexOf(')', declEnd); if(paramEnd < 0) return; String paramsString =3D content.substring(paramStart + 1, paramEnd); - if(paramsString.indexOf('@') < 0) return; - String[] params =3D paramsString.split(","); + if(!parametersAreInjectionPoints && paramsString.indexOf('@') < 0) retur= n; + String[] params =3D getParams(paramsString); String[] ps =3D method.getParameterTypes(); int start =3D paramStart + 1; = for (int i =3D 0; i < params.length; i++) { - if(params[i].indexOf('@') < 0 && !parametersAreInjectionPoints) { + if(ps.length <=3D i) { + System.out.println("Panic"); + continue; + } + if(!parametersAreInjectionPoints && params[i].indexOf('@') < 0) { start +=3D params[i].length() + 1; continue; //do not need parameters without annotation } @@ -109,9 +113,8 @@ v.valueLength =3D p.length(); pd.setPosition(v); = - StringTokenizer tokens =3D new StringTokenizer(p, " \r\n\t"); - while (tokens.hasMoreElements()) { - String q =3D tokens.nextToken(); + String[] tokens =3D getParamTokens(p); + for (String q: tokens) { if(!q.startsWith("@")) continue; v =3D new ValueInfo(); v.setValue(q); @@ -151,6 +154,81 @@ } return false; } - = = + static String[] getParams(String paramsString) { + List result =3D new ArrayList(); + int i =3D 0; + int c1 =3D 0; + int c2 =3D 0; + char quote =3D '\0'; + StringBuffer sb =3D new StringBuffer(); + while(i < paramsString.length()) { + char c =3D paramsString.charAt(i); + if(c =3D=3D ',' && c1 =3D=3D 0 && c2 =3D=3D 0 && quote =3D=3D '\0') { + result.add(sb.toString()); + sb.setLength(0); + i++; + continue; + } else if(c =3D=3D '(' && quote =3D=3D '\0') { + c1++; + } else if(c =3D=3D ')' && quote =3D=3D '\0') { + c1--; + } else if(c =3D=3D '<' && quote =3D=3D '\0') { + c2++; + } else if(c =3D=3D '>' && quote =3D=3D '\0') { + c2--; + } else if((c =3D=3D '\'' || c =3D=3D '"') && quote =3D=3D '\0') { + quote =3D c; + } else if(quote =3D=3D c) { + quote =3D '\0'; + } + sb.append(c); + i++; + } + if(sb.length() > 0) { + result.add(sb.toString()); + } + return result.toArray(new String[0]); + } + + static String[] getParamTokens(String paramsString) { + List result =3D new ArrayList(); + int i =3D 0; + int c1 =3D 0; + int c2 =3D 0; + char quote =3D '\0'; + StringBuffer sb =3D new StringBuffer(); + while(i < paramsString.length()) { + char c =3D paramsString.charAt(i); + boolean ws =3D Character.isWhitespace(c); + if(ws && c1 =3D=3D 0 && c2 =3D=3D 0 && quote =3D=3D '\0') { + String t =3D sb.toString().trim(); + if(t.length() > 0) { + result.add(t); + } + sb.setLength(0); + i++; + continue; + } else if(c =3D=3D '(' && quote =3D=3D '\0') { + c1++; + } else if(c =3D=3D ')' && quote =3D=3D '\0') { + c1--; + } else if(c =3D=3D '<' && quote =3D=3D '\0') { + c2++; + } else if(c =3D=3D '>' && quote =3D=3D '\0') { + c2--; + } else if((c =3D=3D '\'' || c =3D=3D '"') && quote =3D=3D '\0') { + quote =3D c; + } else if(quote =3D=3D c) { + quote =3D '\0'; + } + sb.append(c); + i++; + } + if(sb.length() > 0) { + result.add(sb.toString()); + } + return result.toArray(new String[0]); + } + } --===============2654347176745478696==-- From jbosstools-commits at lists.jboss.org Tue May 25 10:09:18 2010 Content-Type: multipart/mixed; boundary="===============8784987627004888898==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22305 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition. Date: Tue, 25 May 2010 10:09:18 -0400 Message-ID: <201005251409.o4PE9Id5003925@svn01.web.mwc.hst.phx2.redhat.com> --===============8784987627004888898== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-25 10:09:16 -0400 (Tue, 25 May 2010) New Revision: 22305 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/MethodDefinition.java Log: https://jira.jboss.org/browse/JBIDE-6339 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/MethodDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-25 13:31:22 UTC (re= v 22304) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/MethodDefinition.java 2010-05-25 14:09:16 UTC (re= v 22305) @@ -12,14 +12,13 @@ = import java.util.ArrayList; import java.util.List; -import java.util.StringTokenizer; = import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.ISourceRange; import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.CDIConstants; -import org.jboss.tools.cdi.core.IParameter; +import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.internal.core.impl.ParametedType; import org.jboss.tools.common.model.project.ext.impl.ValueInfo; import org.jboss.tools.common.model.util.EclipseJavaUtil; @@ -87,8 +86,8 @@ = for (int i =3D 0; i < params.length; i++) { if(ps.length <=3D i) { - System.out.println("Panic"); - continue; + CDICorePlugin.getDefault().logError(new IllegalArgumentException("Cann= ot parse method parameters for " + paramsString)); + break; } if(!parametersAreInjectionPoints && params[i].indexOf('@') < 0) { start +=3D params[i].length() + 1; @@ -165,7 +164,9 @@ while(i < paramsString.length()) { char c =3D paramsString.charAt(i); if(c =3D=3D ',' && c1 =3D=3D 0 && c2 =3D=3D 0 && quote =3D=3D '\0') { - result.add(sb.toString()); + if(sb.toString().trim().length() > 0) { + result.add(sb.toString()); + } sb.setLength(0); i++; continue; --===============8784987627004888898==-- From jbosstools-commits at lists.jboss.org Tue May 25 10:30:17 2010 Content-Type: multipart/mixed; boundary="===============2722995347870012176==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22306 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse: launch and 1 other directory. Date: Tue, 25 May 2010 10:30:17 -0400 Message-ID: <201005251430.o4PEUHjQ006266@svn01.web.mwc.hst.phx2.redhat.com> --===============2722995347870012176== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2010-05-25 10:30:17 -0400 (Tue, 25 May 2010) New Revision: 22306 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber= nate/eclipse/console/HibernateConsoleMessages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber= nate/eclipse/console/HibernateConsoleMessages.properties trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber= nate/eclipse/launch/ConsoleConfigurationJavaClasspathTab.java Log: https://jira.jboss.org/browse/JBIDE-6337 - fix with missing archive file in= classpath Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/or= g/hibernate/eclipse/console/HibernateConsoleMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/HibernateConsoleMessages.java 2010-05-25 14:09:16 UTC= (rev 22305) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/HibernateConsoleMessages.java 2010-05-25 14:30:17 UTC= (rev 22306) @@ -436,6 +436,7 @@ public static String ConsoleConfigurationTab_browse; public static String ConsoleConfigurationTab_create_new; public static String ConsoleConfigurationTab_setup; + public static String ConsoleConfigurationTabGroup_archive_classpath_entry= _does_not_exist; public static String ConsoleConfigurationTabGroup_classpath_must_be_set_o= r_restored_to_default; public static String DirectoryBrowseField_filesystem; public static String DirectoryBrowseField_workspace; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/or= g/hibernate/eclipse/console/HibernateConsoleMessages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/HibernateConsoleMessages.properties 2010-05-25 14:09:= 16 UTC (rev 22305) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/HibernateConsoleMessages.properties 2010-05-25 14:30:= 17 UTC (rev 22306) @@ -440,6 +440,7 @@ ConsoleConfigurationTab_browse=3DBrowse... ConsoleConfigurationTab_create_new=3DCreate New ConsoleConfigurationTab_setup=3DSetup... +ConsoleConfigurationTabGroup_archive_classpath_entry_does_not_exist=3DArch= ive classpath entry doesn't exist [{0}] ConsoleConfigurationTabGroup_classpath_must_be_set_or_restored_to_default= =3DClasspath must be set or restored to default DirectoryBrowseField_filesystem=3DFilesystem... DirectoryBrowseField_workspace=3DWorkspace.. Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/or= g/hibernate/eclipse/launch/ConsoleConfigurationJavaClasspathTab.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/launch/ConsoleConfigurationJavaClasspathTab.java 2010-05-25 1= 4:09:16 UTC (rev 22305) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/launch/ConsoleConfigurationJavaClasspathTab.java 2010-05-25 1= 4:30:17 UTC (rev 22306) @@ -15,6 +15,7 @@ import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab; import org.eclipse.jdt.launching.IRuntimeClasspathEntry; import org.eclipse.jdt.launching.JavaRuntime; +import org.eclipse.osgi.util.NLS; import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.HibernateConsolePlugin; = @@ -29,27 +30,35 @@ } = public boolean isValid(ILaunchConfiguration launchConfig) { - if(super.isValid( launchConfig )) { - setErrorMessage( null ); - setMessage( null ); - IRuntimeClasspathEntry[] entries; - try { - entries =3D JavaRuntime.computeUnresolvedRuntimeClasspath(launchConfig= ); - for (int i =3D 0; i < entries.length; i++) { - IRuntimeClasspathEntry entry =3D entries[i]; - if(entry.getClasspathProperty()=3D=3DIRuntimeClasspathEntry.USER_CLAS= SES) { - return true; + if (!super.isValid(launchConfig)) { + return false; + } + setErrorMessage(null); + setMessage(null); + boolean resUserClasses =3D false, resExistArchive =3D true; + IRuntimeClasspathEntry[] entries; + try { + entries =3D JavaRuntime.computeUnresolvedRuntimeClasspath(launchConfig); + for (int i =3D 0; i < entries.length; i++) { + IRuntimeClasspathEntry entry =3D entries[i]; + if (entry.getClasspathProperty() =3D=3D IRuntimeClasspathEntry.USER_CL= ASSES) { + resUserClasses =3D true; + if (entry.getType() =3D=3D IRuntimeClasspathEntry.ARCHIVE) { + if (!entry.getPath().toFile().exists()) { + resExistArchive =3D false; + String out =3D NLS.bind(HibernateConsoleMessages.ConsoleConfigurati= onTabGroup_archive_classpath_entry_does_not_exist, entry.getPath().toString= ()); + setErrorMessage(out); + } } } - } - catch (CoreException e) { - HibernateConsolePlugin.getDefault().log( e ); - } - setErrorMessage( HibernateConsoleMessages.ConsoleConfigurationTabGroup_= classpath_must_be_set_or_restored_to_default ); - return false; + } catch (CoreException e) { + HibernateConsolePlugin.getDefault().log( e ); } - return false; + if (!resUserClasses) { + setErrorMessage(HibernateConsoleMessages.ConsoleConfigurationTabGroup_c= lasspath_must_be_set_or_restored_to_default); + } + return resUserClasses && resExistArchive; } = public void initializeFrom(ILaunchConfiguration configuration) { --===============2722995347870012176==-- From jbosstools-commits at lists.jboss.org Tue May 25 11:09:17 2010 Content-Type: multipart/mixed; boundary="===============1469395486232207874==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22308 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties. Date: Tue, 25 May 2010 11:09:17 -0400 Message-ID: <201005251509.o4PF9Hpx017169@svn01.web.mwc.hst.phx2.redhat.com> --===============1469395486232207874== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgeraskov Date: 2010-05-25 11:09:16 -0400 (Tue, 25 May 2010) New Revision: 22308 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber= nate/eclipse/console/properties/HibernatePropertyPage.java Log: https://jira.jboss.org/browse/JBIDE-6290 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/or= g/hibernate/eclipse/console/properties/HibernatePropertyPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/properties/HibernatePropertyPage.java 2010-05-25 15:0= 8:34 UTC (rev 22307) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/properties/HibernatePropertyPage.java 2010-05-25 15:0= 9:16 UTC (rev 22308) @@ -43,7 +43,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jpt.core.JpaProject; -import org.eclipse.jpt.core.internal.JpaModelManager; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -72,7 +72,6 @@ import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; = -(a)SuppressWarnings("restriction") public class HibernatePropertyPage extends PropertyPage { = Control[] settings; @@ -341,7 +340,7 @@ final IWorkspaceRunnable wr =3D new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - JpaModelManager.instance().rebuildJpaProject(getProject()); + JptCorePlugin.rebuildJpaProject(getProject()); getProject().build(IncrementalProjectBuilder.FULL_BUILD, monitor); } }; --===============1469395486232207874==-- From jbosstools-commits at lists.jboss.org Tue May 25 11:26:15 2010 Content-Type: multipart/mixed; boundary="===============0139090383902848789==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22309 - in trunk/bpel/docs/reference/en-US: images and 1 other directories. Date: Tue, 25 May 2010 11:26:15 -0400 Message-ID: <201005251526.o4PFQFpH019163@svn01.web.mwc.hst.phx2.redhat.com> --===============0139090383902848789== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-25 11:26:14 -0400 (Tue, 25 May 2010) New Revision: 22309 Modified: trunk/bpel/docs/reference/en-US/images/deploy_createdeploy_5.png trunk/bpel/docs/reference/en-US/images/deploy_createdeploy_6.png trunk/bpel/docs/reference/en-US/master.xml trunk/bpel/docs/reference/en-US/modules/reference.xml Log:

https://jira.jboss.org/browse/TOOLSDOC-48 - Updated BPEL guide.Corrected= all found incorrect places.

Modified: trunk/bpel/docs/reference/en-US/images/deploy_createdeploy_5.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/bpel/docs/reference/en-US/images/deploy_createdeploy_6.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/bpel/docs/reference/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/docs/reference/en-US/master.xml 2010-05-25 15:09:16 UTC (rev= 22308) +++ trunk/bpel/docs/reference/en-US/master.xml 2010-05-25 15:26:14 UTC (rev= 22309) @@ -8,6 +8,7 @@ + ]> = @@ -48,8 +49,9 @@ = &overview; &install; - &detail; - &deploy; + &tasks; + &reference; &summary; = Modified: trunk/bpel/docs/reference/en-US/modules/reference.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/docs/reference/en-US/modules/reference.xml 2010-05-25 15:09:= 16 UTC (rev 22308) +++ trunk/bpel/docs/reference/en-US/modules/reference.xml 2010-05-25 15:26:= 14 UTC (rev 22309) @@ -105,7 +105,7 @@ Empt= y BPEL Process - list of services participating in this BPEL pr= ocess together with the one of messages u= sed within the process is empty.There are no any orchestration logic. Sync= hronous BPEL Process - = - similar to Asynchronous BP= EL Process temlate except the fact that here + similar to Asynchronous BP= EL Process template except the fact that here the caller is notified syn= chronously when the process completes. Asynchronous BPEL Process --===============0139090383902848789==-- From jbosstools-commits at lists.jboss.org Tue May 25 11:27:34 2010 Content-Type: multipart/mixed; boundary="===============3097512630547107156==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22310 - in trunk/bpel/docs/reference/en-US: modules and 1 other directory. Date: Tue, 25 May 2010 11:27:34 -0400 Message-ID: <201005251527.o4PFRYkM019203@svn01.web.mwc.hst.phx2.redhat.com> --===============3097512630547107156== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-25 11:27:33 -0400 (Tue, 25 May 2010) New Revision: 22310 Added: trunk/bpel/docs/reference/en-US/images/bpel_task_1.png trunk/bpel/docs/reference/en-US/images/bpel_task_2.png trunk/bpel/docs/reference/en-US/images/bpel_task_3.png trunk/bpel/docs/reference/en-US/modules/summary.xml trunk/bpel/docs/reference/en-US/modules/tasks.xml Log:

https://jira.jboss.org/browse/TOOLSDOC-48 - Updated BPEL guide.Corrected= all found incorrect places.

Added: trunk/bpel/docs/reference/en-US/images/bpel_task_1.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/bpel_task_1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/bpel_task_2.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/bpel_task_2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/images/bpel_task_3.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/bpel/docs/reference/en-US/images/bpel_task_3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/bpel/docs/reference/en-US/modules/summary.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/docs/reference/en-US/modules/summary.xml = (rev 0) +++ trunk/bpel/docs/reference/en-US/modules/summary.xml 2010-05-25 15:27:33= UTC (rev 22310) @@ -0,0 +1,21 @@ + + + + Summary + In conclusion, with this document you know all the capabilities = of BPEL Tools = + and could easily start with them. + The chapters above walked you through the steps on how to create a= nd configure BPEL process and = + deployment descriptor files. = + If you have questions or suggestions concerned both the documentat= ion and tools behavior, + you are welcome to JBoss Tools Users forum. + Please, use Jira to report bugs and requests on documentation. + = +
+ Other relevant resources on the topic + All JBoss Developer Studio/JBoss Tools release documentation= you can find at + http://docs.jboss.o= rg/tools in the corresponding release directory. + = + The latest documentation builds are available at http://download.jbos= s.org/jbosstools/nightly-docs. + +
+ Added: trunk/bpel/docs/reference/en-US/modules/tasks.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/docs/reference/en-US/modules/tasks.xml = (rev 0) +++ trunk/bpel/docs/reference/en-US/modules/tasks.xml 2010-05-25 15:27:33 U= TC (rev 22310) @@ -0,0 +1,444 @@ + + + Tasks +
+ Creating and editing a BPEL project + In the chapter we describe the necessary steps to create a n= ew BPEL project and edit the BPEL files. + You can get the source of the example from + riftsaw/samples/quickstart/hello_world. + Here and further in the guide we will create + a simple echo example, used to respond to a sent message with a + modified version of the request message being returned in a re= sponse. + First of all, you should create a BPEL project. + = + +
+ Creating a BPEL project + Create the project by selecting = + New > Project... > BPEL 2.0 > BPEL Pro= ject from the menu bar. + Then click the Next button. = + +
+ New BPEL Project + + + + + +
+ On this page of the New BPEL Project Wizard enter a project name in the Project Name + field,e.g enter HelloWorld. + = +
+ New BPEL Project Wizard + + + + + +
+ Click the Finish button. + So you have created the BPEL project named Hello= World. + Its structure is like this: +
+ The BPEL Project structure + + + + + +
+
+
+ Creating a BPEL process + Now you should create a BPEL process. You can create it = by selecting = + New > Others... > BPEL 2.0 > New BPEL = Process File. + +
+ New BPEL Process File + + + + + +
+ Click the Next button. Enter the fo= llowing information: + + = + Fields and values + = + + + + + Field + Value + = + + = + = + + BPEL Process Name + enter a process name. For example= , HelloWorld. = + = + + Namespace + enter or select a namespace for t= he BPEL process. = + = + + Template + Select the necessary template for= the BPEL process. + When you select the template, you will see= the information = + about the template below on the page.In ou= r case you should + select Synchronous BPEL Process<= /property>. = + = + = + = + +
+ = +
+ New BPEL Process File Wizard + + + + + +
+ Click the Next button. On the secon= d page make sure that the folder HelloWorld/bpelContent is selected. + Click Finish. + + + All of your files that are used in your BPEL project= must be under the bpelContent folder. Only in this ca= se = + these files can be deployed to JBoss server. + + + = + Up to now, you have got a simple BPEL process as on the = screen below. +
+ A simple BPEL Process File + + + + + +
+ The next step, you can do is to edit the BPEL process fi= le and then deploy it to JBoss server. +
+
+ Editing a BPEL process file + If the Properties view and Palette view are not= opened, you can open the views by right-clicking the BPEL editor and selec= ting = + Show in Properties, Show Pa= lette in Palette view. Then you should have the view like this: = + +
+ The BPEL editor view + + + + + +
= + In the Palette view, you can drag a BPEL element to the BPEL editor and drop it in the pl= ace you want. = + In the Properties view, you can get the information about every element of the BPEL proce= ss. + In the BPEL editor select any element you want,and then + the element's properties will be shown in the Properties v= iew.The table below describes the tabs of the Properties view: = + + + = + Tabs of the Property view + = + + + + + Tab + Description + = + + = + = + + Description + Shows the descriptive information= about the element,e.g. Name of the element. = + = + + Details + Shows the detailed and important = information about the element. + It is the most important section of an ele= ment. + Most of the properties of an element are s= et in this section. = + = + + Join Behavior + Shows the Join Failure<= /property> property of the element. = + = + + Documentation + Shows the documentation= sub-element of an element. = + = + + Other + Every BPEL element has its own se= ctions: Correlation section, Message Exchange section, and so on. We will + introduce them while using them. = + = + = + +
+ In order to see how a simple BPEL process works in actio= n, you should do some steps as below: = + + + Modify two variables of the process: + + Click on the details tab of the input = variable, + select Browse.... + Then choose string primitive = from the list. +
+ Edit variable in <property>process</pro= perty> file + + + + + +
= + + + Select xsd as a namespa= ce in the popup menu. + + + = + + + Add an Assign element betwe= en the receiveInput element and replyOutput<= /property> element. + + + Click the Assign element in= the BPEL editor in order to get the properties information of it in the Pr= operties view. = + + + + Set its name in the Description tab as assignHelloMesg. + In the Details section of P= roperties view, + you should click the New butt= on to add a copy sub-element to the element. = + Assign "Variable to Variable"(input:string to outp= ut). At this time, an "initializer" popup dialog appea= rs. Click on the Yes button in the dialog. + +
+ Add <property>Assign</property> to the proc= ess + + + + + +
= + Then you should click New o= nce more and select Expression to Variable + (assign concat($input,' World')) to <= property>result:string. +
+ Add <property>Expression assign</property> = to the process + + + + + +
= + + +
+ = +
+ Adding Service to WSDL file + + + = + + Open the file "HelloWorldArtifacts.wsd= l" in the "HelloWorld" project by double-cl= icking the file. Right-click the WSDL editor and select = + Add Service. A new service sh= ould appear in the editor. Name it HelloWorldProcessService. It has the Port = + named NewPort. Select it, rig= ht-click on it and rename it to HelloWorldProcessPort = in the Properties = + view. + +
+ Add <property>Service</property> to the WSD= L file + + + + + +
= + + + Right-click somewhere in the whitespace of the W= SDL editor and select = + Add Binding. A new Binding co= mponent will appear in the editor. Name it HelloWorldSOAPBinding<= /property>. Select it, in the = + General tab of the Properties view and select HelloWorld as a port type in the PortType. Then click on the = + Generate Binding Content... b= utton to open the Binding Wizard. In the wizard, sele= ct SOAP = + as the Protocol. Finally, cli= ck the Finish button to close the wizard. + +
+ Add a <property>Binding</property> to the W= SDL file + + + + + +
= + + + Click the HelloWorldProcessPort property in the General section of the Properties view, select HelloWorldSOAPBinding in + the Binding combobox. In the = Address field input http://localhost:8080/bpel/processes/Hell= oWorld?wsdl. + +
+ Add the <property>HelloWorldSOAPBinding</pr= operty> to the <property>HelloWorldProcessPort</property> + + + + + +
= + = + You should also change some servic= e part configurations. + To do this,click part element in the WSDL editor, + then put the following data in the Properties view= . = + +
+ Configuration of service part</titl= e> + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/detai= l_editprocess_5.png"/> + </imageobject> + </mediaobject> + </figure> = + </listitem> + </itemizedlist> + = + <para>Now you have finished creating a simple BPEL process.As = a next step, you can deploy the BPEL project to JBoss BPEL Runtime.</para> = = + = + </section> = + = + </section> + <section id=3D"deploy"> + <title>Deploy a JBoss BPEL project to JBoss BPEL Runtime +
+ Creating a bpel-deploy.xml file + If you want to deploy a BPEL project to JBoss BPEL Runti= me, you should create a bpel-deploy.xml file. = + JBoss tools can help you to create it: + + + + Create the bpel-deploy.xml by selecting = + New > Other... > BPEL 2.0 > Ap= ache ODE Deployment Descriptor. Click the N= ext button. = + +
+ New BPEL Deploy file + + + + + +
= + + + On the next wizard page you should enter the fol= lowing information: + BPEL Project: Click the Browse... button to select the BPEL= project in your workspace which you want to deploy to the runtime. + Please note, that you should select the = bpelContent folder in your new BPEL project as a value of BPEL Project field because the bpel-deploy.xml should be cre= ated in this place. + + File name: The default value is bpel-deploy.xml. Please, don't change it. + Click on Finish button to c= lose the wizard and a new bpel-deploy.xml file will be created. +
+ New BPEL Deploy file Wizard + + + + + +
= + + + Double-click the bpel-deploy.xml file to open it= in ODE Descriptor Deployment Editor. + In the Inbound Interfaces sec= tion, click the = + Associated Port column and se= lect HelloWorldProcessPort + in the dropdown box.The Related Service<= /property> and Binding Used = + columns should be automatically filled in. Save t= he bpel-deploy.xml. + +
+ bpel-deploy.xml file editor + + + + + +
= + = + +
+
+ Creating JBoss BPEL Server + Suppose you have installed the JBoss BPEL Runt= ime-RiftSaw as it was described before, now you can create a server for JBoss BPEL runtime. + + + Open the Servers view by se= lecting = + Windows > Show View > Other...= > Server > Servers. + = + + + Right-click the Servers view and select = + New > Server to open the New Server Wizard: = + +
+ New Server Wizard + + + + + +
= + + + Select JBoss AS 5.1 as a se= rver type. + + Please note, that only JBoss As 5.1 or highe= r version supports BPEL. + + + + = + Click the Next button. On t= he next page, you should input your JBoss As= location. Then click the Next button and + you will get the page like this: = + +
+ Add resource to the server + + + + + +
= + + + Select HelloWorld, then cli= ck the Add button to add the project to the server. + Then click on the Finish butt= on. + + Start the server by right-clicking on the server= and selecting the Start item. = + = +
+ The started server + + + + + +
= + If some aspects of server creation is not clear,= please, read JBoss Server Manager Reference Guide for more details. + + + You can enter the link http://localhost:8080/bpel/processes.html to the browser to get the deployed processes. = +
+ The BPEL console + + + + + +
= + = + = + If there's anything we didn't cover or you can't figure = out, please feel free to visit our JBoss Tools Users Forum to ask questions. + There we are also waiting for your suggestions and comment= s. = +
+
+ --===============3097512630547107156==-- From jbosstools-commits at lists.jboss.org Tue May 25 11:43:59 2010 Content-Type: multipart/mixed; boundary="===============7718231346346693848==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] We're looking for remote representatives in USA Date: Tue, 25 May 2010 11:43:40 -0400 Message-ID: <201005251543.o4PFheLJ010675@lists01.dmz-a.mwc.hst.phx2.redhat.com> --===============7718231346346693848== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable --===============7718231346346693848== Content-Type: text/html MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="attachment.html" PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMCBUcmFuc2l0aW9uYWwv L0VOIj4KPEhUTUw+PEhFQUQ+CjxNRVRBIGh0dHAtZXF1aXY9Q29udGVudC1UeXBlIGNvbnRlbnQ9 InRleHQvaHRtbDsgY2hhcnNldD13aW5kb3dzLTEyNTAiPgo8L0hFQUQ+CjxCT0RZPk15IG5hbWUg aXMgTGlzYSBhbmQgb3VyIGNvbXBhbnkgaXMgbG9va2luZyB0byBmdWxmaWxsIHNldmVyYWwgcGFy dCB0aW1lIHBvc2l0aW9ucyBpbiB5b3VyIHJlZ2lvbi48YnI+CldlIGFyZSBvbmUgb2YgdGhlIGxh cmdlc3QgaW50ZXJuZXQgc29sdXRpb25zIHJlc2VsbGVycyBvbiB0aGUgbWFya2V0IGFuZCBhcmUg bG9va2luZzxicj4KdG8gYnVpbGQgc3Ryb25nIHN1cHBvcnQgdGVhbSBpbiBVbml0ZWQgU3RhdGVz IHRvIHByb3ZpZGUgdGhlIGJlc3QgQ3VzdG9tZXIgQ2FyZS48YnI+Cjxicj4KVGl0bGUgb2YgdGhl IGN1cnJlbnQgcG9zaXRpb24gYXZhaWxhYmxlIGlzIMKTUGF5bWVudCBQcm9jZXNzaW5nIEFzc2lz dGFudMKUIGFuZCB3ZSBoYXZlIHNldmVuIG9wZW5pbmdzLjxicj4KPGJyPgo8Yj5BbiBpZGVhbCBh cHBsaWNhbnQgZm9yIHRoaXMgcG9zaXRpb24gbXVzdCBtZWV0IHRoZSBmb2xsb3dpbmcgcmVxdWly ZW1lbnRzOjwvYj48YnI+CiogQXQgbGVhc3QgMjIgeWVhcnMgb2YgYWdlIDxicj4KKiBSZXNpZGVu dCBvZiBVbml0ZWQgU3RhdGVzIG9mIEFtZXJpY2E8YnI+CiogVmVyeSBvYnNlcnZhbnQgYW5kIGFi bGUgdG8gZm9jdXMgb24gZGV0YWlscyA8YnI+CiogUGF0aWVudDxicj4KKiBUcnVzdHdvcnRoeTxi cj4KKiBQcmFjdGljYWwgPGJyPgoqIExvdmVzIHRvIGxlYXJuPGJyPgoqIEV4cGxhaW5zIHdlbGwg aW4gd3JpdGluZyA8YnI+CiogSGFuZGxlcyBkZWFkbGluZXM8YnI+CiogQmFuayBhY2NvdW50PGJy PgoqIEZ1bGwgaW50ZXJuZXQgYWNjZXNzIChhdCBob21lIG9yIGF0IHdvcmspIDxicj4KPGJyPgo8 Yj5CZW5lZml0czo8L2I+PGJyPgoqIDUwJSBvZiB0aGUgbW9udGhseSBjZWxsIHBob25lIGJpbGwg aXMgY292ZXJlZCBieSB0aGUgY29tcGFueTxicj4KKiBNb250aGx5IHNhbGFyeSBzdGFydGluZyBh dCAkMjAwMChhZnRlciBhIG1vbnRoIGV2YWx1YXRpb24gcGVyaW9kKTxicj4KKiA1JSBjb21taXNz aW9uIGZvciBldmVyeSBwcm9jZXNzZWQgdHJhbnNmZXI8YnI+CiogQmFua2luZywgV2VzdGVybiBV bmlvbiBhbmQgTW9uZXkgR3JhbSBmZWVzIGlzIGJlIGNvdmVyZWQgYnkgdGhlIGNvbXBhbnk8YnI+ Cjxicj4KSWYgeW91IGFyZSBpbnRlcmVzdGVkIHBsZWFzZSByZXBseSB0bzogPGI+RnJhbmNpc2Nv QGpvYjQtdXMuY29tPC9iPjwvQk9EWT48L0hUTUw+Cg== --===============7718231346346693848==-- From jbosstools-commits at lists.jboss.org Tue May 25 17:06:40 2010 Content-Type: multipart/mixed; boundary="===============5765257043757807792==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22311 - in trunk/download.jboss.org/jbosstools: requirements and 3 other directories. Date: Tue, 25 May 2010 17:06:40 -0400 Message-ID: <201005252106.o4PL6e1Z030921@svn01.web.mwc.hst.phx2.redhat.com> --===============5765257043757807792== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-25 17:06:40 -0400 (Tue, 25 May 2010) New Revision: 22311 Added: trunk/download.jboss.org/jbosstools/requirements/ trunk/download.jboss.org/jbosstools/requirements/helios/ trunk/download.jboss.org/jbosstools/requirements/helios/README.txt trunk/download.jboss.org/jbosstools/requirements/helios/m2eclipse/ trunk/download.jboss.org/jbosstools/requirements/helios/m2eclipse/build.= xml trunk/download.jboss.org/jbosstools/requirements/helios/svn/ trunk/download.jboss.org/jbosstools/requirements/helios/svn/build.xml Log: new cache of uberbuilder reqs will be on download.jboss.org because reposit= ory.jboss.org is now read-only Added: trunk/download.jboss.org/jbosstools/requirements/helios/README.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/download.jboss.org/jbosstools/requirements/helios/README.txt = (rev 0) +++ trunk/download.jboss.org/jbosstools/requirements/helios/README.txt 2010= -05-25 21:06:40 UTC (rev 22311) @@ -0,0 +1,70 @@ +Total of 20 req'd tgzs/zips/jars. + +BIRT 2.6 -> http://www.eclipse.org/downloads/download.php?file=3D/birt/dow= nloads/build_list.php = +-> +http://www.eclipse.org/downloads/download.php?file=3D/birt/downloads/build= .php?build=3DM-R1-2.6RC1-201005181142 +wget "http://www.eclipse.org/downloads/download.php?file=3D/birt/downloads= /drops/M-R1-2.6RC1-201005181142/birt-report-framework-2.6RC1.zip&r=3D1" \ + "http://www.eclipse.org/downloads/download.php?file=3D/birt/downloads/dro= ps/M-R1-2.6RC1-201005181142/birt-wtp-integration-sdk-2.6RC1.zip&r=3D1" = + +DTP 1.8 -> http://www.eclipse.org/datatools/downloads.php = +wget "http://www.eclipse.org/downloads/download.php?file=3D/datatools/down= loads/drops/N_DTP_1.8/dtp-1.8.0RC2-201005210500.zip" = + +Eclipse 3.6 + ETF -> http://www.eclipse.org/downloads/download.php?file=3D= /eclipse/downloads/ = +-> +http://www.eclipse.org/downloads/download.php?file=3D/eclipse/downloads/dr= ops/S-3.6RC2-201005201744/linPlatform.php#EclipseSDK +wget "http://www.eclipse.org/downloads/download.php?file=3D/eclipse/downlo= ads/drops/S-3.6RC2-201005201744/eclipse-SDK-3.6RC2-linux-gtk.tar.gz&r=3D1" \ +"http://www.eclipse.org/downloads/download.php?file=3D/eclipse/downloads/d= rops/S-3.6RC2-201005201744/eclipse-SDK-3.6RC2-linux-gtk-x86_64.tar.gz&r=3D1= " \ +"http://www.eclipse.org/downloads/download.php?file=3D/eclipse/downloads/d= rops/S-3.6RC2-201005201744/eclipse-SDK-3.6RC2-macosx-carbon.tar.gz&r=3D1" \ +"http://www.eclipse.org/downloads/download.php?file=3D/eclipse/downloads/d= rops/S-3.6RC2-201005201744/eclipse-SDK-3.6RC2-macosx-cocoa.tar.gz&r=3D1" \ +"http://www.eclipse.org/downloads/download.php?file=3D/eclipse/downloads/d= rops/S-3.6RC2-201005201744/eclipse-SDK-3.6RC2-win32.zip&r=3D1" \ +"http://www.eclipse.org/downloads/download.php?file=3D/eclipse/downloads/d= rops/S-3.6RC2-201005201744/eclipse-test-framework-3.6RC2.zip&r=3D1" + +EMF & XSD 2.6 -> +http://www.eclipse.org/modeling/emf/downloads/?project=3Demf&showAll=3D0&s= howMax=3D5&sortBy=3Ddate = +wget "http://www.eclipse.org/downloads/download.php?file=3D/modeling/emf/e= mf/downloads/drops/2.6.0/S201005211545/emf-runtime-2.6.0RC2.zip&r=3D1" \ +"http://www.eclipse.org/downloads/download.php?file=3D/modeling/emf/emf/do= wnloads/drops/2.6.0/S201005211545/xsd-runtime-2.6.0RC2.zip&r=3D1" + +GEF 3.6 -> +http://www.eclipse.org/gef/downloads/?project=3D&showAll=3D0&showMax=3D5&s= ortBy=3Ddate = +wget "http://www.eclipse.org/downloads/download.php?file=3D/tools/gef/down= loads/drops/3.6.0/S201005251255/GEF-runtime-3.6.0RC2.zip&r=3D1" \ +"http://www.eclipse.org/downloads/download.php?file=3D/tools/gef/downloads= /drops/3.6.0/S201005251255/GEF-zest-3.6.0RC2.zip&r=3D1" + +Equinox 3.6 -> http://www.eclipse.org/downloads/download.php?file=3D/equin= ox/ +wget "http://www.eclipse.org/downloads/download.php?file=3D/equinox/drops/= S-3.6RC2-201005201744/org.eclipse.equinox.transforms.xslt_1.0.200.v20100503= .jar&r=3D1" \ +"http://www.eclipse.org/downloads/download.php?file=3D/equinox/drops/S-3.6= RC2-201005201744/org.eclipse.equinox.transforms.hook_1.0.200.v20100503.jar&= r=3D1" + +TPTP 4.7 -> = +http://eclipse.org/tptp/home/downloads/?buildId=3DTPTP-4.7.0RC1-2010051719= 00 +wget "http://www.eclipse.org/downloads/download.php?file=3D/tptp/4.7.0/TPT= P-4.7.0RC1-201005171900/tptp.runtime-TPTP-4.7.0RC1.zip&r=3D1" + +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=3D/webtools/downl= oads/drops/R3.2.0/S-3.2.0RC2-20100520232028/wtp-S-3.2.0RC2-20100520232028.z= ip&r=3D1" + +SWTBot 2.0 e36 -> +http://www.eclipse.org/swtbot/downloads.php -> +wget "http://www.eclipse.org/downloads/download.php?r=3D1&file=3D/technolo= gy/swtbot/helios/dev-build/org.eclipse.swtbot.eclipse-2.0.0.568-dev-e36.zip= &r=3D1" \ + "http://www.eclipse.org/downloads/download.php?r=3D1&file=3D/technology/s= wtbot/helios/dev-build/org.eclipse.swtbot.eclipse.test.junit4-2.0.0.568-dev= -e36.zip&r=3D1" \ +"http://www.eclipse.org/downloads/download.php?r=3D1&file=3D/technology/sw= tbot/helios/dev-build/org.eclipse.swtbot.eclipse.gef-2.0.0.568-dev-e36.zip&= r=3D1" + +------------ + +3 Custom built zips: + +Basebuilder: org.eclipse.releng.basebuilder_R36_RC1.zip + latest tag: +http://wiki.eclipse.org/Platform-releng-basebuilder#Current_build_tag_for_= 3.6_stream_builds_.28Helios.29 + cvs -d :pserver:anonymous(a)dev.eclipse.org:/cvsroot/eclipse -q co -d +org.eclipse.releng.basebuilder_R36_RC1 -r R36_RC1 +org.eclipse.releng.basebuilder + cd org.eclipse.releng.basebuilder_R36_RC1; zip -r9 +../org.eclipse.releng.basebuilder_R36_RC1.zip ./* + +m2eclipse-0.10.0.20100209-0800.zip + see m2eclipse/build.xml + +Subvsve079.I201005121900_SVNconn222.I201005121900_SVNKit133.6648_JNA323_EC= F310.v201005082345-Update.zip + see svn/build.xml + http://divby0.blogspot.com/2009/07/my-love-hate-with-svn-part-6.html + http://wiki.eclipse.org/Equinox/p2/Ant_Tasks/Partial_Mirroring/Example + Added: trunk/download.jboss.org/jbosstools/requirements/helios/m2eclipse/bu= ild.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/download.jboss.org/jbosstools/requirements/helios/m2eclipse/build= .xml (rev 0) +++ trunk/download.jboss.org/jbosstools/requirements/helios/m2eclipse/build= .xml 2010-05-25 21:06:40 UTC (rev 22311) @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: trunk/download.jboss.org/jbosstools/requirements/helios/svn/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/download.jboss.org/jbosstools/requirements/helios/svn/build.xml = (rev 0) +++ trunk/download.jboss.org/jbosstools/requirements/helios/svn/build.xml 2= 010-05-25 21:06:40 UTC (rev 22311) @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + Fetch SVN features and plugins from repos + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Filter SVN features and plugins from complete mirror to extract = subset + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Generating site.xml for use with p2 repo / update site categories.= .. + <?xml version=3D"1.0" enc= oding=3D"UTF-8"?> + + + + <site p= ack200=3D"true"> + + + <site&g= t; + + + + + + <descrip= tion>To install these features, point Eclipse at this site.</descript= ion> + + <!-- ${category.name} --> + <category-def label=3D"${category.name}" name=3D"${category.name}"> + <description>${category.name}: contains all features in this buil= d.</description> + </category-def> + + + + + + + + + + + + + + <featu= re id=3D"${feature.id}" version=3D"${feature.version}" url=3D"features/${fe= ature.jarfile}" patch=3D"false"> + <category name=3D"${category.name}"/> + </feature> + + + + + + + + </site> + + + + + + + + + + + + + + + + + + + + + + + + + --===============5765257043757807792==-- From jbosstools-commits at lists.jboss.org Tue May 25 17:19:09 2010 Content-Type: multipart/mixed; boundary="===============8790412220822636497==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22312 - in trunk/ws/plugins/org.jboss.tools.ws.ui: src/org/jboss/tools/ws/ui/messages and 2 other directories. Date: Tue, 25 May 2010 17:19:09 -0400 Message-ID: <201005252119.o4PLJ9dQ032569@svn01.web.mwc.hst.phx2.redhat.com> --===============8790412220822636497== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-25 17:19:09 -0400 (Tue, 25 May 2010) New Revision: 22312 Modified: 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/message= s/JBossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/J= AXWSTester.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/J= AXRSWSTestView.java Log: JBIDE-6328 - updating some error handling Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-05-25 = 21:06:40 UTC (rev 22311) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-05-25 = 21:19:09 UTC (rev 22312) @@ -32,7 +32,9 @@ Export-Package: org.jboss.tools.ws.ui, org.jboss.tools.ws.ui.messages, org.jboss.tools.ws.ui.preferences, - org.jboss.tools.ws.ui.utils + org.jboss.tools.ws.ui.utils, + org.jboss.tools.ws.ui.views, + org.jboss.tools.ws.ui.wizards Bundle-Vendor: %PLUGIN_PROVIDER Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.eclipse.jst.javaee.web, Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= messages/JBossWSUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUIMessages.java 2010-05-25 21:06:40 UTC (rev 22311) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUIMessages.java 2010-05-25 21:19:09 UTC (rev 22312) @@ -107,6 +107,8 @@ public static String JAXRSWSTestView_Action_URL_Label; public static String JAXRSWSTestView_Configure_Monitor_Button; public static String JAXRSWSTestView_CopyResultsMenu; + public static String JAXRSWSTestView_Error_Msg_Starting_Monitor; + public static String JAXRSWSTestView_Error_Title_Starting_Monitor; public static String JAXRSWSTestView_Exception_Status; public static String JAXRSWSTestView_HTTP_Method_Label; public static String JAXRSWSTestView_Invoke_Label; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= utils/JAXWSTester.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXWSTester.java 2010-05-25 21:06:40 UTC (rev 22311) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/= JAXWSTester.java 2010-05-25 21:19:09 UTC (rev 22312) @@ -16,6 +16,7 @@ = import javax.xml.soap.MimeHeader; import javax.xml.soap.MimeHeaders; +import javax.xml.soap.SOAPMessage; = import org.apache.axis.AxisFault; import org.apache.axis.Message; @@ -23,6 +24,7 @@ import org.apache.axis.client.Call; import org.apache.axis.client.Service; import org.apache.axis.message.SOAPEnvelope; +import org.apache.axis.transport.http.HTTPConstants; = /** * Tester class for JAX-WS services @@ -112,13 +114,23 @@ // Get back the response HTTP headers and pass back as a Map if (call !=3D null && call.getMessageContext() !=3D null) { MessageContext mc =3D call.getMessageContext(); - if (mc.getMessage() !=3D null && mc.getMessage().getMimeHeaders() !=3D= null) { - MimeHeaders mh =3D mc.getMessage().getMimeHeaders(); - Iterator iter =3D mh.getAllHeaders(); + if (mc !=3D null){ + String statusCode =3D mc.getProperty(HTTPConstants.MC_HTTP_STATUS_COD= E).toString(); + String statusMessage =3D mc.getProperty(HTTPConstants.MC_HTTP_STATUS_= MESSAGE).toString(); + String protocol =3D mc.getTransportName(); resultHeaders =3D new HashMap(); - while (iter.hasNext()) { - MimeHeader next =3D (MimeHeader)iter.next(); - resultHeaders.put(next.getName(), next.getValue()); + resultHeaders.put(null, protocol + " " + statusCode + " " + statusMes= sage); //$NON-NLS-1$//$NON-NLS-2$ +// System.out.println(protocol + " " + statusCode + " " + statusMessag= e); + SOAPMessage sm =3D mc.getResponseMessage(); + if (sm !=3D null){ + MimeHeaders mh =3D sm.getMimeHeaders(); + if (mh !=3D null){ + Iterator iter =3D mh.getAllHeaders(); + while (iter.hasNext()) { + MimeHeader next =3D (MimeHeader)iter.next(); + resultHeaders.put(next.getName(), next.getValue()); + } + } } } } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= views/JAXRSWSTestView.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-25 21:06:40 UTC (rev 22311) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/= JAXRSWSTestView.java 2010-05-25 21:19:09 UTC (rev 22312) @@ -28,6 +28,7 @@ import org.eclipse.core.runtime.jobs.IJobChangeEvent; import org.eclipse.core.runtime.jobs.IJobChangeListener; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.dialogs.ErrorDialog; import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; @@ -122,6 +123,8 @@ private MenuItem openResponseTagInXMLEditor; private Menu resultsTextMenu; private MenuItem copyMenuAction; + = + private boolean showSampleButton =3D true; = /** * The constructor. @@ -291,7 +294,7 @@ = Button sampleButton =3D new Button(buttonBar, SWT.PUSH); sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_L= abel); - sampleButton.setVisible(false); + sampleButton.setVisible(showSampleButton); = sampleButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { @@ -401,11 +404,6 @@ = public void focusGained(FocusEvent arg0) { setMenusForCurrentState(); -// if (resultsText.getText().trim().length() > 0){ -// resultsTextMenu.setVisible(true); -// } else { -// resultsTextMenu.setVisible(false); -// } } }); = @@ -524,23 +522,26 @@ if (!monitor.isRunning()) { try { monitor.start(); + int port =3D monitor.getLocalPort(); + int remotePort =3D monitor.getRemotePort(); + String host =3D monitor.getRemoteHost(); + String newUrl =3D null; + if (oldUrl.contains(host + ":" + remotePort)) { //$NON-NLS-1$ + newUrl =3D oldUrl.replace(host + ":" + remotePort, "localhost:" + = port); //$NON-NLS-1$ //$NON-NLS-2$ + } else { + newUrl =3D oldUrl.replace(host, "localhost:" + port); //$NON-NLS-1$ + } + urlCombo.setText(newUrl); } catch (CoreException e) { - // if we hit an error, put it in the results text - resultsText.setText(e.toString()); - e.printStackTrace(); + // if we hit an error, open a dialog + ErrorDialog dialog =3D new ErrorDialog(this.getSite().getShell(), = + JBossWSUIMessages.JAXRSWSTestView_Error_Title_Starting_Monitor, + JBossWSUIMessages.JAXRSWSTestView_Error_Msg_Starting_Monitor, + new Status(IStatus.ERROR, JBossWSUIPlugin.PLUGIN_ID, = + e.getLocalizedMessage(), e), IStatus.ERROR); + dialog.open(); } } - - int port =3D monitor.getLocalPort(); - int remotePort =3D monitor.getRemotePort(); - String host =3D monitor.getRemoteHost(); - String newUrl =3D null; - if (oldUrl.contains(host + ":" + remotePort)) { //$NON-NLS-1$ - newUrl =3D oldUrl.replace(host + ":" + remotePort, "localhost:" + po= rt); //$NON-NLS-1$ //$NON-NLS-2$ - } else { - newUrl =3D oldUrl.replace(host, "localhost:" + port); //$NON-NLS-1$ - } - urlCombo.setText(newUrl); } } } = --===============8790412220822636497==-- From jbosstools-commits at lists.jboss.org Tue May 25 17:20:28 2010 Content-Type: multipart/mixed; boundary="===============1031012418679225610==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22313 - trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages. Date: Tue, 25 May 2010 17:20:28 -0400 Message-ID: <201005252120.o4PLKSIb000521@svn01.web.mwc.hst.phx2.redhat.com> --===============1031012418679225610== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bfitzpat Date: 2010-05-25 17:20:28 -0400 (Tue, 25 May 2010) New Revision: 22313 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/message= s/JBossWSUI.properties Log: JBIDE-6328 - updating some error handling Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/= messages/JBossWSUI.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUI.properties 2010-05-25 21:19:09 UTC (rev 22312) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messag= es/JBossWSUI.properties 2010-05-25 21:20:28 UTC (rev 22313) @@ -84,6 +84,8 @@ JAXRSWSTestView_Action_URL_Label=3DAction URL: JAXRSWSTestView_Configure_Monitor_Button=3DConfigure Monitor JAXRSWSTestView_CopyResultsMenu=3D&Copy +JAXRSWSTestView_Error_Msg_Starting_Monitor=3DEncountered an error starting= the new TCP/IP monitor. Open the TCP/IP Monitor view and edit the monitor = definition to correct the error. +JAXRSWSTestView_Error_Title_Starting_Monitor=3DError Starting Monitor JAXRSWSTestView_Exception_Status=3DException\: = JAXRSWSTestView_HTTP_Method_Label=3DHTTP Method: JAXRSWSTestView_Invoke_Label=3DInvoke --===============1031012418679225610==-- From jbosstools-commits at lists.jboss.org Tue May 25 17:22:10 2010 Content-Type: multipart/mixed; boundary="===============4862002597678325817==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22314 - in trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core: libprov and 1 other directory. Date: Tue, 25 May 2010 17:22:10 -0400 Message-ID: <201005252122.o4PLMARN000570@svn01.web.mwc.hst.phx2.redhat.com> --===============4862002597678325817== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-25 17:22:09 -0400 (Tue, 25 May 2010) New Revision: 22314 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/p= ortlet/core/internal/project/facet/PortletPostInstallListener.java trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/p= ortlet/core/libprov/RuntimeLibraryProviderPropertyTester.java Log: https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds rich= faces fragments to web.xml Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/= tools/portlet/core/internal/project/facet/PortletPostInstallListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/= portlet/core/internal/project/facet/PortletPostInstallListener.java 2010-05= -25 21:20:28 UTC (rev 22313) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/= portlet/core/internal/project/facet/PortletPostInstallListener.java 2010-05= -25 21:22:09 UTC (rev 22314) @@ -414,7 +414,9 @@ IContainer folder =3D rootFolder.getUnderlyingFolder(); IContainer webinf =3D folder.getFolder(new Path( IPortletConstants.WEB_INF_LIB)); - deleteOldRichfacesLibs(earProject, webinf); + if (!addRichfacesFromRichfacesRuntime) { + deleteOldRichfacesLibs(earProject, webinf); + } IPath destPath =3D folder.getFullPath(); = ImportOperation op =3D new ImportOperation( destPath, Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/= tools/portlet/core/libprov/RuntimeLibraryProviderPropertyTester.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/= portlet/core/libprov/RuntimeLibraryProviderPropertyTester.java 2010-05-25 2= 1:20:28 UTC (rev 22313) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/= portlet/core/libprov/RuntimeLibraryProviderPropertyTester.java 2010-05-25 2= 1:22:09 UTC (rev 22314) @@ -26,6 +26,12 @@ } IRuntime runtime =3D FacetUtil.getRuntime(primaryRuntime); if (runtime !=3D null) { + if ("isJSFPortletRuntime".equals(property)) { //$NON-NLS-1$ + String id =3D runtime.getRuntimeType().getId(); + if (! "org.jboss.ide.eclipse.as.runtime.eap.43".equals(id) && ! "org.= jboss.ide.eclipse.as.runtime.42".equals(id)) { //$NON-NLS-1$//$NON-NLS-2$ + return false; + } + } File location =3D runtime.getLocation().toFile(); return PortletRuntimeComponentProvider.isPortalPresent(location, runti= me, property); } --===============4862002597678325817==-- From jbosstools-commits at lists.jboss.org Tue May 25 17:27:46 2010 Content-Type: multipart/mixed; boundary="===============4706007454412223481==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22315 - in branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core: libprov and 1 other directory. Date: Tue, 25 May 2010 17:27:46 -0400 Message-ID: <201005252127.o4PLRkRG001061@svn01.web.mwc.hst.phx2.redhat.com> --===============4706007454412223481== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-25 17:27:46 -0400 (Tue, 25 May 2010) New Revision: 22315 Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/s= rc/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallLi= stener.java branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/s= rc/org/jboss/tools/portlet/core/libprov/RuntimeLibraryProviderPropertyTeste= r.java Log: https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds rich= faces fragments to web.xml Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .core/src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostIn= stallListener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallL= istener.java 2010-05-25 21:22:09 UTC (rev 22314) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallL= istener.java 2010-05-25 21:27:46 UTC (rev 22315) @@ -414,7 +414,9 @@ IContainer folder =3D rootFolder.getUnderlyingFolder(); IContainer webinf =3D folder.getFolder(new Path( IPortletConstants.WEB_INF_LIB)); - deleteOldRichfacesLibs(earProject, webinf); + if (!addRichfacesFromRichfacesRuntime) { + deleteOldRichfacesLibs(earProject, webinf); + } IPath destPath =3D folder.getFullPath(); = ImportOperation op =3D new ImportOperation( destPath, Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .core/src/org/jboss/tools/portlet/core/libprov/RuntimeLibraryProviderProper= tyTester.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/libprov/RuntimeLibraryProviderPropertyTest= er.java 2010-05-25 21:22:09 UTC (rev 22314) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/libprov/RuntimeLibraryProviderPropertyTest= er.java 2010-05-25 21:27:46 UTC (rev 22315) @@ -26,6 +26,12 @@ } IRuntime runtime =3D FacetUtil.getRuntime(primaryRuntime); if (runtime !=3D null) { + if ("isJSFPortletRuntime".equals(property)) { //$NON-NLS-1$ + String id =3D runtime.getRuntimeType().getId(); + if (! "org.jboss.ide.eclipse.as.runtime.eap.43".equals(id) && ! "org.= jboss.ide.eclipse.as.runtime.42".equals(id)) { //$NON-NLS-1$//$NON-NLS-2$ + return false; + } + } File location =3D runtime.getLocation().toFile(); return PortletRuntimeComponentProvider.isPortalPresent(location, runti= me, property); } --===============4706007454412223481==-- From jbosstools-commits at lists.jboss.org Tue May 25 17:30:24 2010 Content-Type: multipart/mixed; boundary="===============7005958344312545211==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22316 - in branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core: libprov and 1 other directory. Date: Tue, 25 May 2010 17:30:24 -0400 Message-ID: <201005252130.o4PLUOq5001516@svn01.web.mwc.hst.phx2.redhat.com> --===============7005958344312545211== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-25 17:30:24 -0400 (Tue, 25 May 2010) New Revision: 22316 Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org= /jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListener= .java branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org= /jboss/tools/portlet/core/libprov/RuntimeLibraryProviderPropertyTester.java Log: https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds rich= faces fragments to web.xml Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallL= istener.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/or= g/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListene= r.java 2010-05-25 21:27:46 UTC (rev 22315) +++ branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/or= g/jboss/tools/portlet/core/internal/project/facet/PortletPostInstallListene= r.java 2010-05-25 21:30:24 UTC (rev 22316) @@ -414,7 +414,9 @@ IContainer folder =3D rootFolder.getUnderlyingFolder(); IContainer webinf =3D folder.getFolder(new Path( IPortletConstants.WEB_INF_LIB)); - deleteOldRichfacesLibs(earProject, webinf); + if (!addRichfacesFromRichfacesRuntime) { + deleteOldRichfacesLibs(earProject, webinf); + } IPath destPath =3D folder.getFullPath(); = ImportOperation op =3D new ImportOperation( destPath, Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/libprov/RuntimeLibraryProviderPropertyTest= er.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/or= g/jboss/tools/portlet/core/libprov/RuntimeLibraryProviderPropertyTester.jav= a 2010-05-25 21:27:46 UTC (rev 22315) +++ branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/or= g/jboss/tools/portlet/core/libprov/RuntimeLibraryProviderPropertyTester.jav= a 2010-05-25 21:30:24 UTC (rev 22316) @@ -26,6 +26,12 @@ } IRuntime runtime =3D FacetUtil.getRuntime(primaryRuntime); if (runtime !=3D null) { + if ("isJSFPortletRuntime".equals(property)) { //$NON-NLS-1$ + String id =3D runtime.getRuntimeType().getId(); + if (! "org.jboss.ide.eclipse.as.runtime.eap.43".equals(id) && ! "org.= jboss.ide.eclipse.as.runtime.42".equals(id)) { //$NON-NLS-1$//$NON-NLS-2$ + return false; + } + } File location =3D runtime.getLocation().toFile(); return PortletRuntimeComponentProvider.isPortalPresent(location, runti= me, property); } --===============7005958344312545211==-- From jbosstools-commits at lists.jboss.org Tue May 25 18:03:10 2010 Content-Type: multipart/mixed; boundary="===============8131728936081828131==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22317 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/ca. Date: Tue, 25 May 2010 18:03:10 -0400 Message-ID: <201005252203.o4PM3AnN011222@svn01.web.mwc.hst.phx2.redhat.com> --===============8131728936081828131== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-25 18:03:10 -0400 (Tue, 25 May 2010) New Revision: 22317 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/= common/el/core/ca/AbstractELCompletionEngine.java Log: https://jira.jboss.org/browse/JBIDE-6352 Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss= /tools/common/el/core/ca/AbstractELCompletionEngine.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/ca/AbstractELCompletionEngine.java 2010-05-25 21:30:24 UTC = (rev 22316) +++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools= /common/el/core/ca/AbstractELCompletionEngine.java 2010-05-25 22:03:10 UTC = (rev 22317) @@ -561,7 +561,6 @@ left =3D (ELInvocationExpression)left.getParent(); if (left !=3D expr) { // inside expression segment =3D new JavaMemberELSegmentImpl(); - segment.setResolved(true); if(left instanceof ELArgumentInvocation) { String s =3D "#{" + left.getLeft().toString() + collectionAdditionFo= rCollectionDataModel + "}"; //$NON-NLS-1$ //$NON-NLS-2$ ELParser p =3D getParserFactory().createParser(); @@ -575,6 +574,7 @@ members =3D resolveSegment(left, members, resolution, returnEqualedV= ariablesOnly, varIsUsed, segment); } if(!members.isEmpty()) { + segment.setResolved(true); segment.setMemberInfo(members.get(0)); // TODO: This is a buggy way = to select a member to setup in a segment } resolution.addSegment(segment); --===============8131728936081828131==-- From jbosstools-commits at lists.jboss.org Tue May 25 23:47:40 2010 Content-Type: multipart/mixed; boundary="===============1870879978956706067==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22318 - trunk/download.jboss.org/jbosstools/requirements/helios. Date: Tue, 25 May 2010 23:47:40 -0400 Message-ID: <201005260347.o4Q3legY016498@svn01.web.mwc.hst.phx2.redhat.com> --===============1870879978956706067== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-25 23:47:40 -0400 (Tue, 25 May 2010) New Revision: 22318 Added: trunk/download.jboss.org/jbosstools/requirements/helios/index.html Log: index file Added: trunk/download.jboss.org/jbosstools/requirements/helios/index.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/download.jboss.org/jbosstools/requirements/helios/index.html = (rev 0) +++ trunk/download.jboss.org/jbosstools/requirements/helios/index.html 2010= -05-26 03:47:40 UTC (rev 22318) @@ -0,0 +1,93 @@ + + +JBoss Tools Build Requirements - Helios (Eclipse 3.6 / Web Tools 3.= 2) + + + + + + + + + + + + + + +
  
   +

JBoss Tools Build Requirements - Helios (Eclipse 3.6= / Web Tools 3.2)

+ + + + + + + + + + + +
+ + + +
+ +
+
+

Looking to download JBoss Tools? See JBoss Tools + Downloads. See also Installation + methods.

+
+
+ --===============1870879978956706067==-- From jbosstools-commits at lists.jboss.org Tue May 25 23:49:43 2010 Content-Type: multipart/mixed; boundary="===============5533887303291794445==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22319 - trunk/download.jboss.org/jbosstools/requirements/helios. Date: Tue, 25 May 2010 23:49:43 -0400 Message-ID: <201005260349.o4Q3nh0d016516@svn01.web.mwc.hst.phx2.redhat.com> --===============5533887303291794445== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-25 23:49:43 -0400 (Tue, 25 May 2010) New Revision: 22319 Modified: trunk/download.jboss.org/jbosstools/requirements/helios/index.html Log: index file Modified: trunk/download.jboss.org/jbosstools/requirements/helios/index.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/download.jboss.org/jbosstools/requirements/helios/index.html 2010= -05-26 03:47:40 UTC (rev 22318) +++ trunk/download.jboss.org/jbosstools/requirements/helios/index.html 2010= -05-26 03:49:43 UTC (rev 22319) @@ -46,10 +46,8 @@ -->
    -
  • GEF-runtime-3.6.0RC2.z= ip
    • -
  • GEF-zest-3.6.0RC2.zip=
  • README.txt
    • -
  • Subvsve079.I201005= 121900_SVNconn222.I201005121900_SVNKit133.6648_JNA323_ECF310.v201005082345-= Update.zip
    • +
  • birt-report-fr= amework-2.6RC1.zip
  • birt-wtp-in= tegration-sdk-2.6RC1.zip
  • dtp-1.8.0RC2-2010= 05210500.zip
    • @@ -60,7 +58,9 @@
  • eclipse-SDK-3.6RC2= -win32.zip
  • eclipse-test-= framework-3.6RC2.zip
  • emf-runtime-2.6.0RC2.z= ip
    • -
  • m2eclipse
    • +
  • GEF-runtime-3.6.0RC2.z= ip
    • +
  • GEF-zest-3.6.0RC2.zip=
    • +
  • m2eclipse/build.xml
  • m2eclipse-0.= 10.0.20100209-0800.zip
  • org.eclipse.equinox.transforms.hook_1.0.200.v20100503.jar
  • org.eclipse.equinox.transforms.xslt_1.0.200.v20100503.jar @@ -68,7 +68,8 @@
  • org.eclipse.swtbot.eclipse-2.0.0.568-dev-e36.zip
  • org.eclipse.swtbot.eclipse.gef-2.0.0.568-dev-e36.zip
  • org.eclipse.swtbot.eclipse.test.junit4-2.0.0.568-dev-e36.zip<= /a>
    • -
  • svn
    • +
  • svn/build.xml
    • +
  • Subvsve079.I201005= 121900_SVNconn222.I201005121900_SVNKit133.6648_JNA323_ECF310.v201005082345-= Update.zip
  • tptp.runtime-TPT= P-4.7.0RC1.zip
  • wtp-S-3.2.0RC= 2-20100520232028.zip
  • xsd-runtime-2.6.0RC2.z= ip
    • --===============5533887303291794445==-- From jbosstools-commits at lists.jboss.org Wed May 26 01:53:51 2010 Content-Type: multipart/mixed; boundary="===============2726112356739636785==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22320 - trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test. Date: Wed, 26 May 2010 01:53:51 -0400 Message-ID: <201005260553.o4Q5rpRr010933@svn01.web.mwc.hst.phx2.redhat.com> --===============2726112356739636785== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2010-05-26 01:53:51 -0400 (Wed, 26 May 2010) New Revision: 22320 Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/t= est/JsfUiAllTests.java Log: https://jira.jboss.org/browse/JBIDE-6257 , JUnits for disabled Wizards were= commented. Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/j= sf/ui/test/JsfUiAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/= test/JsfUiAllTests.java 2010-05-26 03:49:43 UTC (rev 22319) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/= test/JsfUiAllTests.java 2010-05-26 05:53:51 UTC (rev 22320) @@ -21,13 +21,13 @@ public static Test suite() { TestSuite suite =3D new TestSuite("JSF UI tests"); //$NON-NLS-1$ suite.addTestSuite(CssClassNewWizardTest.class); - suite.addTestSuite(CssFileNewWizardTest.class); +// suite.addTestSuite(CssFileNewWizardTest.class); suite.addTestSuite(CSSStyleDialogTest.class); suite.addTestSuite(FacesConfigNewWizardTest.class); suite.addTestSuite(FasesConfigEditorTest.class); - suite.addTestSuite(HtmlFileNewWizardTest.class); - suite.addTestSuite(JsFileNewWizardTest.class); - suite.addTestSuite(JspFileNewWizardTest.class); +// suite.addTestSuite(HtmlFileNewWizardTest.class); +// suite.addTestSuite(JsFileNewWizardTest.class); +// suite.addTestSuite(JspFileNewWizardTest.class); suite.addTestSuite(PropertiesNewWizardTest.class); suite.addTestSuite(JsfUiPreferencesPagesTest.class); suite.addTest(new ProjectImportTestSetup(new TestSuite( --===============2726112356739636785==-- From jbosstools-commits at lists.jboss.org Wed May 26 04:18:34 2010 Content-Type: multipart/mixed; boundary="===============1909510722083492877==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22321 - in trunk/seam/tests/org.jboss.tools.seam.core.test: src/org/jboss/tools/seam/core/test and 1 other directory. Date: Wed, 26 May 2010 04:18:34 -0400 Message-ID: <201005260818.o4Q8IYO3014152@svn01.web.mwc.hst.phx2.redhat.com> --===============1909510722083492877== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-26 04:18:33 -0400 (Wed, 26 May 2010) New Revision: 22321 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestP= roject/WebContent/markerTest.xhtml Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam= /core/test/SeamValidatorsTest.java Log: https://jira.jboss.org/browse/JBIDE-6352 Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarT= estProject/WebContent/markerTest.xhtml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTest= Project/WebContent/markerTest.xhtml (rev 0) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTest= Project/WebContent/markerTest.xhtml 2010-05-26 08:18:33 UTC (rev 22321) @@ -0,0 +1,12 @@ + + + + + #{testComponentForVars.testtt.items} + + + \ No newline at end of file Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projec= ts/SeamWebWarTestProject/WebContent/markerTest.xhtml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/too= ls/seam/core/test/SeamValidatorsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/SeamValidatorsTest.java 2010-05-26 05:53:51 UTC (rev 22320) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/SeamValidatorsTest.java 2010-05-26 08:18:33 UTC (rev 22321) @@ -775,6 +775,16 @@ JSFModelPlugin.getDefault().getPreferenceStore().setValue(JSFSeverityPre= ferences.UNKNOWN_EL_VARIABLE_NAME, SeamPreferences.IGNORE); } = + // See https://jira.jboss.org/browse/JBIDE-6352 + public void testErrorMarkerForEL() throws CoreException{ + refreshProject(project); + + IFile xhtmlFile =3D project.getFile("WebContent/markerTest.xhtml"); + + IMarker[] markers =3D findMarkers(xhtmlFile, IMarker.PROBLEM, "\"testtt\= " cannot be resolved"); + assertEquals("There should be an unresolved EL in markerTest.xhtml for '= testtt' segment.", 1, markers.length); + } + public static int getMarkersNumber(IResource resource) { return getMarkersNumberByGroupName(resource, SeamValidationErrorManager.= MARKED_SEAM_PROJECT_MESSAGE_GROUP); } --===============1909510722083492877==-- From jbosstools-commits at lists.jboss.org Wed May 26 05:49:08 2010 Content-Type: multipart/mixed; boundary="===============7047460208155487794==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22322 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF and 1 other directory. Date: Wed, 26 May 2010 05:49:08 -0400 Message-ID: <201005260949.o4Q9n80s030983@svn01.web.mwc.hst.phx2.redhat.com> --===============7047460208155487794== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgeraskov Date: 2010-05-26 05:49:07 -0400 (Wed, 26 May 2010) New Revision: 22322 Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt= .core/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/M= ANIFEST.MF Log: Restrict required jpt libraries version. Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibern= ate.jpt.core/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.core/META-INF/MANIFEST.MF 2010-05-26 08:18:33 UTC (rev 22321) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.core/META-INF/MANIFEST.MF 2010-05-26 09:49:07 UTC (rev 22322) @@ -14,9 +14,9 @@ org.eclipse.jdt.core, org.eclipse.wst.common.project.facet.core, org.eclipse.jst.common.project.facet.core, - org.eclipse.jpt.core, org.eclipse.jpt.utility, - org.eclipse.jpt.db + org.eclipse.jpt.db, + org.eclipse.jpt.core;bundle-version=3D"[2.3.0,2.3.1)" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.hibernate.jpt.core.internal, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/MET= A-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/= MANIFEST.MF 2010-05-26 08:18:33 UTC (rev 22321) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/= MANIFEST.MF 2010-05-26 09:49:07 UTC (rev 22322) @@ -16,8 +16,8 @@ org.eclipse.ui.forms, org.jboss.tools.hibernate.jpt.core, org.eclipse.ui.ide, - org.eclipse.jpt.core, - org.eclipse.jpt.ui, + org.eclipse.jpt.core;bundle-version=3D"[2.3.0,2.3.1)", + org.eclipse.jpt.ui;bundle-version=3D"[2.3.0,2.3.1)", org.eclipse.jpt.utility, org.eclipse.jpt.db;bundle-version=3D"1.2.100", org.eclipse.ui.views.properties.tabbed;bundle-version=3D"3.5.0" --===============7047460208155487794==-- From jbosstools-commits at lists.jboss.org Wed May 26 06:37:29 2010 Content-Type: multipart/mixed; boundary="===============3004606556350191924==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22323 - trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context. Date: Wed, 26 May 2010 06:37:29 -0400 Message-ID: <201005261037.o4QAbTmt010036@svn01.web.mwc.hst.phx2.redhat.com> --===============3004606556350191924== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-26 06:37:28 -0400 (Wed, 26 May 2010) New Revision: 22323 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/co= ntext/RegisterServerContext.java Log: https://jira.jboss.org/browse/JBIDE-6346 Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst= /web/context/RegisterServerContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/c= ontext/RegisterServerContext.java 2010-05-26 09:49:07 UTC (rev 22322) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/c= ontext/RegisterServerContext.java 2010-05-26 10:37:28 UTC (rev 22323) @@ -52,6 +52,8 @@ = long xmlTimeStamp =3D -1; String xmlError =3D null; + + String serverErrorCache =3D null; = private static final String YES_STRING =3D "yes"; //$NON-NLS-1$ private static final String EMPTY_LOCATION =3D ""; //$NON-NLS-1$ @@ -63,6 +65,9 @@ } = public void setServletVersion(String v) { + if(v !=3D null && !v.equals(servletVersion)) { + serverErrorCache =3D null; + } servletVersion =3D v; } = @@ -97,6 +102,7 @@ } } runtime =3D null; + serverErrorCache =3D null; } = public String getRuntimeName() { @@ -104,8 +110,17 @@ } = public void setTargetServers(IServer[] info) { + if(!targetServersEqual(targetServers, info)) { + serverErrorCache =3D null; + } targetServers =3D info; } + + boolean targetServersEqual(IServer[] s1, IServer[] s2) { + if(s1.length !=3D s2.length) return false; + for (int i =3D 0; i < s1.length; i++) if(s1[i] !=3D s2[i]) return false; + return true; + } = public IServer[] getTargetServers() { return targetServers; @@ -158,23 +173,37 @@ if(true) { String contextRootError =3D RegistrationHelper.checkContextRoot(applica= tionName); if(contextRootError !=3D null) return contextRootError; - for (int i =3D 0; i < targetServers.length; i++) { - if(RegistrationHelper.isRegistered(applicationName, targetServers[i]))= { - return NLS.bind(WebUIMessages.APPLICATION_IS_ALREADY_REGISTERED, appl= icationName, targetServers[i].getName()); - } - if(this.project !=3D null /*&& !this.project.exists()*/ && servletVers= ion !=3D null && servletVersion.length() > 0) { - if(project.exists() && RegistrationHelper.isRegistered(project)) { - return MessageFormat - .format(WebUIMessages.PROJECT_IS_ALREADY_REGISTERED, - project.getName()); + if(targetServers.length > 0) { + IModule module =3D RegistrationHelper.findModule(project); + boolean isFakeModule =3D false; + if(module =3D=3D null) { + if(serverErrorCache !=3D null) { + return serverErrorCache; } ModuleFactory f =3D ServerPlugin.findModuleFactory("org.eclipse.jst.j= 2ee.server"); //$NON-NLS-1$ - IModule module =3D RegistrationHelper.findModule(project); - if(module =3D=3D null) { - module =3D (f =3D=3D null) ? null : new Module(f, project.getName(),= project.getName(), "jst.web", servletVersion, null); //$NON-NLS-1$ + module =3D (f =3D=3D null) ? null : new Module(f, project.getName(), = project.getName(), "jst.web", servletVersion, null); //$NON-NLS-1$ + isFakeModule =3D true; + } else { + serverErrorCache =3D null; + } + for (int i =3D 0; i < targetServers.length; i++) { + if(RegistrationHelper.isRegistered(applicationName, targetServers[i])= ) { + return NLS.bind(WebUIMessages.APPLICATION_IS_ALREADY_REGISTERED, app= licationName, targetServers[i].getName()); } - String m =3D (module =3D=3D null) ? null : RegistrationHelper.getRegi= strationError(module, applicationName, targetServers[i]); - if(m !=3D null) return m; + if(this.project !=3D null /*&& !this.project.exists()*/ && servletVer= sion !=3D null && servletVersion.length() > 0) { + if(project.exists() && RegistrationHelper.isRegistered(project)) { + return MessageFormat + .format(WebUIMessages.PROJECT_IS_ALREADY_REGISTERED, + project.getName()); + } + String m =3D (module =3D=3D null) ? null : RegistrationHelper.getReg= istrationError(module, applicationName, targetServers[i]); + if(m !=3D null) { + if(isFakeModule) { + serverErrorCache =3D m; + } + return m; + } + } } } if(servletVersion !=3D null && servletVersion.length() =3D=3D 0) { --===============3004606556350191924==-- From jbosstools-commits at lists.jboss.org Wed May 26 06:40:19 2010 Content-Type: multipart/mixed; boundary="===============3248794950240349770==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22324 - branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/context. Date: Wed, 26 May 2010 06:40:19 -0400 Message-ID: <201005261040.o4QAeJUv010433@svn01.web.mwc.hst.phx2.redhat.com> --===============3248794950240349770== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-26 06:40:18 -0400 (Wed, 26 May 2010) New Revision: 22324 Modified: branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/to= ols/jst/web/context/RegisterServerContext.java Log: https://jira.jboss.org/browse/JBIDE-6346 Modified: branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web/src/org/j= boss/tools/jst/web/context/RegisterServerContext.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/t= ools/jst/web/context/RegisterServerContext.java 2010-05-26 10:37:28 UTC (re= v 22323) +++ branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/t= ools/jst/web/context/RegisterServerContext.java 2010-05-26 10:40:18 UTC (re= v 22324) @@ -52,6 +52,8 @@ = long xmlTimeStamp =3D -1; String xmlError =3D null; + + String serverErrorCache =3D null; = private static final String YES_STRING =3D "yes"; //$NON-NLS-1$ private static final String EMPTY_LOCATION =3D ""; //$NON-NLS-1$ @@ -63,6 +65,9 @@ } = public void setServletVersion(String v) { + if(v !=3D null && !v.equals(servletVersion)) { + serverErrorCache =3D null; + } servletVersion =3D v; } = @@ -97,6 +102,7 @@ } } runtime =3D null; + serverErrorCache =3D null; } = public String getRuntimeName() { @@ -104,8 +110,17 @@ } = public void setTargetServers(IServer[] info) { + if(!targetServersEqual(targetServers, info)) { + serverErrorCache =3D null; + } targetServers =3D info; } + + boolean targetServersEqual(IServer[] s1, IServer[] s2) { + if(s1.length !=3D s2.length) return false; + for (int i =3D 0; i < s1.length; i++) if(s1[i] !=3D s2[i]) return false; + return true; + } = public IServer[] getTargetServers() { return targetServers; @@ -158,23 +173,37 @@ if(true) { String contextRootError =3D RegistrationHelper.checkContextRoot(applica= tionName); if(contextRootError !=3D null) return contextRootError; - for (int i =3D 0; i < targetServers.length; i++) { - if(RegistrationHelper.isRegistered(applicationName, targetServers[i]))= { - return NLS.bind(WebUIMessages.APPLICATION_IS_ALREADY_REGISTERED, appl= icationName, targetServers[i].getName()); - } - if(this.project !=3D null /*&& !this.project.exists()*/ && servletVers= ion !=3D null && servletVersion.length() > 0) { - if(project.exists() && RegistrationHelper.isRegistered(project)) { - return MessageFormat - .format(WebUIMessages.PROJECT_IS_ALREADY_REGISTERED, - project.getName()); + if(targetServers.length > 0) { + IModule module =3D RegistrationHelper.findModule(project); + boolean isFakeModule =3D false; + if(module =3D=3D null) { + if(serverErrorCache !=3D null) { + return serverErrorCache; } ModuleFactory f =3D ServerPlugin.findModuleFactory("org.eclipse.jst.j= 2ee.server"); //$NON-NLS-1$ - IModule module =3D RegistrationHelper.findModule(project); - if(module =3D=3D null) { - module =3D (f =3D=3D null) ? null : new Module(f, project.getName(),= project.getName(), "jst.web", servletVersion, null); //$NON-NLS-1$ + module =3D (f =3D=3D null) ? null : new Module(f, project.getName(), = project.getName(), "jst.web", servletVersion, null); //$NON-NLS-1$ + isFakeModule =3D true; + } else { + serverErrorCache =3D null; + } + for (int i =3D 0; i < targetServers.length; i++) { + if(RegistrationHelper.isRegistered(applicationName, targetServers[i])= ) { + return NLS.bind(WebUIMessages.APPLICATION_IS_ALREADY_REGISTERED, app= licationName, targetServers[i].getName()); } - String m =3D (module =3D=3D null) ? null : RegistrationHelper.getRegi= strationError(module, applicationName, targetServers[i]); - if(m !=3D null) return m; + if(this.project !=3D null /*&& !this.project.exists()*/ && servletVer= sion !=3D null && servletVersion.length() > 0) { + if(project.exists() && RegistrationHelper.isRegistered(project)) { + return MessageFormat + .format(WebUIMessages.PROJECT_IS_ALREADY_REGISTERED, + project.getName()); + } + String m =3D (module =3D=3D null) ? null : RegistrationHelper.getReg= istrationError(module, applicationName, targetServers[i]); + if(m !=3D null) { + if(isFakeModule) { + serverErrorCache =3D m; + } + return m; + } + } } } if(servletVersion !=3D null && servletVersion.length() =3D=3D 0) { --===============3248794950240349770==-- From jbosstools-commits at lists.jboss.org Wed May 26 06:57:01 2010 Content-Type: multipart/mixed; boundary="===============1439165369015107981==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22325 - branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl. Date: Wed, 26 May 2010 06:57:01 -0400 Message-ID: <201005261057.o4QAv1fj012618@svn01.web.mwc.hst.phx2.redhat.com> --===============1439165369015107981== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Grid.Qian Date: 2010-05-26 06:57:00 -0400 (Wed, 26 May 2010) New Revision: 22325 Modified: branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/j= boss/tools/as/wst/server/ui/xpl/ServerContentProvider.java Log: JBIDE-6218:to helios branches = Modified: branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossu= i/org/jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/= jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2010-05-26 10:4= 0:18 UTC (rev 22324) +++ branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/= jboss/tools/as/wst/server/ui/xpl/ServerContentProvider.java 2010-05-26 10:5= 7:00 UTC (rev 22325) @@ -260,7 +260,7 @@ for (int i =3D 0; i < size; i++) { IServer server =3D servers[i]; if (server.getServerType() !=3D null && server.getServerState() =3D= =3D IServer.STATE_UNKNOWN) { - UpdateServerJob job2 =3D new UpdateServerJob(server); + UpdateServerJob job2 =3D new UpdateServerJob(new IServer[]{server}); job2.schedule(); } } --===============1439165369015107981==-- From jbosstools-commits at lists.jboss.org Wed May 26 09:13:43 2010 Content-Type: multipart/mixed; boundary="===============3771360735520667228==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22326 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal and 12 other directories. Date: Wed, 26 May 2010 09:13:43 -0400 Message-ID: <201005261313.o4QDDh8u014004@svn01.web.mwc.hst.phx2.redhat.com> --===============3771360735520667228== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgeraskov Date: 2010-05-26 09:13:34 -0400 (Wed, 26 May 2010) New Revision: 22326 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/ForeignKeyImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/GenericGeneratorHolder.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitPro= perties.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/HibernateProperties.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/HibernateQueryContainer.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/Index.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/IndexImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitProperties.j= ava trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyList= Listener.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateBasic.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateIdMapping.ja= va trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsCompos= ite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationComp= osite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsComp= osite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java Removed: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/HibernateGeneratorContainer= .java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/HibernateIdMapping.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/basic/HibernatePersistenceU= nitProperties.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/ForeignKeyImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaGenerator= Container.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaGenerator= ContainerImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTable= JoiningStrategy.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaManyToMan= yRelationshipReference.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaOneToMany= RelationshipReference.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryCont= ainer.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryCont= ainerImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/IndexImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/JavaIndex.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmXmlContextN= odeFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/persistence/ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenc= eXmlUiDefinition.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersistenc= eXmlUiFactory.java Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber= nate/eclipse/console/properties/HibernatePropertyPage.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionPro= vider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatform.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/HibernateEntity.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.ja= va trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/IndexHolder.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools.= java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/basic/BasicHibernatePropert= ies.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaBasicMapp= ingImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnImp= l.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaDiscrimin= atorColumnImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntity.ja= va trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityImp= l.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping= .java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMapping= Impl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColum= nImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColum= nJoiningStrategy.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTable= Impl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaManyToMan= yMapping.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaManyToOne= Mapping.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaOneToMany= Mapping.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaOneToOneM= apping.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaSecondary= TableImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaTableImpl= .java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedNativeQu= eryImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedQueryImp= l.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMappin= g.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl.= java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl.= java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.j= ava trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingIm= pl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnI= mpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumnJ= oiningStrategy.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinTableIm= pl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmManyToManyM= apping.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmManyToOneMa= pping.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmOneToManyMa= pping.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmOneToOneMap= ping.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmTableImpl.j= ava trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/resource/java/DiscriminatorFormulaA= nnotationImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/resource/java/ForeignKeyAnnotationI= mpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/resource/java/GeneratedAnnotationIm= pl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/resource/java/GenericGeneratorAnnot= ationImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateNamedQueryAn= notation.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedN= ativeQueriesAnnotation.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedN= ativeQueryAnnotation.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedQ= ueriesAnnotation.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamedQ= ueryAnnotation.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/resource/java/IndexAnnotationImpl.j= ava trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/resource/java/SourceGenericGenerato= rsAnnotation.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org/= jboss/tools/hibernate/jpt/core/internal/resource/java/SourceParameterAnnota= tion.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/M= ANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntityComposi= te.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaInheritanceCo= mposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/GeneratedComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateAbstractInheri= tanceComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateAddQueryDialog= .java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateBasicMappingCo= mposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateColumnComposit= e.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateDiscriminatorC= olumnComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateIdMappingCompo= site.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateNamedNativeQue= ryPropertyComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueriesComposi= te.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueryPropertyC= omposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateTableComposite= .java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMessa= ges.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/IndexHolderComposite.ja= va trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/ParametersComposite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCombo.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseObjectCombo.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCombo.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/orm/details/HibernateOrmEntityComposite= .java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/persistence/details/HibernateProperties= Composite.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUi.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jb= oss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUiFactory.= java Log: Revert Dali2.3 changes Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/or= g/hibernate/eclipse/console/properties/HibernatePropertyPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/properties/HibernatePropertyPage.java 2010-05-26 10:5= 7:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/properties/HibernatePropertyPage.java 2010-05-26 13:1= 3:34 UTC (rev 22326) @@ -43,7 +43,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jpt.core.JpaProject; -import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.internal.JpaModelManager; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -72,6 +72,7 @@ import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; = +(a)SuppressWarnings("restriction") public class HibernatePropertyPage extends PropertyPage { = Control[] settings; @@ -340,7 +341,7 @@ final IWorkspaceRunnable wr =3D new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - JptCorePlugin.rebuildJpaProject(getProject()); + JpaModelManager.instance().rebuildJpaProject(getProject()); getProject().build(IncrementalProjectBuilder.FULL_BUILD, monitor); } }; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefini= tionProvider.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionPr= ovider.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaAnnotationDefinitionPr= ovider.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -13,16 +13,16 @@ import java.util.List; = import org.eclipse.jpt.core.JpaAnnotationDefinitionProvider; -import org.eclipse.jpt.core.internal.AbstractJpaAnnotationDefintionProvide= r; +import org.eclipse.jpt.core.internal.platform.AbstractJpaAnnotationDefinti= onProvider; import org.eclipse.jpt.core.resource.java.AnnotationDefinition; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedNativeQueriesAnnotationDefinition; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedNativeQueryAnnotationDefinition; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedQueriesAnnotationDefinition; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedQueryAnnotationDefinition; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Discrimin= atorFormulaAnnotationImpl.DiscriminatorFormulaAnnotationDefinition; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.ForeignKe= yAnnotationImpl.ForeignKeyAnnotationDefinition; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Generated= AnnotationImpl.GeneratedAnnotationDefinition; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.GenericGe= neratorAnnotationImpl.GenericGeneratorAnnotationDefinition; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedNativeQueriesAnnotationDefinition; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedNativeQueryAnnotationDefinition; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedQueriesAnnotationDefinition; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedQueryAnnotationDefinition; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.IndexAnno= tationImpl.IndexAnnotationDefinition; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.SourceGen= ericGeneratorsAnnotation.GenericGeneratorsAnnotationDefinition; = @@ -50,7 +50,11 @@ } = @Override - protected void addTypeAnnotationDefinitionsTo(List = definitions) { + protected void addTypeMappingAnnotationDefinitionsTo(List definitions) { + } + + @Override + protected void addTypeSupportingAnnotationDefinitionsTo(List definitions) { definitions.add(GenericGeneratorAnnotationDefinition.instance()); definitions.add(GenericGeneratorsAnnotationDefinition.instance()); definitions.add(HibernateNamedQueryAnnotationDefinition.instance()); @@ -62,7 +66,11 @@ } = @Override - protected void addAttributeAnnotationDefinitionsTo(List definitions) { + protected void addAttributeMappingAnnotationDefinitionsTo(List definitions) { + } + = + @Override + protected void addAttributeSupportingAnnotationDefinitionsTo(List definitions) { definitions.add(GenericGeneratorAnnotationDefinition.instance()); definitions.add(GeneratedAnnotationDefinition.instance()); definitions.add(IndexAnnotationDefinition.instance()); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2010-05-2= 6 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaFactory.java 2010-05-2= 6 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2008-2010 Red Hat, Inc. + * Copyright (c) 2008-2009 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, @@ -10,14 +10,14 @@ ************************************************************************= ******/ package org.jboss.tools.hibernate.jpt.core.internal; = +import org.eclipse.core.runtime.CoreException; import org.eclipse.jpt.core.JpaProject; -import org.eclipse.jpt.core.context.java.JavaBaseColumn; +import org.eclipse.jpt.core.context.XmlContextNode; import org.eclipse.jpt.core.context.java.JavaBasicMapping; import org.eclipse.jpt.core.context.java.JavaColumn; import org.eclipse.jpt.core.context.java.JavaDiscriminatorColumn; import org.eclipse.jpt.core.context.java.JavaEmbeddable; import org.eclipse.jpt.core.context.java.JavaEntity; -import org.eclipse.jpt.core.context.java.JavaGeneratorContainer; import org.eclipse.jpt.core.context.java.JavaIdMapping; import org.eclipse.jpt.core.context.java.JavaJoinColumn; import org.eclipse.jpt.core.context.java.JavaJoinTable; @@ -29,29 +29,48 @@ import org.eclipse.jpt.core.context.java.JavaOneToOneMapping; import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.context.java.JavaPersistentType; -import org.eclipse.jpt.core.context.java.JavaQueryContainer; import org.eclipse.jpt.core.context.java.JavaSecondaryTable; +import org.eclipse.jpt.core.context.java.JavaColumn.Owner; +import org.eclipse.jpt.core.context.orm.OrmBasicMapping; +import org.eclipse.jpt.core.context.orm.OrmColumn; +import org.eclipse.jpt.core.context.orm.OrmEntity; +import org.eclipse.jpt.core.context.orm.OrmIdMapping; +import org.eclipse.jpt.core.context.orm.OrmJoinColumn; +import org.eclipse.jpt.core.context.orm.OrmJoinTable; +import org.eclipse.jpt.core.context.orm.OrmJoinTableJoiningStrategy; import org.eclipse.jpt.core.context.orm.OrmManyToManyMapping; import org.eclipse.jpt.core.context.orm.OrmManyToOneMapping; import org.eclipse.jpt.core.context.orm.OrmOneToManyMapping; import org.eclipse.jpt.core.context.orm.OrmOneToOneMapping; import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.core.internal.AbstractJpaFactory; +import org.eclipse.jpt.core.context.orm.OrmPersistentType; +import org.eclipse.jpt.core.context.orm.OrmTable; +import org.eclipse.jpt.core.context.persistence.Persistence; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.internal.platform.GenericJpaFactory; +import org.eclipse.jpt.core.resource.orm.XmlBasic; +import org.eclipse.jpt.core.resource.orm.XmlEntity; +import org.eclipse.jpt.core.resource.orm.XmlId; +import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; +import org.eclipse.jpt.core.resource.orm.XmlJoinTableMapping; import org.eclipse.jpt.core.resource.orm.XmlManyToMany; import org.eclipse.jpt.core.resource.orm.XmlManyToOne; import org.eclipse.jpt.core.resource.orm.XmlOneToMany; import org.eclipse.jpt.core.resource.orm.XmlOneToOne; +import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; import org.jboss.tools.hibernate.jpt.core.internal.context.ForeignKey; +import org.jboss.tools.hibernate.jpt.core.internal.context.ForeignKeyImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedN= ativeQuery; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQ= uery; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.ForeignKey= Impl; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit; +import org.jboss.tools.hibernate.jpt.core.internal.context.Index; +import org.jboss.tools.hibernate.jpt.core.internal.context.IndexImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaBasicMappingImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaColumnImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaDiscriminatorColumnImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEmbeddable; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEntity; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEntityImpl; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaGeneratorContainerImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaIdMappingImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaJoinColumnImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaJoinTableImpl; @@ -60,36 +79,46 @@ import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaOneToManyMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaOneToOneMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaParameter; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaQueryContainerImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaSecondaryTableImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaTable; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaTableImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateN= amedNativeQueryImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateN= amedQueryImpl; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.IndexImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaDiscri= minatorFormula; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaDiscri= minatorFormulaImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaGeneri= cGenerator; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaGeneri= cGeneratorImpl; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaIndex; import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaParame= ter; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mBasicMapping; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mColumnImpl; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mEntityImpl; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mIdMappingImpl; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mJoinColumnImpl; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mJoinTableImpl; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mManyToManyMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mManyToOneMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mOneToManyMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mOneToOneMapping; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mTableImpl; = = /** * @author Dmitry Geraskov * */ -public class HibernateJpaFactory extends AbstractJpaFactory { +public class HibernateJpaFactory extends GenericJpaFactory { = // ********** Core Model ********** - public JpaProject buildJpaProject(JpaProject.Config config){ + public JpaProject buildJpaProject(JpaProject.Config config) throws CoreEx= ception { return new HibernateJpaProject(config); } = + // ********** Persistence Context Model ********** = + @Override + public PersistenceUnit buildPersistenceUnit(Persistence parent, XmlPersis= tenceUnit persistenceUnit) { + return new HibernatePersistenceUnit(parent, persistenceUnit); + } + = // ********** Java Context Model ********** @Override public JavaEntity buildJavaEntity(JavaPersistentType parent) { @@ -112,11 +141,11 @@ return new HibernateJavaDiscriminatorColumnImpl(parent, owner); } = - public HibernateNamedQuery buildHibernateJavaNamedQuery(JavaJpaContextNod= e parent) { + public HibernateNamedQuery buildHibernateNamedQuery(JavaJpaContextNode pa= rent) { return new HibernateNamedQueryImpl(parent); } = - public HibernateNamedNativeQuery buildHibernateJavaNamedNativeQuery(JavaJ= paContextNode parent) { + public HibernateNamedNativeQuery buildHibernateNamedNativeQuery(JavaJpaCo= ntextNode parent) { return new HibernateNamedNativeQueryImpl(parent); } = @@ -134,7 +163,7 @@ } = @Override - public JavaColumn buildJavaColumn(JavaJpaContextNode parent, JavaBaseColu= mn.Owner owner) { + public JavaColumn buildJavaColumn(JavaJpaContextNode parent, Owner owner)= { return new HibernateJavaColumnImpl(parent, owner); } = @@ -187,17 +216,50 @@ return new HibernateJavaBasicMappingImpl(parent); } = - public JavaQueryContainer buildJavaQueryContainer(JavaJpaContextNode pare= nt) { - return new HibernateJavaQueryContainerImpl(parent); + // ********** ORM Context Model ********** + = + @Override + public OrmBasicMapping buildOrmBasicMapping(OrmPersistentAttribute parent, + XmlBasic resourceMapping) { + return new HibernateOrmBasicMapping(parent, resourceMapping); } = - public JavaGeneratorContainer buildJavaGeneratorContainer(JavaJpaContextN= ode parent) { - return new HibernateJavaGeneratorContainerImpl(parent); + @Override + public OrmIdMapping buildOrmIdMapping(OrmPersistentAttribute parent, + XmlId resourceMapping) { + return new HibernateOrmIdMappingImpl(parent, resourceMapping); } = - // ********** ORM Context Model ********** + @Override + public OrmEntity buildOrmEntity(OrmPersistentType parent, + XmlEntity resourceMapping) { + return new HibernateOrmEntityImpl(parent, resourceMapping); + } + = + @Override + public OrmTable buildOrmTable(OrmEntity parent) { + return new HibernateOrmTableImpl(parent); + } + + @Override + public OrmJoinTable buildOrmJoinTable(OrmJoinTableJoiningStrategy parent, + XmlJoinTableMapping resourceMapping) { + return new HibernateOrmJoinTableImpl(parent, resourceMapping); + } = = + @Override + public OrmColumn buildOrmColumn(XmlContextNode parent, + org.eclipse.jpt.core.context.orm.OrmColumn.Owner owner) { + return new HibernateOrmColumnImpl(parent, owner); + } = + @Override + public OrmJoinColumn buildOrmJoinColumn(XmlContextNode parent, + org.eclipse.jpt.core.context.orm.OrmJoinColumn.Owner owner, + XmlJoinColumn resourceJoinColumn) { + return new HibernateOrmJoinColumnImpl(parent, owner, resourceJoinColumn); + } + = @SuppressWarnings("unchecked") public OrmManyToManyMapping buildOrmManyToManyMapping(OrmPersistentAttrib= ute parent, XmlManyToMany resourceMapping) { return new HibernateOrmManyToManyMapping(parent, resourceMapping); @@ -218,7 +280,7 @@ return new HibernateOrmOneToOneMapping(parent, resourceMapping); } = - public JavaIndex buildIndex(JavaJpaContextNode parent) { + public Index buildIndex(JavaJpaContextNode parent) { return new IndexImpl(parent); } = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatform.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatform.java 2010-05-= 26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatform.java 2010-05-= 26 13:13:34 UTC (rev 22326) @@ -13,11 +13,8 @@ import org.eclipse.jpt.core.JpaAnnotationProvider; import org.eclipse.jpt.core.JpaFactory; import org.eclipse.jpt.core.JpaPlatformProvider; -import org.eclipse.jpt.core.JpaPlatformVariation; -import org.eclipse.jpt.core.JpaResourceType; -import org.eclipse.jpt.core.ResourceDefinition; -import org.eclipse.jpt.core.internal.GenericJpaPlatform; -import org.eclipse.jpt.utility.internal.CollectionTools; +import org.eclipse.jpt.core.JpaValidation; +import org.eclipse.jpt.core.internal.platform.GenericJpaPlatform; = /** * @author Dmitry Geraskov @@ -26,19 +23,9 @@ public class HibernateJpaPlatform extends GenericJpaPlatform { = public static final String ID =3D "hibernate"; //$NON-NLS-1$ - = - @Override - public ResourceDefinition getResourceDefinition(JpaResourceType resourceT= ype) { - for (ResourceDefinition resourceDefinition : CollectionTools.iterable(re= sourceDefinitions())) { - if (resourceDefinition.getResourceType().equals(resourceType)) { - return resourceDefinition; - } - } - return super.getResourceDefinition(resourceType); - } = - public HibernateJpaPlatform(String id, Version jpaVersion, JpaFactory jpa= Factory, JpaAnnotationProvider jpaAnnotationProvider, JpaPlatformProvider p= latformProvider, JpaPlatformVariation jpaVariation) { - super(id, jpaVersion, jpaFactory, jpaAnnotationProvider, platformProvide= r, jpaVariation); + public HibernateJpaPlatform(String id, JpaFactory jpaFactory, JpaAnnotati= onProvider jpaAnnotationProvider, JpaValidation jpaValidation, JpaPlatformP= rovider... platformProviders) { + super(id, jpaFactory, jpaAnnotationProvider, jpaValidation, platformProv= iders); } = @Override Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformFactory.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformFactory.java 2= 010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformFactory.java 2= 010-05-26 13:13:34 UTC (rev 22326) @@ -14,10 +14,10 @@ import org.eclipse.jpt.core.JpaFactory; import org.eclipse.jpt.core.JpaPlatform; import org.eclipse.jpt.core.JpaPlatformFactory; -import org.eclipse.jpt.core.JpaPlatformVariation; -import org.eclipse.jpt.core.internal.GenericJpaAnnotationDefinitionProvide= r; -import org.eclipse.jpt.core.internal.GenericJpaAnnotationProvider; -import org.eclipse.jpt.core.internal.GenericJpaPlatformFactory.SimpleVersi= on; +import org.eclipse.jpt.core.JpaValidation; +import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationDefiniti= onProvider; +import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationProvider; +import org.eclipse.jpt.core.internal.platform.GenericJpaPlatformProvider; = /** * @author Dmitry Geraskov @@ -35,19 +35,12 @@ public JpaPlatform buildJpaPlatform(String id) { return new HibernateJpaPlatform( id, - this.buildJpaVersion(), buildJpaFactory(), = buildJpaAnnotationProvider(), = - HibernateJpaPlatformProvider.instance(), - this.buildJpaPlatformVariation()); + buildJpaValidation(), + GenericJpaPlatformProvider.instance()); } = - = - = - private JpaPlatform.Version buildJpaVersion() { - return new SimpleVersion(HibernateJptPlugin.JPA_FACET_VERSION_1_0); - } - = protected JpaFactory buildJpaFactory() { return new HibernateJpaFactory(); } @@ -58,14 +51,11 @@ HibernateJpaAnnotationDefinitionProvider.instance()); } = - protected JpaPlatformVariation buildJpaPlatformVariation() { - return new JpaPlatformVariation() { + protected JpaValidation buildJpaValidation() { + return new JpaValidation() { public Supported getTablePerConcreteClassInheritanceIsSupported() { - return Supported.YES; + return Supported.MAYBE; } - public boolean isJoinTableOverridable() { - return false; - } }; } = Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java = 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaPlatformProvider.java = 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,151 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-2008 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ************************************************************************= ******/ -package org.jboss.tools.hibernate.jpt.core.internal; - -import org.eclipse.core.runtime.content.IContentType; -import org.eclipse.jpt.core.JpaPlatformProvider; -import org.eclipse.jpt.core.JpaResourceModelProvider; -import org.eclipse.jpt.core.JpaResourceType; -import org.eclipse.jpt.core.JptCorePlugin; -import org.eclipse.jpt.core.ResourceDefinition; -import org.eclipse.jpt.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.core.context.java.JavaTypeMappingDefinition; -import org.eclipse.jpt.core.internal.AbstractJpaPlatformProvider; -import org.eclipse.jpt.core.internal.JarResourceModelProvider; -import org.eclipse.jpt.core.internal.JavaResourceModelProvider; -import org.eclipse.jpt.core.internal.OrmResourceModelProvider; -import org.eclipse.jpt.core.internal.PersistenceResourceModelProvider; -import org.eclipse.jpt.core.internal.context.java.JavaBasicMappingDefiniti= on; -import org.eclipse.jpt.core.internal.context.java.JavaEmbeddableDefinition; -import org.eclipse.jpt.core.internal.context.java.JavaEmbeddedIdMappingDef= inition; -import org.eclipse.jpt.core.internal.context.java.JavaEmbeddedMappingDefin= ition; -import org.eclipse.jpt.core.internal.context.java.JavaEntityDefinition; -import org.eclipse.jpt.core.internal.context.java.JavaIdMappingDefinition; -import org.eclipse.jpt.core.internal.context.java.JavaManyToManyMappingDef= inition; -import org.eclipse.jpt.core.internal.context.java.JavaManyToOneMappingDefi= nition; -import org.eclipse.jpt.core.internal.context.java.JavaMappedSuperclassDefi= nition; -import org.eclipse.jpt.core.internal.context.java.JavaOneToManyMappingDefi= nition; -import org.eclipse.jpt.core.internal.context.java.JavaOneToOneMappingDefin= ition; -import org.eclipse.jpt.core.internal.context.java.JavaTransientMappingDefi= nition; -import org.eclipse.jpt.core.internal.context.java.JavaVersionMappingDefini= tion; -import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmXmlDefinit= ion; -import org.jboss.tools.hibernate.jpt.core.internal.context.persistence.Hib= ernatePersistenceXmlDefinition; - -/** - * @author Dmitry Geraskov - * - */ -public class HibernateJpaPlatformProvider extends AbstractJpaPlatformProvi= der { - -public static final String ID =3D "hibernate"; //$NON-NLS-1$ - = - // singleton - private static final JpaPlatformProvider INSTANCE =3D = - new HibernateJpaPlatformProvider(); - = - = - /** - * Return the singleton. - */ - public static JpaPlatformProvider instance() { - return INSTANCE; - } - = - = - /** - * Enforce singleton usage - */ - private HibernateJpaPlatformProvider() { - super(); - } - = - = - // ********** resource models ********** - = - public JpaResourceType getMostRecentSupportedResourceType(IContentType co= ntentType) { - if (contentType.equals(JptCorePlugin.JAVA_SOURCE_CONTENT_TYPE)) { - return JptCorePlugin.JAVA_SOURCE_RESOURCE_TYPE; - } - else if (contentType.equals(JptCorePlugin.JAR_CONTENT_TYPE)) { - return JptCorePlugin.JAR_RESOURCE_TYPE; - } - else if (contentType.equals(JptCorePlugin.PERSISTENCE_XML_CONTENT_TYPE))= { - return JptCorePlugin.PERSISTENCE_XML_1_0_RESOURCE_TYPE; - } - else if (contentType.equals(JptCorePlugin.ORM_XML_CONTENT_TYPE)) { - return JptCorePlugin.ORM_XML_1_0_RESOURCE_TYPE; - } - else { - throw new IllegalArgumentException(contentType.toString()); - } - } - = - @Override - protected JpaResourceModelProvider[] buildResourceModelProviders() { - // order should not be important here - return new JpaResourceModelProvider[] { - JavaResourceModelProvider.instance(), - JarResourceModelProvider.instance(), - PersistenceResourceModelProvider.instance(), - OrmResourceModelProvider.instance()}; - } - = - = - // ********** Java type mappings ********** - = - @Override - protected JavaTypeMappingDefinition[] buildNonNullJavaTypeMappingDefiniti= ons() { - // order determined by analyzing order that reference implementation (to= plink) uses - return new JavaTypeMappingDefinition[] { - JavaEntityDefinition.instance(), - JavaEmbeddableDefinition.instance(), - JavaMappedSuperclassDefinition.instance()}; - } - = - = - // ********** Java attribute mappings ********** - = - @Override - protected JavaAttributeMappingDefinition[] buildNonNullDefaultJavaAttribu= teMappingDefinitions() { - // order determined by analyzing order that reference implementation (to= plink) uses - return new JavaAttributeMappingDefinition[] { - JavaEmbeddedMappingDefinition.instance(), - JavaBasicMappingDefinition.instance()}; - } - = - @Override - protected JavaAttributeMappingDefinition[] buildNonNullSpecifiedJavaAttri= buteMappingDefinitions() { - // order determined by analyzing order that reference implementation (ec= lipselink) uses - return new JavaAttributeMappingDefinition[] { - JavaTransientMappingDefinition.instance(), - JavaIdMappingDefinition.instance(), - JavaVersionMappingDefinition.instance(), - JavaBasicMappingDefinition.instance(), - JavaEmbeddedMappingDefinition.instance(), - JavaEmbeddedIdMappingDefinition.instance(), - JavaManyToManyMappingDefinition.instance(), - JavaManyToOneMappingDefinition.instance(), - JavaOneToManyMappingDefinition.instance(), - JavaOneToOneMappingDefinition.instance()}; - } - = - = - // ********** Mapping Files ********** - = - @Override - protected ResourceDefinition[] buildResourceDefinitions() { - return new ResourceDefinition[] { - HibernatePersistenceXmlDefinition.instance(), - GenericOrmXmlDefinition.instance()}; - } - = - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java 2010-05-2= 6 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJpaProject.java 2010-05-2= 6 13:13:34 UTC (rev 22326) @@ -12,6 +12,7 @@ package org.jboss.tools.hibernate.jpt.core.internal; = import org.eclipse.core.resources.ProjectScope; +import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.preferences.IScopeContext; import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.core.internal.AbstractJpaProject; @@ -28,9 +29,10 @@ */ public class HibernateJpaProject extends AbstractJpaProject { = - private Boolean cachedNamingStrategyEnable; = + private Boolean cachedNamingStrategyEnable; + = = - public HibernateJpaProject(JpaProject.Config config){ + public HibernateJpaProject(JpaProject.Config config) throws CoreException= { super(config); } = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java 2010-05-26= 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/HibernateJptPlugin.java 2010-05-26= 13:13:34 UTC (rev 22326) @@ -25,7 +25,7 @@ import org.eclipse.core.runtime.Plugin; import org.eclipse.core.runtime.Status; import org.eclipse.jpt.core.JpaProject; -import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.internal.JpaModelManager; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.console.KnownConfigurations; import org.hibernate.console.KnownConfigurationsAdapter; @@ -39,8 +39,6 @@ = public static final String ID =3D "org.jboss.tools.hibernate.jpt.core"; /= /$NON-NLS-1$ = - public static final String JPA_FACET_VERSION_1_0 =3D "1.0"; //$NON-NLS-1$ - = private static HibernateJptPlugin inst =3D null; = public static HibernateJptPlugin getDefault() { @@ -104,17 +102,21 @@ KnownConfigurations.getInstance().addConsoleConfigurationListener(new Kn= ownConfigurationsAdapter(){ = private void revalidateProjects(ConsoleConfiguration ccfg){ - //INFO: should revalidate project to calculate correct naming strategy= 's values - Iterator jpaProjects =3D JptCorePlugin.getJpaProjectManage= r().getJpaProjects().iterator(); - while (jpaProjects.hasNext()) { - JpaProject jpaProject =3D (JpaProject) jpaProjects.next(); - if (jpaProject instanceof HibernateJpaProject) { - String ccName =3D ((HibernateJpaProject)jpaProject).getDefaultConsol= eConfigurationName(); - if (ccfg.getName().equals(ccName)){ - rebuildJpaProject(jpaProject.getJavaProject().getProject()); - //jpaProject.getJavaProject().getProject().build(IncrementalProject= Builder.FULL_BUILD, null); + //FIXME: call only Dali's validator + try { + Iterator jpaProjects =3D JpaModelManager.instance().getJp= aModel().jpaProjects(); + while (jpaProjects.hasNext()) { + JpaProject jpaProject =3D (JpaProject) jpaProjects.next(); + if (jpaProject instanceof HibernateJpaProject) { + String ccName =3D ((HibernateJpaProject)jpaProject).getDefaultConso= leConfigurationName(); + if (ccfg.getName().equals(ccName)){ + rebuildJpaProject(jpaProject.getJavaProject().getProject()); + //jpaProject.getJavaProject().getProject().build(IncrementalProjec= tBuilder.FULL_BUILD, null); + } } } + } catch (CoreException e) { + logException(e); } } = @@ -145,7 +147,7 @@ final IWorkspaceRunnable wr =3D new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - JptCorePlugin.rebuildJpaProject(project); + JpaModelManager.instance().rebuildJpaProject(project); project.build(IncrementalProjectBuilder.FULL_BUILD, monitor); } }; Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/ForeignKeyImpl.java (f= rom rev 22306, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.c= ore/src/org/jboss/tools/hibernate/jpt/core/internal/context/ForeignKeyImpl.= java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/ForeignKeyImpl.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/ForeignKeyImpl.java 2010-0= 5-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,94 @@ +/*************************************************************************= ****** + * Copyright (c) 2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ + +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNo= de; +import org.eclipse.jpt.core.utility.TextRange; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.ForeignKey= Annotation; + +/** + * @author Dmitry Geraskov + * + */ +public class ForeignKeyImpl extends AbstractJavaJpaContextNode implements = ForeignKey { + + private ForeignKeyAnnotation foreignKeyResource; + = + private String name; + = + private String inverseName; + + public ForeignKeyImpl(JavaJpaContextNode parent) { + super(parent); + } + + public void initialize(ForeignKeyAnnotation foreignKeyResource) { + this.foreignKeyResource =3D foreignKeyResource; + this.name =3D foreignKeyResource.getName(); + this.inverseName =3D foreignKeyResource.getInverseName(); + } + = + public void update(ForeignKeyAnnotation foreignKeyResource) { + this.foreignKeyResource =3D foreignKeyResource; + this.setName_(foreignKeyResource.getName()); + this.setInverseName_(foreignKeyResource.getInverseName()); + } + = + private ForeignKeyAnnotation getResourceForeignKey() { + return foreignKeyResource; + } + + // ***** name + = + public String getName() { + return name; + } + = + public void setName(String name) { + String old =3D this.name; + this.name =3D name; + this.getResourceForeignKey().setName(name); + this.firePropertyChanged(FOREIGN_KEY_NAME, old, name); + } + = + public void setName_(String name) { + String old =3D this.name; + this.name =3D name; + this.firePropertyChanged(FOREIGN_KEY_NAME, old, name); + } + = + // ***** inverseName + = + public String getInverseName() { + return inverseName; + } + = + public void setInverseName(String inverseName) { + String old =3D this.inverseName; + this.inverseName =3D inverseName; + this.getResourceForeignKey().setInverseName(inverseName); + this.firePropertyChanged(FOREIGN_KEY_INVERSE_NAME, old, inverseName); + } + = + public void setInverseName_(String inverseName) { + String old =3D this.inverseName; + this.inverseName =3D inverseName; + this.firePropertyChanged(FOREIGN_KEY_INVERSE_NAME, old, inverseName); + } + + public TextRange getValidationTextRange(CompilationUnit astRoot) { + return this.foreignKeyResource.getTextRange(astRoot); + } + +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/GenericGeneratorHolder= .java (from rev 22306, trunk/hibernatetools/plugins/org.jboss.tools.hiberna= te.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Generic= GeneratorHolder.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/GenericGeneratorHolder.jav= a (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/GenericGeneratorHolder.jav= a 2010-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,56 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import java.util.ListIterator; + +import org.eclipse.jpt.core.context.GeneratorHolder; + +/** + * @author Dmitry Geraskov + * + */ +public interface GenericGeneratorHolder extends GeneratorHolder { + + String GENERIC_GENERATORS_LIST =3D "genericGenerators"; //$NON-NLS-1$ = + = + /** + * Return a list iterator of the generic generators. + * This will not be null. + */ + ListIterator genericGenerators(); + = + /** + * Return the number of generic generators. + */ + int genericGeneratorsSize(); + + /** + * Add a generic generator to the entity return the object representing i= t. + */ + GenericGenerator addGenericGenerator(int index); + = + /** + * Remove the generic generator at the index from the entity. + */ + void removeGenericGenerator(int index); + = + /** + * Remove the generic generator from the entity. + */ + void removeGenericGenerator(GenericGenerator generator); + = + /** + * Move the generic generator from the source index to the target index. + */ + void moveGenericGenerator(int targetIndex, int sourceIndex); + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateEntity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernateEntity.java 2010-= 05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernateEntity.java 2010-= 05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -16,14 +16,13 @@ * @author Dmitry Geraskov * */ -public interface HibernateEntity extends Entity { +public interface HibernateEntity extends Entity, + GenericGeneratorHolder, HibernateQueryContainer { = String DISCRIMINATOR_FORMULA_PROPERTY =3D "discriminatorFormula"; //$NON-= NLS-1$ = HibernateTable getTable(); = - //HibernateGeneratorContainer getGeneratorContainer(); - = //Column getPrimaryIdColumn(); = //String getDefaultDBTableName(); Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateGeneratorCon= tainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernateGeneratorContaine= r.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernateGeneratorContaine= r.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,44 +0,0 @@ -package org.jboss.tools.hibernate.jpt.core.internal.context; - -import java.util.ListIterator; - -import org.eclipse.jpt.core.context.GeneratorContainer; - -public interface HibernateGeneratorContainer extends GeneratorContainer { - = - //******************** generic generator ***************** - = - String GENERIC_GENERATORS_LIST =3D "genericGenerators"; //$NON-NLS-1$ = - = - /** - * Return a list iterator of the generic generators. - * This will not be null. - */ - ListIterator genericGenerators(); - = - /** - * Return the number of generic generators. - */ - int genericGeneratorsSize(); - - /** - * Add a generic generator to the entity return the object representing i= t. - */ - GenericGenerator addGenericGenerator(int index); - = - /** - * Remove the generic generator at the index from the entity. - */ - void removeGenericGenerator(int index); - = - /** - * Remove the generic generator from the entity. - */ - void removeGenericGenerator(GenericGenerator generator); - = - /** - * Move the generic generator from the source index to the target index. - */ - void moveGenericGenerator(int targetIndex, int sourceIndex); - -} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateIdMapping.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernateIdMapping.java 20= 10-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernateIdMapping.java 20= 10-05-26 13:13:34 UTC (rev 22326) @@ -1,21 +0,0 @@ -/*************************************************************************= ****** - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ************************************************************************= ******/ -package org.jboss.tools.hibernate.jpt.core.internal.context; - -import org.eclipse.jpt.core.context.IdMapping; - -/** - * @author Dmitry Geraskov - * - */ -public interface HibernateIdMapping extends IdMapping { - -} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties= .java (from rev 22306, trunk/hibernatetools/plugins/org.jboss.tools.hiberna= te.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Hiberna= teJpaProperties.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.jav= a (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernateJpaProperties.jav= a 2010-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,95 @@ +/*************************************************************************= ****** + * Copyright (c) 2008-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import java.util.ListIterator; + +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit.Property; +import org.eclipse.jpt.utility.internal.model.AbstractModel; +import org.eclipse.jpt.utility.internal.model.value.ItemPropertyListValueM= odelAdapter; +import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter; +import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueMod= el; +import org.eclipse.jpt.utility.model.value.ListValueModel; +import org.eclipse.jpt.utility.model.value.PropertyValueModel; +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibe= rnateProperties; +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate= Basic; + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateJpaProperties extends AbstractModel { + = + private PersistenceUnit persistenceUnit; + = + private BasicHibernateProperties basicHibernateProperties; + = + private ListValueModel propertiesAdapter; + private ListValueModel propertyListAdapter; + = + public HibernateJpaProperties(PersistenceUnit parent) { + super(); + this.initialize(parent); + } + = + protected void initialize(PersistenceUnit parent) { + this.persistenceUnit =3D parent; + PropertyValueModel persistenceUnitHolder =3D = + new SimplePropertyValueModel(this.persistenceUnit); + = + this.propertiesAdapter =3D this.buildPropertiesAdapter(persistenceUnitHo= lder); + this.propertyListAdapter =3D this.buildPropertyListAdapter(this.properti= esAdapter); + = + this.basicHibernateProperties =3D this.buildBasicProperties(); + } + = + private ListValueModel buildPropertyListAdapter(ListValueModel<= Property> propertiesAdapter) { + return new ItemPropertyListValueModelAdapter(propertiesAdapter= , Property.VALUE_PROPERTY, Property.NAME_PROPERTY); + } + = + private ListValueModel buildPropertiesAdapter(PropertyValueMode= l subjectHolder) { + return new ListAspectAdapter(subjectHolder, P= ersistenceUnit.PROPERTIES_LIST) { + @Override + protected ListIterator listIterator_() { + return this.subject.properties(); + } + + @Override + protected int size_() { + return this.subject.propertiesSize(); + } + }; + } + = + // ******** Behavior ********* + public BasicHibernateProperties getBasicHibernate() { + return this.basicHibernateProperties; + } + = + private BasicHibernateProperties buildBasicProperties() { + return new HibernateBasic(this.persistenceUnit(), this.propertyListAdapt= er()); + } + + public ListValueModel propertyListAdapter() { + return this.propertyListAdapter; + } + + public PersistenceUnit persistenceUnit() { + return this.persistenceUnit; + } + = + public JpaProject getJpaProject() { + return this.persistenceUnit.getJpaProject(); + } + +} \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistence= Unit.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.j= ava 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnit.j= ava 2010-05-26 13:13:34 UTC (rev 22326) @@ -22,7 +22,7 @@ import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jpt.core.context.persistence.Persistence; -import org.eclipse.jpt.core.internal.context.persistence.AbstractPersisten= ceUnit; +import org.eclipse.jpt.core.internal.context.persistence.GenericPersistenc= eUnit; import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -30,17 +30,15 @@ import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibe= rnateProperties; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; -import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate= PersistenceUnitProperties; -import org.jboss.tools.hibernate.jpt.core.internal.context.persistence.Hib= ernatePersistenceXmlContextNodeFactory; = /** * @author Dmitry Geraskov * */ -public class HibernatePersistenceUnit extends AbstractPersistenceUnit = +public class HibernatePersistenceUnit extends GenericPersistenceUnit = implements Messages, Hibernate { = - private HibernatePersistenceUnitProperties hibernateProperties; + private HibernateJpaProperties hibernateProperties; = /** * @param parent @@ -49,34 +47,12 @@ public HibernatePersistenceUnit(Persistence parent, XmlPersistenceUnit persistenceUnit) { super(parent, persistenceUnit); + this.hibernateProperties =3D new HibernateJpaProperties(this); } - = - @Override - public HibernatePersistenceXmlContextNodeFactory getContextNodeFactory() { - return (HibernatePersistenceXmlContextNodeFactory) super.getContextNodeF= actory(); - } - = - @Override - protected void initializeProperties() { - super.initializeProperties(); - this.hibernateProperties =3D this.getContextNodeFactory().buildHibernate= PersistenceUnitProperties(this); - } - = - @Override - public void propertyRemoved(String propertyName) { - super.propertyRemoved(propertyName); - this.hibernateProperties.propertyRemoved(propertyName); - } - = - @Override - public void propertyValueChanged(String propertyName, String newValue) { - super.propertyValueChanged(propertyName, newValue); - this.hibernateProperties.propertyValueChanged(propertyName, newValue); - } = // ******** Behavior ********* - public HibernatePersistenceUnitProperties getHibernatePersistenceUnitProp= erties() { - return this.hibernateProperties; + public BasicHibernateProperties getBasicProperties() { + return this.hibernateProperties.getBasicHibernate(); } = // ********** Validation *********************************************** @@ -87,7 +63,7 @@ } = = protected void validateHibernateConfigurationFileExists(List me= ssages, IReporter reporter) { - String configFile =3D hibernateProperties.getConfigurationFile(); + String configFile =3D getBasicProperties().getConfigurationFile(); if (configFile !=3D null && configFile.length() > 0){ IPath path =3D new Path(configFile); = Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUn= itProperties.java (from rev 22306, trunk/hibernatetools/plugins/org.jboss.t= ools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/con= text/HibernatePersistenceUnitProperties.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitPr= operties.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernatePersistenceUnitPr= operties.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,187 @@ +/*************************************************************************= ****** + * Copyright (c) 2008-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit.Property; +import org.eclipse.jpt.utility.internal.model.AbstractModel; +import org.eclipse.jpt.utility.model.value.ListValueModel; + + +/** + * @author Dmitry Geraskov + * + */ +public abstract class HibernatePersistenceUnitProperties extends Abstract= Model implements PersistenceUnitProperties { + + private PersistenceUnit persistenceUnit; + + private PersistenceUnitPropertyListListener propertyListListener; + = + private Map propertyNames; + = + protected HibernatePersistenceUnitProperties( + PersistenceUnit parent, = + ListValueModel propertyListAdapter) { + super(); + this.initialize(parent, propertyListAdapter); + } + = + protected void initialize( + PersistenceUnit parent, = + ListValueModel propertyListAdapter) { + this.persistenceUnit =3D parent; + = + this.propertyListListener =3D new PersistenceUnitPropertyListListener(th= is); + propertyListAdapter.addListChangeListener(ListValueModel.LIST_VALUES, th= is.propertyListListener); + = + this.initializePropertyNames(); + this.initializeProperties(); + } + = + protected void initializePropertyNames() { + this.propertyNames =3D new HashMap(); + this.addPropertyNames(this.propertyNames); + } + + /** + * Initializes properties with values from the persistence unit. + */ + protected abstract void initializeProperties(); + + // ********** behavior ********** + public PersistenceUnit persistenceUnit() { + return this.persistenceUnit; + } + = + public JpaProject getJpaProject() { + return this.persistenceUnit.getJpaProject(); + } + + public PersistenceUnitPropertyListListener propertyListListener() { + return this.propertyListListener; + } + + private Map propertyNames() { + return this.propertyNames; + } + + /** + * Adds property names key/value pairs, used by the methods: itemIsProper= ty + * and propertyIdFor. + * = + * key =3D EclipseLink property key; value =3D property id + */ + protected abstract void addPropertyNames(Map propertyName= s); + + /** + * Method used for identifying the given property. + */ + public boolean itemIsProperty(Property item) { + if (item =3D=3D null) { + throw new IllegalArgumentException("Property is null"); //$NON-NLS-1$ + } + return this.propertyNames().keySet().contains(item.getName()); + } + + /** + * Returns the property name used for change notification of the given + * property. + */ + public String propertyIdFor(Property property) { + String propertyId =3D this.propertyNames().get(property.getName()); + if (propertyId =3D=3D null) { + throw new IllegalArgumentException("Illegal property: " + property.toSt= ring()); //$NON-NLS-1$ + } + return propertyId; + } + + protected String hibernateKeyFor(String propertyId) { + for (String hibernateKey : this.propertyNames().keySet()) { + if (this.propertyNames().get(hibernateKey).equals(propertyId)) { + return hibernateKey; + } + } + throw new IllegalArgumentException("Illegal property: " + propertyId); /= /$NON-NLS-1$ + } + + // ****** get/set String convenience methods ******* + /** + * Returns the String value of the given Property from the PersistenceXml. + */ + protected String getStringValue(String key) { + return this.getStringValue(key, null); + } + + protected String getStringValue(String key, String keySuffix) { + String elKey =3D (keySuffix =3D=3D null) ? key : key + keySuffix; + if (this.persistenceUnit().getProperty(elKey) !=3D null) { + // TOREVIEW - handle incorrect String in persistence.xml + return this.persistenceUnit().getProperty(elKey).getValue(); + } + return null; + } + + /** + * Put the given String value into the PersistenceXml. + * @param key + * EclipseLink Key + * @param keySuffix + * e.g. entity name + * @param newValue + * value to be associated with the key + * @param allowDuplicate + */ + protected void putStringValue(String key, String keySuffix, String newVal= ue, boolean allowDuplicate) { + String elKey =3D (keySuffix =3D=3D null) ? key : key + keySuffix; + if (newValue =3D=3D null) { + this.persistenceUnit().removeProperty(elKey); + } + else { + this.persistenceUnit().setProperty(elKey, newValue, allowDuplicate); + } + } + + // ******** Convenience methods ******** + /** + * Put into persistenceUnit properties. + * = + * @param key - + * property name + * @param value - + * property value + */ + protected void putProperty(String key, Object value) { + String elKey =3D this.hibernateKeyFor(key); + if (value =3D=3D null) + this.removeProperty(elKey); + else + this.putProperty_(elKey, value); + } + + private void putProperty_(String key, Object value) { + this.persistenceUnit().setProperty(key, value.toString(), false); + } + + /** + * Removes a property with the given key. + */ + protected void removeProperty(String key) { + if(this.persistenceUnit().getProperty(key) !=3D null) { = + this.persistenceUnit().removeProperty(key); + } + } + +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/HibernateProperties.ja= va (from rev 22306, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.= jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/HibernateP= roperties.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernateProperties.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernateProperties.java 2= 010-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,23 @@ +/*************************************************************************= ****** + * Copyright (c) 2008-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibe= rnateProperties; + +/** + * @author Dmitry Geraskov + * + */ +public interface HibernateProperties extends PersistenceUnitProperties { + = + BasicHibernateProperties getBasicHibernate(); + +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/HibernateQueryContaine= r.java (from rev 22306, trunk/hibernatetools/plugins/org.jboss.tools.hibern= ate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Hibern= ateQueryContainer.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernateQueryContainer.ja= va (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/HibernateQueryContainer.ja= va 2010-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,93 @@ +/*************************************************************************= ****** + * Copyright (c) 2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import java.util.ListIterator; + +import org.eclipse.jpt.core.context.QueryContainer; + +/** + * @author Dmitry Geraskov + * + */ +public interface HibernateQueryContainer extends QueryContainer { + = + String HIBERNATE_NAMED_QUERIES_LIST =3D "hibernateNamedQueries"; //$NON-N= LS-1$ + = + String HIBERNATE_NAMED_NATIVE_QUERIES_LIST =3D "hibernateNamedNativeQueri= es"; //$NON-NLS-1$ + // ********** named queries ********** + + /** + * Return a list iterator of the named queries. + * This will not be null. + */ + ListIterator hibernateNamedQueries(); + + /** + * Return the number of named queries. + */ + int hibernateNamedQueriesSize(); + + /** + * Add a named query to the entity return the object representing it. + */ + HibernateNamedQuery addHibernateNamedQuery(int index); + + /** + * Remove the named query at the index from the entity. + */ + void removeHibernateNamedQuery(int index); + + /** + * Remove the named query at from the entity. + */ + void removeHibernateNamedQuery(HibernateNamedQuery namedQuery); + + /** + * Move the named query from the source index to the target index. + */ + void moveHibernateNamedQuery(int targetIndex, int sourceIndex); + = + // ********** named native queries ********** + + /** + * Return a list iterator of the specified named native queries. + * This will not be null. + */ + ListIterator hibernateNamedNativ= eQueries(); + + /** + * Return the number of named native queries. + */ + int hibernateNamedNativeQueriesSize(); + + /** + * Add a named native query to the entity return the object representing = it. + */ + HibernateNamedNativeQuery addHibernateNamedNativeQuery(int index); + + /** + * Remove the named native query at the index from the entity. + */ + void removeHibernateNamedNativeQuery(int index); + + /** + * Remove the named native query at from the entity. + */ + void removeHibernateNamedNativeQuery(HibernateNamedNativeQuery namedNativ= eQuery); + + /** + * Move the named native query from the source index to the target index. + */ + void moveHibernateNamedNativeQuery(int targetIndex, int sourceIndex); + + +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/Index.java (from rev 2= 2306, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/o= rg/jboss/tools/hibernate/jpt/core/internal/context/Index.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/Index.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/Index.java 2010-05-26 13:1= 3:34 UTC (rev 22326) @@ -0,0 +1,37 @@ +/*************************************************************************= ****** + * Copyright (c) 2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ + +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import org.eclipse.jpt.core.context.JpaContextNode; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.IndexAnno= tation; + +/** + * @author Dmitry Geraskov + * + */ +public interface Index extends JpaContextNode { + = + String getName(); + void setName(String name); + String INDEX_NAME =3D "name"; //$NON-NLS-1$ + = + String[] getColumnNames(); + void addColumn(String columnName); + void removeColumn(String columnName); + String INDEX_COLUMN_NAMES =3D "ColumnNames"; //$NON-NLS-1$ + + + public void initialize(IndexAnnotation indexResource); + + public void update(IndexAnnotation indexResource); + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/IndexHolder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/IndexHolder.java 2010-05-2= 6 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/IndexHolder.java 2010-05-2= 6 13:13:34 UTC (rev 22326) @@ -12,7 +12,6 @@ package org.jboss.tools.hibernate.jpt.core.internal.context; = import org.eclipse.jpt.core.context.JpaContextNode; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaIndex; = /** * @author Dmitry Geraskov @@ -24,9 +23,9 @@ = String INDEX_PROPERTY =3D "index"; //$NON-NLS-1$ = - JavaIndex getIndex(); + Index getIndex(); = - JavaIndex addIndex(); + Index addIndex(); = void removeIndex(); = Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/IndexImpl.java (from r= ev 22306, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/IndexImpl.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/IndexImpl.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/IndexImpl.java 2010-05-26 = 13:13:34 UTC (rev 22326) @@ -0,0 +1,115 @@ +/*************************************************************************= ****** + * Copyright (c) 2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ + +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jpt.core.context.java.JavaJpaContextNode; +import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNo= de; +import org.eclipse.jpt.core.utility.TextRange; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.IndexAnno= tation; + +/** + * @author Dmitry Geraskov + * + */ +public class IndexImpl extends AbstractJavaJpaContextNode implements Index= { + = + private IndexAnnotation indexResource; + = + private String name; + = + private String[] columnNames =3D new String[0]; + + public IndexImpl(JavaJpaContextNode parent) { + super(parent); + } + + public void initialize(IndexAnnotation indexResource) { + this.indexResource =3D indexResource; + this.name =3D indexResource.getName(); + this.columnNames =3D indexResource.getColumnNames(); + } + = + public void update(IndexAnnotation indexResource) { + this.indexResource =3D indexResource; + this.setName_(indexResource.getName()); + this.setColumnNames_(indexResource.getColumnNames()); + } + + // ***** name + = + public String getName() { + return name; + } + = + public void setName(String name) { + String old =3D this.name; + this.name =3D name; + this.getResourceIndex().setName(name); + this.firePropertyChanged(INDEX_NAME, old, name); + } + = + public void setName_(String name) { + String old =3D this.name; + this.name =3D name; + this.firePropertyChanged(INDEX_NAME, old, name); + } + = + // ***** columnNames + = + public String[] getColumnNames() { + return columnNames; + } + + public void setColumnNames(String[] columnNames) { + if (columnNames =3D=3D null) columnNames =3D new String[0]; + String[] old =3D this.columnNames; + this.columnNames =3D columnNames; + this.getResourceIndex().setColumnNames(columnNames); + this.firePropertyChanged(INDEX_COLUMN_NAMES, old, columnNames); + } + = + public void setColumnNames_(String[] columnNames) { + String[] old =3D this.columnNames; + this.columnNames =3D columnNames; + this.firePropertyChanged(INDEX_COLUMN_NAMES, old, columnNames); + } + = + private IndexAnnotation getResourceIndex() { + return indexResource; + } + + public TextRange getValidationTextRange(CompilationUnit astRoot) { + return this.indexResource.getTextRange(astRoot); + } + + public void addColumn(String columnName) { + String[] old =3D this.columnNames; + String[] newColumns =3D new String[old.length + 1]; + System.arraycopy(old, 0, newColumns, 0, old.length); + newColumns[newColumns.length - 1] =3D columnName; + this.setColumnNames(newColumns); + } + + public void removeColumn(String columnName) { + String[] old =3D this.columnNames; + List newColumns =3D new ArrayList(); + for (String column : old) { + if (!column.equals(columnName)) newColumns.add(column); + } + this.setColumnNames(newColumns.toArray(new String[newColumns.size()])); + } = + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappin= gTools.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools= .java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/NamingStrategyMappingTools= .java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,19 +1,23 @@ /*************************************************************************= ****** - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ************************************************************************= ******/ + * Copyright (c) 2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ + package org.jboss.tools.hibernate.jpt.core.internal.context; = +import org.eclipse.jpt.core.context.Column; +import org.eclipse.jpt.core.context.ColumnMapping; import org.eclipse.jpt.core.context.Entity; import org.eclipse.jpt.core.context.JoinColumn; +import org.eclipse.jpt.core.context.PersistentAttribute; import org.eclipse.jpt.core.context.RelationshipMapping; -import org.eclipse.jpt.core.context.RelationshipReference; +import org.eclipse.jpt.core.internal.context.MappingTools; import org.eclipse.jpt.db.Table; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -26,73 +30,55 @@ * @author Dmitry Geraskov * */ -public class NamingStrategyMappingTools { +public class NamingStrategyMappingTools extends MappingTools { = - public static String buildJoinTableDefaultName(RelationshipReference rela= tionshipReference) { - if (relationshipReference.getJpaProject().getDataSource().connectionProf= ileIsActive()) { - return buildDbJoinTableDefaultName(relationshipReference); + public static String buildJoinTableDefaultName(RelationshipMapping relati= onshipMapping) { + if (relationshipMapping.getJpaProject().getDataSource().connectionProfil= eIsActive()) { + return buildDbJoinTableDefaultName(relationshipMapping); } - = - RelationshipMapping relationshipMapping =3D relationshipReference.getRel= ationshipMapping(); - if (relationshipMapping =3D=3D null) { + // continue with a "best effort": + String owningTableName =3D relationshipMapping.getTypeMapping().getPrima= ryTableName(); + if (owningTableName =3D=3D null) { return null; } - Entity ownerEntity =3D (Entity) relationshipReference.getTypeMapping(); - org.eclipse.jpt.core.context.Table ownerTable =3D ownerEntity.getTable(); - if (ownerTable =3D=3D null) { - return null; - } - = Entity targetEntity =3D relationshipMapping.getResolvedTargetEntity(); if (targetEntity =3D=3D null) { return null; } - = - org.eclipse.jpt.core.context.Table targetTable =3D targetEntity.getTable= (); - if (targetTable =3D=3D null) { + String targetTableName =3D targetEntity.getPrimaryTableName(); + if (targetTableName =3D=3D null) { return null; } - = - NamingStrategy ns =3D getJpaProject(relationshipReference).getNamingStra= tegy(); - if (getJpaProject(relationshipReference).isNamingStrategyEnabled() && ns= !=3D null){ - /* - * By testing generated DDL I have found for JPA console configuration: - * 1) first parameter of the method is always fully qualified owner ent= ity class name - * 2) second and forth parameters of the method are always fully qualif= ied target entity class name - * 3) third parameter of the method is name attribute of @Table annotat= ion, - * if it is not specified, then it is *unqualified* name attribute of= @Entity annotation - * if @Entity annotation not specified it is *unqualified* name of th= e target entity class. - * 4) fifth parameter is owner entity field name (even if @Column annot= ation set different name) - * = - */ = - try { - String targetEntityName =3D targetEntity.getPersistentType().getName(); - String ownerEntityName =3D ownerEntity.getPersistentType().getName(); - String propName =3D relationshipMapping.getPersistentAttribute().getNa= me(); - return ns.collectionTableName(ownerEntityName, targetTable.getName(), - targetEntityName, targetTable.getName(), propName); + + HibernateJpaProject hibernateJpaProject =3D (HibernateJpaProject)targetE= ntity.getJpaProject(); + NamingStrategy ns =3D hibernateJpaProject.getNamingStrategy(); = + if (ns !=3D null && hibernateJpaProject.isNamingStrategyEnabled()){ + try{ + String name =3D ns.collectionTableName( + relationshipMapping.getEntity().getPersistentType().getName(),//+ + relationshipMapping.getEntity().getTable().getName(),//+ + targetEntity.getPersistentType().getName(),//+ + targetEntity.getTable().getName(),//+ + relationshipMapping.getName()//+ + ); + /*Table primaryTable =3D relationshipMapping.getTypeMapping().getPrima= ryDbTable(); = + return primaryTable !=3D null ? primaryTable.getDatabase().convertName= ToIdentifier(name) + : name;*/ + return name; } catch (Exception e) { - Message m =3D new LocalMessage(IMessage.HIGH_SEVERITY, + Message m =3D new LocalMessage(IMessage.HIGH_SEVERITY, = Messages.NAMING_STRATEGY_EXCEPTION, new String[0], null); HibernateJptPlugin.logException(m.getText(), e); } } - return ownerTable.getName() + '_' + targetTable.getName(); + return owningTableName + '_' + targetTableName; } = - public static HibernateJpaProject getJpaProject(RelationshipReference rel= ationshipReference){ - return (HibernateJpaProject)relationshipReference.getJpaProject(); - } - = - protected static String buildDbJoinTableDefaultName(RelationshipReference= relationshipReference) { - Table owningTable =3D relationshipReference.getTypeMapping().getPrimaryD= bTable(); + protected static String buildDbJoinTableDefaultName(RelationshipMapping r= elationshipMapping) { + Table owningTable =3D relationshipMapping.getTypeMapping().getPrimaryDbT= able(); if (owningTable =3D=3D null) { return null; } - RelationshipMapping relationshipMapping =3D relationshipReference.getRel= ationshipMapping(); - if (relationshipMapping =3D=3D null) { - return null; - } Entity targetEntity =3D relationshipMapping.getResolvedTargetEntity(); if (targetEntity =3D=3D null) { return null; @@ -101,22 +87,45 @@ if (targetTable =3D=3D null) { return null; } + = + HibernateJpaProject hibernateJpaProject =3D (HibernateJpaProject)targetE= ntity.getJpaProject(); + NamingStrategy ns =3D hibernateJpaProject.getNamingStrategy(); + if (ns !=3D null && hibernateJpaProject.isNamingStrategyEnabled()){ + try { + String name =3D ns.collectionTableName( + relationshipMapping.getEntity().getPersistentType().getName(),//+ + relationshipMapping.getEntity().getTable().getName(),//+ + targetEntity.getPersistentType().getName(),//+ + targetEntity.getTable().getName(),//+ + relationshipMapping.getName()//+ + ); + //return owningTable.getDatabase().convertNameToIdentifier(name); + return name; + } catch (Exception e) { + Message m =3D new LocalMessage(IMessage.HIGH_SEVERITY, + Messages.NAMING_STRATEGY_EXCEPTION, new String[0], null); + HibernateJptPlugin.logException(m.getText(), e); + } + } String name =3D owningTable.getName() + '_' + targetTable.getName(); return owningTable.getDatabase().convertNameToIdentifier(name); } = - public static String buildJoinColumnDefaultName(JoinColumn joinColumn, Jo= inColumn.Owner owner) { + public static String buildJoinColumnDefaultName(HibernateJoinColumn joinC= olumn) { = + JoinColumn.Owner owner =3D joinColumn.getOwner(); + RelationshipMapping relationshipMapping =3D owner.getRelationshipMapping= (); + if (relationshipMapping =3D=3D null) { + return null; + } if (owner.joinColumnsSize() !=3D 1) { return null; } String prefix =3D owner.getAttributeName(); - if (prefix =3D=3D null) { - Entity targetEntity =3D owner.getTargetEntity(); - if (targetEntity =3D=3D null) { - return null; - } - prefix =3D targetEntity.getName(); + Entity targetEntity =3D owner.getTargetEntity(); + if (targetEntity =3D=3D null) { + return null; } + String targetEntityName =3D targetEntity.getName(); // not sure which of these is correct... // (the spec implies that the referenced column is always the // primary key column of the target entity) @@ -125,6 +134,40 @@ if (targetColumnName =3D=3D null) { return null; } + HibernateJpaProject hibernateJpaProject =3D (HibernateJpaProject)targetE= ntity.getJpaProject(); + NamingStrategy ns =3D hibernateJpaProject.getNamingStrategy(); + if (ns !=3D null && hibernateJpaProject.isNamingStrategyEnabled()){ + String logicalTargetColumnName =3D null; + String name =3D null; + try { + if (joinColumn.getSpecifiedName() !=3D null){ + name =3D ns.columnName(joinColumn.getSpecifiedName()); + } else { + PersistentAttribute pattr =3D joinColumn.getReferencedPersistentAttri= bute(); + if (pattr !=3D null && pattr.getMapping() instanceof ColumnMapping){ + Column column =3D ((ColumnMapping)pattr.getMapping()).getColumn(); + if (column !=3D null){ + logicalTargetColumnName =3D ns.logicalColumnName(column.getSpecifie= dName(), pattr.getName()); + } else { + logicalTargetColumnName =3D ns.logicalColumnName(null, pattr.getNam= e()); + } + } + = + name =3D ns.foreignKeyColumnName(prefix, + targetEntity.getPersistentType().getName(),//+ + targetEntity.getTable().getName(),//+ + logicalTargetColumnName);//+ + } + return name; + } catch (Exception e) { + Message m =3D new LocalMessage(IMessage.HIGH_SEVERITY, + Messages.NAMING_STRATEGY_EXCEPTION, new String[0], null); + HibernateJptPlugin.logException(m.getText(), e); + } + } + if (prefix =3D=3D null) { + prefix =3D targetEntityName; + } String name =3D prefix + '_' + targetColumnName; // not sure which of these is correct... // converting the name to an identifier will result in the identifier @@ -133,5 +176,6 @@ // return targetColumn.getDatabase().convertNameToIdentifier(name); return name; } + = = } Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropert= ies.java (from rev 22306, trunk/hibernatetools/plugins/org.jboss.tools.hibe= rnate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Pers= istenceUnitProperties.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitProperties.= java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitProperties.= java 2010-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,46 @@ +/*************************************************************************= ****** + * Copyright (c) 2008-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit.Property; +import org.eclipse.jpt.utility.model.Model; +import org.eclipse.jpt.utility.model.listener.PropertyChangeListener; + +/** + * @author Dmitry Geraskov + * + */ +public interface PersistenceUnitProperties extends Model, PropertyChangeLi= stener { + + /** + * Method used for identifying the given property. + */ + boolean itemIsProperty(Property item); + + /** + * Returns the property name used for change notification of the given pr= operty. + */ + String propertyIdFor(Property property); + = + /** + * Return the PersistenceUnit of this Properties. + */ + PersistenceUnit persistenceUnit(); + = + /** + * Return the JPA project the PersistenceUnit belongs to. + */ + JpaProject getJpaProject(); + = + void updateProperties(); +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropert= yListListener.java (from rev 22306, trunk/hibernatetools/plugins/org.jboss.= tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/co= ntext/PersistenceUnitPropertyListListener.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyLis= tListener.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/PersistenceUnitPropertyLis= tListener.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,59 @@ +/*************************************************************************= ****** + * Copyright (c) 2008-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ +package org.jboss.tools.hibernate.jpt.core.internal.context; + +import org.eclipse.jpt.utility.model.event.ListChangeEvent; +import org.eclipse.jpt.utility.model.listener.ListChangeListener; + +/** + * @author Dmitry Geraskov + * + */ +public class PersistenceUnitPropertyListListener implements ListChangeList= ener +{ + private PersistenceUnitProperties parent; + + // ********** constructors / initialization ********** + public PersistenceUnitPropertyListListener(PersistenceUnitProperties pare= nt) { + this.parent =3D parent; + } + + // ********** ListChangeListener implementation ********** + public void itemsAdded(ListChangeEvent e) { + model().updateProperties(); + } + + public void itemsRemoved(ListChangeEvent e) { + model().updateProperties(); + } + + public void itemsReplaced(ListChangeEvent e) { + model().updateProperties(); + } + + public void itemsMoved(ListChangeEvent e) { + model().updateProperties(); + } + + public void listCleared(ListChangeEvent e) { + model().updateProperties(); + } + + public void listChanged(ListChangeEvent e) { + model().updateProperties(); + } + + // ********** internal methods ********** + private PersistenceUnitProperties model() { + return this.parent; + } + +} \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/basic/BasicHibernate= Properties.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/basic/BasicHibernateProper= ties.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/basic/BasicHibernateProper= ties.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -10,13 +10,14 @@ ************************************************************************= ******/ package org.jboss.tools.hibernate.jpt.core.internal.context.basic; = -import org.eclipse.jpt.core.context.persistence.PersistenceUnitProperties; +import org.eclipse.jpt.utility.model.Model; +import org.eclipse.jpt.utility.model.listener.PropertyChangeListener; = /** * @author Dmitry Geraskov * */ -public interface BasicHibernateProperties extends PersistenceUnitPropertie= s { +public interface BasicHibernateProperties extends Model, PropertyChangeLis= tener { = String getDefaultConfigurationFile(); String getConfigurationFile(); Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateBasic.j= ava (from rev 22306, trunk/hibernatetools/plugins/org.jboss.tools.hibernate= .jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic/Hib= ernateBasic.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateBasic.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateBasic.java = 2010-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,326 @@ +/*************************************************************************= ****** + * Copyright (c) 2008 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ +package org.jboss.tools.hibernate.jpt.core.internal.context.basic; + +import java.util.Map; + +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit.Property; +import org.eclipse.jpt.utility.model.event.PropertyChangeEvent; +import org.eclipse.jpt.utility.model.value.ListValueModel; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnitProperties; + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateBasic extends HibernatePersistenceUnitProperties = + implements BasicHibernateProperties { + = + // ********** Hibernate properties ********** + private String configFile; + private String dialect; + private String driver; + private String url; + private String schemaDefault; + private String catalogDefault; + private String username; + private String password; + = + // ********** constructors ********** + public HibernateBasic(PersistenceUnit parent, ListValueModel pr= opertyListAdapter) { + super(parent, propertyListAdapter); + } + = + // ********** initialization ********** + /** + * Initializes properties with values from the persistence unit. + */ + @Override + protected void initializeProperties() { + this.configFile =3D = + this.getStringValue(HIBERNATE_CONFIG_FILE); + this.dialect =3D = + this.getStringValue(HIBERNATE_DIALECT); + this.driver =3D = + this.getStringValue(HIBERNATE_DRIVER); + this.url =3D = + this.getStringValue(HIBERNATE_URL); + this.schemaDefault =3D = + this.getStringValue(HIBERNATE_SCHEMA_DEFAULT); + this.catalogDefault =3D = + this.getStringValue(HIBERNATE_CATALOG); + this.username =3D = + this.getStringValue(HIBERNATE_USERNAME); + this.password =3D = + this.getStringValue(HIBERNATE_PASSWORD); + } = + = + + // ********** behavior ********** + @Override + protected void addPropertyNames(Map propertyNames) { + propertyNames.put( + HIBERNATE_CONFIG_FILE, + CONFIG_FILE_PROPERTY); + propertyNames.put( + HIBERNATE_DIALECT, + DIALECT_PROPERTY); = + propertyNames.put( + HIBERNATE_DRIVER, + DRIVER_PROPERTY); + propertyNames.put( + HIBERNATE_URL, + URL_PROPERTY); + propertyNames.put( + HIBERNATE_SCHEMA_DEFAULT, + SCHEMA_DEFAULT_PROPERTY); + propertyNames.put( + HIBERNATE_CATALOG, + CATALOG_DEFAULT_PROPERTY); = + propertyNames.put( + HIBERNATE_USERNAME, + USERNAME_PROPERTY); = + propertyNames.put( + HIBERNATE_PASSWORD, + PASSWORD_PROPERTY); + } + + public void propertyChanged(PropertyChangeEvent event) { + String aspectName =3D event.getAspectName(); + if (aspectName.equals(CONFIG_FILE_PROPERTY)) { + this.configurationFileChanged(event); + } else if (aspectName.equals(DIALECT_PROPERTY)) { + this.dialectChanged(event); + } else if (aspectName.equals(DRIVER_PROPERTY)) { + this.driverChanged(event); + } else if (aspectName.equals(URL_PROPERTY)) { + this.urlChanged(event); + } else if (aspectName.equals(SCHEMA_DEFAULT_PROPERTY)) { + this.schemaDefaultChanged(event); + } else if (aspectName.equals(CATALOG_DEFAULT_PROPERTY)) { + this.catalogDefaultChanged(event); + } else if (aspectName.equals(USERNAME_PROPERTY)) { + this.usernameChanged(event); + } else if (aspectName.equals(PASSWORD_PROPERTY)) { + this.passwordChanged(event); + } + } + = + // ********** Configuration File ********** + public String getDefaultConfigurationFile() { + return DEFAULT_CONFIG_FILE; + } + = + public String getConfigurationFile() { + return this.configFile; + } + = + public void setConfigurationFile(String newConfigFile) { + if (!valueWasChanged(configFile, newConfigFile)) return; + String old =3D this.configFile; + this.configFile =3D newConfigFile; + this.putProperty(CONFIG_FILE_PROPERTY, newConfigFile); + this.firePropertyChanged(CONFIG_FILE_PROPERTY, old, newConfigFile); = + } + = + private void configurationFileChanged(PropertyChangeEvent event) { + String newFile =3D (event.getNewValue() =3D=3D null) ? null : ((Property= ) event.getNewValue()).getValue(); + String old =3D this.configFile; + this.configFile =3D newFile; + this.firePropertyChanged(event.getAspectName(), old, newFile); + } + = + // ********** Dialect ********** + public String getDefaultDialect() { + return DEFAULT_DIALECT; + } + + public String getDialect() { + return this.dialect; + } + + public void setDialect(String newDialect) { + if (!valueWasChanged(dialect, newDialect)) return; + String old =3D this.dialect; + this.dialect =3D newDialect; + this.putProperty(DIALECT_PROPERTY, newDialect); + this.firePropertyChanged(DIALECT_PROPERTY, old, newDialect); + } + + private void dialectChanged(PropertyChangeEvent event) { + String newDialect =3D (event.getNewValue() =3D=3D null) ? null : ((Prope= rty) event.getNewValue()).getValue(); + String old =3D this.dialect; + this.dialect =3D newDialect; + this.firePropertyChanged(event.getAspectName(), old, newDialect); + } + + // ********** Driver ********** + public String getDefaultDriver() { + return DEFAULT_DRIVER; + } + + public String getDriver() { + return this.driver; + } = + + public void setDriver(String newDriver) { + if (!valueWasChanged(driver, newDriver)) return; + String old =3D this.driver; + this.driver =3D newDriver; + this.putProperty(DRIVER_PROPERTY, newDriver); + this.firePropertyChanged(DRIVER_PROPERTY, old, newDriver); = + } + = + private void driverChanged(PropertyChangeEvent event) { + String newDriver =3D (event.getNewValue() =3D=3D null) ? null : ((Proper= ty) event.getNewValue()).getValue(); + String old =3D this.driver; + this.driver =3D newDriver; + this.firePropertyChanged(event.getAspectName(), old, newDriver); + } + = + // ********** Url ********** + public String getDefaultUrl() { + return DEFAULT_URL; + } + + public String getUrl() { + return this.url; + } = + + public void setUrl(String newUrl) { + if (!valueWasChanged(url, newUrl)) return; + String old =3D this.url; + this.url =3D newUrl; + this.putProperty(URL_PROPERTY, newUrl); + this.firePropertyChanged(URL_PROPERTY, old, newUrl); = + } + = + private void urlChanged(PropertyChangeEvent event) { + String newUrl =3D (event.getNewValue() =3D=3D null) ? null : ((Property)= event.getNewValue()).getValue(); + String old =3D this.url; + this.url =3D newUrl; + this.firePropertyChanged(event.getAspectName(), old, newUrl); + } + = + // ********** Default schema ********** + public String getDefaultSchemaDefault() { + return DEFAULT_SCHEMA_DEFAULT; + } + = + public String getSchemaDefault() { + return schemaDefault; + } + = + public void setSchemaDefault(String newSchemaDefault) { + if (!valueWasChanged(schemaDefault, newSchemaDefault)) return; + String old =3D this.schemaDefault; + this.schemaDefault =3D newSchemaDefault; + this.putProperty(SCHEMA_DEFAULT_PROPERTY, newSchemaDefault); + this.firePropertyChanged(SCHEMA_DEFAULT_PROPERTY, old, newSchemaDefault); + } + = + private void schemaDefaultChanged(PropertyChangeEvent event) { + String newSchemaDefault =3D (event.getNewValue() =3D=3D null) ? null : (= (Property) event.getNewValue()).getValue(); + String old =3D this.schemaDefault; + this.schemaDefault =3D newSchemaDefault; + this.firePropertyChanged(event.getAspectName(), old, newSchemaDefault); + } + = + // ********** Default catalog ********** + public String getDefaultCatalogDefault() { + return DEFAULT_CATALOG_DEFAULT; + } + = + public String getCatalogDefault() { + return catalogDefault; + } + = + public void setCatalogDefault(String newCatalogDefault) { + if (!valueWasChanged(catalogDefault, newCatalogDefault)) return; + String old =3D this.catalogDefault; + this.catalogDefault =3D newCatalogDefault; + this.putProperty(CATALOG_DEFAULT_PROPERTY, newCatalogDefault); + this.firePropertyChanged(CATALOG_DEFAULT_PROPERTY, old, newCatalogDefaul= t); = + } + = + private void catalogDefaultChanged(PropertyChangeEvent event) { + String newCatalogDefault =3D (event.getNewValue() =3D=3D null) ? null : = ((Property) event.getNewValue()).getValue(); + String old =3D this.catalogDefault; + this.catalogDefault =3D newCatalogDefault; + this.firePropertyChanged(event.getAspectName(), old, newCatalogDefault); + } + = + // ********** Username ********** + public String getDefaultUsername() { + return DEFAULT_USERNAME; + } + + public String getUsername() { + return this.username; + } = + + public void setUsername(String newUsername) { + if (!valueWasChanged(username, newUsername)) return; + String old =3D this.username; + this.username =3D newUsername; + this.putProperty(USERNAME_PROPERTY, newUsername); + this.firePropertyChanged(USERNAME_PROPERTY, old, newUsername); = + } + = + private void usernameChanged(PropertyChangeEvent event) { + String newUsername =3D (event.getNewValue() =3D=3D null) ? null : ((Prop= erty) event.getNewValue()).getValue(); + String old =3D this.username; + this.username =3D newUsername; + this.firePropertyChanged(event.getAspectName(), old, newUsername); + } + = + // ********** Password ********** + public String getDefaultPassword() { + return DEFAULT_PASSWORD; + } + + public String getPassword() { + return this.password; + } + + public void setPassword(String newPassword) { + if (!valueWasChanged(password, newPassword)) return; + String old =3D this.password; + this.password =3D newPassword; + this.putProperty(PASSWORD_PROPERTY, newPassword); + this.firePropertyChanged(PASSWORD_PROPERTY, old, newPassword); + } + = + private void passwordChanged(PropertyChangeEvent event) { + String newPassword =3D (event.getNewValue() =3D=3D null) ? null : ((Prop= erty) event.getNewValue()).getValue(); + String old =3D this.password; + this.password =3D newPassword; + this.firePropertyChanged(event.getAspectName(), old, newPassword); + } + + public void updateProperties() { + setConfigurationFile(this.getStringValue(HIBERNATE_CONFIG_FILE)); + setDialect(this.getStringValue(HIBERNATE_DIALECT)); + setDriver(this.getStringValue(HIBERNATE_DRIVER)); + setUrl(this.getStringValue(HIBERNATE_URL)); + setSchemaDefault(this.getStringValue(HIBERNATE_SCHEMA_DEFAULT)); + setCatalogDefault(this.getStringValue(HIBERNATE_CATALOG)); + setUsername(this.getStringValue(HIBERNATE_USERNAME)); + setPassword(this.getStringValue(HIBERNATE_PASSWORD)); + } + = + private boolean valueWasChanged(String oldValue, String newValue){ + return oldValue =3D=3D null ? newValue !=3D null + : !oldValue.equals(newValue); + } + +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src= /org/jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateIdMappi= ng.java (from rev 22306, trunk/hibernatetools/plugins/org.jboss.tools.hiber= nate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/basic= /HibernateIdMapping.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateIdMapping.j= ava (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/basic/HibernateIdMapping.j= ava 2010-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,23 @@ +/*************************************************************************= ****** + * Copyright (c) 2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ + +package org.jboss.tools.hibernate.jpt.core.internal.context.basic; + +import org.eclipse.jpt.core.context.IdMapping; + +/** + * @author Dmitry Geraskov + * + */ +public interface HibernateIdMapping extends IdMapping { + + +} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/basic/HibernatePersis= tenceUnitProperties.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/basic/HibernatePersistence= UnitProperties.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/basic/HibernatePersistence= UnitProperties.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,309 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2008 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ************************************************************************= ******/ -package org.jboss.tools.hibernate.jpt.core.internal.context.basic; - -import java.util.Map; - -import org.eclipse.jpt.core.context.persistence.PersistenceUnit; -import org.eclipse.jpt.core.internal.context.persistence.AbstractPersisten= ceUnitProperties; - -/** - * @author Dmitry Geraskov - * - */ -public class HibernatePersistenceUnitProperties extends AbstractPersistenc= eUnitProperties = - implements BasicHibernateProperties { - = - // ********** Hibernate properties ********** - private String configFile; - private String dialect; - private String driver; - private String url; - private String schemaDefault; - private String catalogDefault; - private String username; - private String password; - = - // ********** constructors ********** - public HibernatePersistenceUnitProperties(PersistenceUnit parent) { - super(parent); - } - = - // ********** initialization ********** - /** - * Initializes properties with values from the persistence unit. - */ - @Override - protected void initializeProperties() { - this.configFile =3D = - this.getStringValue(HIBERNATE_CONFIG_FILE); - this.dialect =3D = - this.getStringValue(HIBERNATE_DIALECT); - this.driver =3D = - this.getStringValue(HIBERNATE_DRIVER); - this.url =3D = - this.getStringValue(HIBERNATE_URL); - this.schemaDefault =3D = - this.getStringValue(HIBERNATE_SCHEMA_DEFAULT); - this.catalogDefault =3D = - this.getStringValue(HIBERNATE_CATALOG); - this.username =3D = - this.getStringValue(HIBERNATE_USERNAME); - this.password =3D = - this.getStringValue(HIBERNATE_PASSWORD); - } - = - public void propertyValueChanged(String propertyName, String newValue) { - if (propertyName.equals(HIBERNATE_CONFIG_FILE)) { - this.configurationFileChanged(newValue); - } else if (propertyName.equals(HIBERNATE_DIALECT)) { - this.dialectChanged(newValue); - } else if (propertyName.equals(HIBERNATE_DRIVER)) { - this.driverChanged(newValue); - } else if (propertyName.equals(HIBERNATE_URL)) { - this.urlChanged(newValue); - } else if (propertyName.equals(HIBERNATE_SCHEMA_DEFAULT)) { - this.schemaDefaultChanged(newValue); - } else if (propertyName.equals(HIBERNATE_CATALOG)) { - this.catalogDefaultChanged(newValue); - } else if (propertyName.equals(HIBERNATE_USERNAME)) { - this.usernameChanged(newValue); - } else if (propertyName.equals(HIBERNATE_PASSWORD)) { - this.passwordChanged(newValue); - } - } - = - public void propertyRemoved(String propertyName) { - if (propertyName.equals(CONFIG_FILE_PROPERTY)) { - this.configurationFileChanged(null); - } else if (propertyName.equals(DIALECT_PROPERTY)) { - this.dialectChanged(null); - } else if (propertyName.equals(DRIVER_PROPERTY)) { - this.driverChanged(null); - } else if (propertyName.equals(URL_PROPERTY)) { - this.urlChanged(null); - } else if (propertyName.equals(SCHEMA_DEFAULT_PROPERTY)) { - this.schemaDefaultChanged(null); - } else if (propertyName.equals(CATALOG_DEFAULT_PROPERTY)) { - this.catalogDefaultChanged(null); - } else if (propertyName.equals(USERNAME_PROPERTY)) { - this.usernameChanged(null); - } else if (propertyName.equals(PASSWORD_PROPERTY)) { - this.passwordChanged(null); - } - } - = - @Override - protected void addPropertyNames(Map propertyNames) { - propertyNames.put( - HIBERNATE_CONFIG_FILE, - CONFIG_FILE_PROPERTY); - propertyNames.put( - HIBERNATE_DIALECT, - DIALECT_PROPERTY); = - propertyNames.put( - HIBERNATE_DRIVER, - DRIVER_PROPERTY); - propertyNames.put( - HIBERNATE_URL, - URL_PROPERTY); - propertyNames.put( - HIBERNATE_SCHEMA_DEFAULT, - SCHEMA_DEFAULT_PROPERTY); - propertyNames.put( - HIBERNATE_CATALOG, - CATALOG_DEFAULT_PROPERTY); = - propertyNames.put( - HIBERNATE_USERNAME, - USERNAME_PROPERTY); = - propertyNames.put( - HIBERNATE_PASSWORD, - PASSWORD_PROPERTY); - } - - = - // ********** Configuration File ********** - public String getDefaultConfigurationFile() { - return DEFAULT_CONFIG_FILE; - } - = - public String getConfigurationFile() { - return this.configFile; - } - = - public void setConfigurationFile(String newConfigFile) { - String old =3D this.configFile; - this.configFile =3D newConfigFile; - this.putProperty(CONFIG_FILE_PROPERTY, newConfigFile); - this.firePropertyChanged(CONFIG_FILE_PROPERTY, old, newConfigFile); = - } - = - private void configurationFileChanged(String newFile) { - String old =3D this.configFile; - this.configFile =3D newFile; - this.firePropertyChanged(CONFIG_FILE_PROPERTY, old, newFile); - } - = - // ********** Dialect ********** - public String getDefaultDialect() { - return DEFAULT_DIALECT; - } - - public String getDialect() { - return this.dialect; - } - - public void setDialect(String newDialect) { - String old =3D this.dialect; - this.dialect =3D newDialect; - this.putProperty(DIALECT_PROPERTY, newDialect); - this.firePropertyChanged(DIALECT_PROPERTY, old, newDialect); - } - - private void dialectChanged(String newDialect) { - String old =3D this.dialect; - this.dialect =3D newDialect; - this.firePropertyChanged(DIALECT_PROPERTY, old, newDialect); - } - - // ********** Driver ********** - public String getDefaultDriver() { - return DEFAULT_DRIVER; - } - - public String getDriver() { - return this.driver; - } = - - public void setDriver(String newDriver) { - String old =3D this.driver; - this.driver =3D newDriver; - this.putProperty(DRIVER_PROPERTY, newDriver); - this.firePropertyChanged(DRIVER_PROPERTY, old, newDriver); = - } - = - private void driverChanged(String newDriver) { - String old =3D this.driver; - this.driver =3D newDriver; - this.firePropertyChanged(DRIVER_PROPERTY, old, newDriver); - } - = - // ********** Url ********** - public String getDefaultUrl() { - return DEFAULT_URL; - } - - public String getUrl() { - return this.url; - } = - - public void setUrl(String newUrl) { - String old =3D this.url; - this.url =3D newUrl; - this.putProperty(URL_PROPERTY, newUrl); - this.firePropertyChanged(URL_PROPERTY, old, newUrl); = - } - = - private void urlChanged(String newUrl) { - String old =3D this.url; - this.url =3D newUrl; - this.firePropertyChanged(URL_PROPERTY, old, newUrl); - } - = - // ********** Default schema ********** - public String getDefaultSchemaDefault() { - return DEFAULT_SCHEMA_DEFAULT; - } - = - public String getSchemaDefault() { - return schemaDefault; - } - = - public void setSchemaDefault(String newSchemaDefault) { - String old =3D this.schemaDefault; - this.schemaDefault =3D newSchemaDefault; - this.putProperty(SCHEMA_DEFAULT_PROPERTY, newSchemaDefault); - this.firePropertyChanged(SCHEMA_DEFAULT_PROPERTY, old, newSchemaDefault); - } - = - private void schemaDefaultChanged(String newSchemaDefault) { - String old =3D this.schemaDefault; - this.schemaDefault =3D newSchemaDefault; - this.firePropertyChanged(SCHEMA_DEFAULT_PROPERTY, old, newSchemaDefault); - } - = - // ********** Default catalog ********** - public String getDefaultCatalogDefault() { - return DEFAULT_CATALOG_DEFAULT; - } - = - public String getCatalogDefault() { - return catalogDefault; - } - = - public void setCatalogDefault(String newCatalogDefault) { - String old =3D this.catalogDefault; - this.catalogDefault =3D newCatalogDefault; - this.putProperty(CATALOG_DEFAULT_PROPERTY, newCatalogDefault); - this.firePropertyChanged(CATALOG_DEFAULT_PROPERTY, old, newCatalogDefaul= t); = - } - = - private void catalogDefaultChanged(String newCatalogDefault) { - String old =3D this.catalogDefault; - this.catalogDefault =3D newCatalogDefault; - this.firePropertyChanged(CATALOG_DEFAULT_PROPERTY, old, newCatalogDefaul= t); - } - = - // ********** Username ********** - public String getDefaultUsername() { - return DEFAULT_USERNAME; - } - - public String getUsername() { - return this.username; - } = - - public void setUsername(String newUsername) { - String old =3D this.username; - this.username =3D newUsername; - this.putProperty(USERNAME_PROPERTY, newUsername); - this.firePropertyChanged(USERNAME_PROPERTY, old, newUsername); = - } - = - private void usernameChanged(String newUsername) { - String old =3D this.username; - this.username =3D newUsername; - this.firePropertyChanged(USERNAME_PROPERTY, old, newUsername); - } - = - // ********** Password ********** - public String getDefaultPassword() { - return DEFAULT_PASSWORD; - } - - public String getPassword() { - return this.password; - } - - public void setPassword(String newPassword) { - String old =3D this.password; - this.password =3D newPassword; - this.putProperty(PASSWORD_PROPERTY, newPassword); - this.firePropertyChanged(PASSWORD_PROPERTY, old, newPassword); - } - = - private void passwordChanged(String newPassword) { - String old =3D this.password; - this.password =3D newPassword; - this.firePropertyChanged(PASSWORD_PROPERTY, old, newPassword); - } - -} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/java/ForeignKeyImpl.j= ava =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/ForeignKeyImpl.java 2= 010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/ForeignKeyImpl.java 2= 010-05-26 13:13:34 UTC (rev 22326) @@ -1,94 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2009 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ - -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNo= de; -import org.eclipse.jpt.core.utility.TextRange; -import org.jboss.tools.hibernate.jpt.core.internal.context.ForeignKey; - -/** - * @author Dmitry Geraskov - * - */ -public class ForeignKeyImpl extends AbstractJavaJpaContextNode implements = ForeignKey { - - private ForeignKeyAnnotation foreignKeyResource; - = - private String name; - = - private String inverseName; - - public ForeignKeyImpl(JavaJpaContextNode parent) { - super(parent); - } - - public void initialize(ForeignKeyAnnotation foreignKeyResource) { - this.foreignKeyResource =3D foreignKeyResource; - this.name =3D foreignKeyResource.getName(); - this.inverseName =3D foreignKeyResource.getInverseName(); - } - = - public void update(ForeignKeyAnnotation foreignKeyResource) { - this.foreignKeyResource =3D foreignKeyResource; - this.setName_(foreignKeyResource.getName()); - this.setInverseName_(foreignKeyResource.getInverseName()); - } - = - private ForeignKeyAnnotation getResourceForeignKey() { - return foreignKeyResource; - } - - // ***** name - = - public String getName() { - return name; - } - = - public void setName(String name) { - String old =3D this.name; - this.name =3D name; - this.getResourceForeignKey().setName(name); - this.firePropertyChanged(FOREIGN_KEY_NAME, old, name); - } - = - public void setName_(String name) { - String old =3D this.name; - this.name =3D name; - this.firePropertyChanged(FOREIGN_KEY_NAME, old, name); - } - = - // ***** inverseName - = - public String getInverseName() { - return inverseName; - } - = - public void setInverseName(String inverseName) { - String old =3D this.inverseName; - this.inverseName =3D inverseName; - this.getResourceForeignKey().setInverseName(inverseName); - this.firePropertyChanged(FOREIGN_KEY_INVERSE_NAME, old, inverseName); - } - = - public void setInverseName_(String inverseName) { - String old =3D this.inverseName; - this.inverseName =3D inverseName; - this.firePropertyChanged(FOREIGN_KEY_INVERSE_NAME, old, inverseName); - } - - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.foreignKeyResource.getTextRange(astRoot); - } - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaBa= sicMappingImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaBasicMap= pingImpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaBasicMap= pingImpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -11,13 +11,16 @@ = package org.jboss.tools.hibernate.jpt.core.internal.context.java; = -import java.util.Vector; +import java.util.Iterator; = import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.core.internal.context.java.AbstractJavaBasicMapping; +import org.eclipse.jpt.core.resource.java.JPA; +import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; import org.jboss.tools.hibernate.jpt.core.internal.context.Generated; import org.jboss.tools.hibernate.jpt.core.internal.context.GenerationTime; +import org.jboss.tools.hibernate.jpt.core.internal.context.Index; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Generated= Annotation; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.IndexAnno= tation; @@ -31,16 +34,20 @@ = protected GenerationTime specifiedGenerationTime; = - protected JavaIndex index; + protected Index index; = public HibernateJavaBasicMappingImpl(JavaPersistentAttribute parent) { super(parent); } = - @Override - public void addSupportingAnnotationNamesTo(Vector names) { - names.add(Hibernate.GENERATED); - names.add(Hibernate.INDEX); + public Iterator supportingAnnotationNames() { + return new ArrayIterator( + JPA.COLUMN, + JPA.LOB, + JPA.TEMPORAL, + JPA.ENUMERATED, + Hibernate.GENERATED, + Hibernate.INDEX); } = @Override @@ -63,15 +70,15 @@ } = public GeneratedAnnotation getResourceGenerated() { - return (GeneratedAnnotation) getResourcePersistentAttribute().getAnnotat= ion(GeneratedAnnotation.ANNOTATION_NAME); + return (GeneratedAnnotation) getResourcePersistentAttribute().getSupport= ingAnnotation(GeneratedAnnotation.ANNOTATION_NAME); } = public GeneratedAnnotation addResourceGenerated() { - return (GeneratedAnnotation) getResourcePersistentAttribute().addAnnotat= ion(GeneratedAnnotation.ANNOTATION_NAME); + return (GeneratedAnnotation) getResourcePersistentAttribute().addSupport= ingAnnotation(GeneratedAnnotation.ANNOTATION_NAME); } = public void removeResourceGenerated() { - getResourcePersistentAttribute().removeAnnotation(GeneratedAnnotation.AN= NOTATION_NAME); + getResourcePersistentAttribute().removeSupportingAnnotation(GeneratedAnn= otation.ANNOTATION_NAME); } = protected GenerationTime getResourceGenerationTime(){ @@ -102,9 +109,11 @@ this.specifiedGenerationTime =3D newGenerationTime; firePropertyChanged(Generated.GENERATION_TIME_PROPERTY, oldValue, newGen= erationTime); } + + = public void removeResourceIndex() { - getResourcePersistentAttribute().removeAnnotation(IndexAnnotation.ANNOTA= TION_NAME); + getResourcePersistentAttribute().removeSupportingAnnotation(IndexAnnotat= ion.ANNOTATION_NAME); } = // *** index @@ -133,23 +142,23 @@ } } = - public JavaIndex addIndex() { + public Index addIndex() { if (getIndex() !=3D null) { throw new IllegalStateException("index already exists"); //$NON-NLS-1$ } this.index =3D getJpaFactory().buildIndex(this); - IndexAnnotation indexResource =3D (IndexAnnotation) getResourcePersisten= tAttribute().addAnnotation(IndexAnnotation.ANNOTATION_NAME); + IndexAnnotation indexResource =3D (IndexAnnotation) getResourcePersisten= tAttribute().addSupportingAnnotation(IndexAnnotation.ANNOTATION_NAME); this.index.initialize(indexResource); firePropertyChanged(INDEX_PROPERTY, null, this.index); return this.index; } = - public JavaIndex getIndex() { + public Index getIndex() { return this.index; } = - protected void setIndex(JavaIndex newIndex) { - JavaIndex oldIndex =3D this.index; + protected void setIndex(Index newIndex) { + Index oldIndex =3D this.index; this.index =3D newIndex; firePropertyChanged(INDEX_PROPERTY, oldIndex, newIndex); } @@ -158,20 +167,20 @@ if (getIndex() =3D=3D null) { throw new IllegalStateException("index does not exist, cannot be remove= d"); //$NON-NLS-1$ } - JavaIndex oldIndex =3D this.index; + Index oldIndex =3D this.index; this.index =3D null; - this.getResourcePersistentAttribute().removeAnnotation(IndexAnnotation.A= NNOTATION_NAME); + this.getResourcePersistentAttribute().removeSupportingAnnotation(IndexAn= notation.ANNOTATION_NAME); firePropertyChanged(INDEX_PROPERTY, oldIndex, null); } = - protected JavaIndex buildIndex(IndexAnnotation indexResource) { - JavaIndex index =3D getJpaFactory().buildIndex(this); + protected Index buildIndex(IndexAnnotation indexResource) { + Index index =3D getJpaFactory().buildIndex(this); index.initialize(indexResource); return index; } = protected IndexAnnotation getResourceIndex() { - return (IndexAnnotation) this.getResourcePersistentAttribute().getAnnota= tion(IndexAnnotation.ANNOTATION_NAME); + return (IndexAnnotation) this.getResourcePersistentAttribute().getSuppor= tingAnnotation(IndexAnnotation.ANNOTATION_NAME); } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaCo= lumnImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnIm= pl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaColumnIm= pl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -10,9 +10,9 @@ *************************************************************************= *****/ package org.jboss.tools.hibernate.jpt.core.internal.context.java; = -import org.eclipse.jpt.core.context.java.JavaBaseColumn; +import org.eclipse.jpt.core.context.java.JavaColumn; import org.eclipse.jpt.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaColumn; +import org.eclipse.jpt.core.internal.context.java.GenericJavaColumn; import org.eclipse.jpt.core.resource.java.ColumnAnnotation; import org.eclipse.jpt.db.Column; import org.eclipse.jpt.db.Table; @@ -21,8 +21,8 @@ import org.hibernate.cfg.NamingStrategy; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; +import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; -import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; = /** * @author Dmitry Geraskov @@ -30,7 +30,7 @@ */ public class HibernateJavaColumnImpl extends GenericJavaColumn implements = HibernateJavaColumn { = - public HibernateJavaColumnImpl(JavaJpaContextNode parent, JavaBaseColumn.= Owner owner) { + public HibernateJavaColumnImpl(JavaJpaContextNode parent, JavaColumn.Owne= r owner) { super(parent, owner); } = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaDi= scriminatorColumnImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaDiscrimi= natorColumnImpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaDiscrimi= natorColumnImpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -16,7 +16,7 @@ import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.java.JavaDiscriminatorColumn; import org.eclipse.jpt.core.context.java.JavaEntity; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaDiscrimi= natorColumn; +import org.eclipse.jpt.core.internal.context.java.GenericJavaDiscriminator= Column; import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessag= es; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.db.Column; @@ -27,8 +27,8 @@ import org.hibernate.cfg.NamingStrategy; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; +import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; -import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; = /** * @author Dmitry Geraskov Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEn= tity.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntity.j= ava 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntity.j= ava 2010-05-26 13:13:34 UTC (rev 22326) @@ -20,8 +20,6 @@ */ public interface HibernateJavaEntity extends JavaEntity, HibernateEntity, ForeignKeyHolder{ - = - HibernateJavaGeneratorContainer getGeneratorContainer(); = JavaDiscriminatorFormula getDiscriminatorFormula(); = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEn= tityImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityIm= pl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaEntityIm= pl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -10,39 +10,50 @@ *************************************************************************= *****/ package org.jboss.tools.hibernate.jpt.core.internal.context.java; = +import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.ListIterator; = import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.BaseJoinColumn; import org.eclipse.jpt.core.context.Entity; -import org.eclipse.jpt.core.context.NamedColumn; import org.eclipse.jpt.core.context.Table; import org.eclipse.jpt.core.context.TypeMapping; import org.eclipse.jpt.core.context.java.JavaBaseJoinColumn; +import org.eclipse.jpt.core.context.java.JavaGenerator; import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaQuery; +import org.eclipse.jpt.core.context.java.JavaBaseJoinColumn.Owner; import org.eclipse.jpt.core.internal.context.java.AbstractJavaEntity; -import org.eclipse.jpt.core.internal.jpa2.context.java.NullJavaCacheable2_= 0; -import org.eclipse.jpt.core.jpa2.context.java.JavaCacheable2_0; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; +import org.eclipse.jpt.core.resource.java.NestableAnnotation; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.utility.Filter; -import org.eclipse.jpt.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.utility.internal.CollectionTools; +import org.eclipse.jpt.utility.internal.iterators.ArrayIterator; +import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; +import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; import org.eclipse.jpt.utility.internal.iterators.TransformationIterator; -import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; -import org.hibernate.cfg.NamingStrategy; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; -import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.ForeignKey; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= r; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedN= ativeQuery; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQ= uery; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateTable; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Discrimin= atorFormulaAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.GenericGe= neratorAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.GenericGe= neratorsAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedNativeQueriesAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedNativeQueryAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedQueriesAnnotation; +import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedQueryAnnotation; = /** * @author Dmitry Geraskov @@ -52,24 +63,29 @@ implements HibernateJavaEntity { = protected JavaDiscriminatorFormula discriminatorFormula; + + protected final List genericGenerators; = - protected JavaCacheable2_0 cachable; + protected final List hibernateNamedQueries; = + protected final List hibernateNamedNativeQueri= es; + = protected ForeignKey foreignKey; = public HibernateJavaEntityImpl(JavaPersistentType parent) { super(parent); - this.cachable =3D buildJavaCachable(); + this.genericGenerators =3D new ArrayList(); + this.hibernateNamedQueries =3D new ArrayList(); + this.hibernateNamedNativeQueries =3D new ArrayList(); } = - protected JavaCacheable2_0 buildJavaCachable() { - return new NullJavaCacheable2_0(this); - } - @Override public void initialize(JavaResourcePersistentType resourcePersistentType)= { super.initialize(resourcePersistentType); this.initializeDiscriminatorFormula(); + this.initializeGenericGenerators(); + this.initializeHibernateNamedQueries(); + this.initializeHibernateNamedNativeQueries(); this.initializeForeignKey(); } = @@ -77,8 +93,11 @@ public void update(JavaResourcePersistentType resourcePersistentType) { super.update(resourcePersistentType); this.updateDiscriminatorFormula(); + this.updateGenericGenerators(); + this.updateHibernateNamedQueries(); + this.updateHibernateNamedNativeQueries(); this.updateForeignKey(); - } + } = = protected HibernateJpaFactory getJpaFactory() { return (HibernateJpaFactory) this.getJpaPlatform().getJpaFactory(); @@ -89,26 +108,29 @@ return (HibernateJpaProject) super.getJpaProject(); } = - protected static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY2 =3D ne= w String[] { - Hibernate.GENERIC_GENERATOR, - Hibernate.GENERIC_GENERATORS, = - Hibernate.NAMED_QUERY, - Hibernate.NAMED_QUERIES, - Hibernate.NAMED_NATIVE_QUERY, - Hibernate.NAMED_NATIVE_QUERIES, - Hibernate.DISCRIMINATOR_FORMULA, - Hibernate.FOREIGN_KEY - }; + @SuppressWarnings("unchecked") + @Override + public Iterator queries() { + return new CompositeIterator( + super.queries(), + this.hibernateNamedQueries(), + this.hibernateNamedNativeQueries()); + } = - protected static final Iterable SUPPORTING_ANNOTATION_NAMES2 =3D = new ArrayIterable(SUPPORTING_ANNOTATION_NAMES_ARRAY2); - = - = @SuppressWarnings("unchecked") @Override - public Iterable getSupportingAnnotationNames() { - return new CompositeIterable( - SUPPORTING_ANNOTATION_NAMES2, - super.getSupportingAnnotationNames()); + public Iterator correspondingAnnotationNames() { + return new CompositeIterator( + new ArrayIterator( + Hibernate.GENERIC_GENERATOR, + Hibernate.GENERIC_GENERATORS, = + Hibernate.NAMED_QUERY, + Hibernate.NAMED_QUERIES, + Hibernate.NAMED_NATIVE_QUERY, + Hibernate.NAMED_NATIVE_QUERIES, + Hibernate.DISCRIMINATOR_FORMULA, + Hibernate.FOREIGN_KEY), + super.correspondingAnnotationNames()); } = public HibernateJavaTable getTable() { @@ -131,7 +153,7 @@ throw new IllegalStateException("discriminatorFormula already exists");= //$NON-NLS-1$ } this.discriminatorFormula =3D getJpaFactory().buildJavaDiscriminatorForm= ula(this); - DiscriminatorFormulaAnnotation discriminatorFormulaResource =3D (Discrim= inatorFormulaAnnotation) this.javaResourcePersistentType.addAnnotation(Disc= riminatorFormulaAnnotation.ANNOTATION_NAME); + DiscriminatorFormulaAnnotation discriminatorFormulaResource =3D (Discrim= inatorFormulaAnnotation) this.javaResourcePersistentType.addSupportingAnnot= ation(DiscriminatorFormulaAnnotation.ANNOTATION_NAME); this.discriminatorFormula.initialize(discriminatorFormulaResource); firePropertyChanged(DISCRIMINATOR_FORMULA_PROPERTY, null, this.discrimin= atorFormula); return this.discriminatorFormula; @@ -143,7 +165,7 @@ } JavaDiscriminatorFormula oldDiscriminatorFormula =3D this.discriminatorF= ormula; this.discriminatorFormula =3D null; - this.javaResourcePersistentType.removeAnnotation(DiscriminatorFormulaAnn= otation.ANNOTATION_NAME); + this.javaResourcePersistentType.removeSupportingAnnotation(Discriminator= FormulaAnnotation.ANNOTATION_NAME); firePropertyChanged(DISCRIMINATOR_FORMULA_PROPERTY, oldDiscriminatorForm= ula,null); } = @@ -172,7 +194,7 @@ } = public DiscriminatorFormulaAnnotation getDiscriminatorFormulaResource() { - return (DiscriminatorFormulaAnnotation) this.javaResourcePersistentType.= getAnnotation(DiscriminatorFormulaAnnotation.ANNOTATION_NAME); + return (DiscriminatorFormulaAnnotation) this.javaResourcePersistentType.= getSupportingAnnotation(DiscriminatorFormulaAnnotation.ANNOTATION_NAME); } = protected JavaDiscriminatorFormula buildDiscriminatorFormula(Discriminato= rFormulaAnnotation discriminatorFormulaResource) { @@ -180,7 +202,253 @@ discriminatorFormula.initialize(discriminatorFormulaResource); return discriminatorFormula; } + // ********************* GenericGenerators ************** = + public GenericGenerator addGenericGenerator(int index) { + JavaGenericGenerator newGenericGenerator =3D getJpaFactory().buildJavaGe= nericGenerator(this); + this.genericGenerators.add(newGenericGenerator); + GenericGeneratorAnnotation genericGeneratorAnnotation =3D (GenericGenera= torAnnotation)this.javaResourcePersistentType + .addSupportingAnnotation(index, GenericGeneratorAnnotation.ANNOTATION_N= AME, GenericGeneratorsAnnotation.ANNOTATION_NAME); + newGenericGenerator.initialize(genericGeneratorAnnotation); + fireItemAdded(GENERIC_GENERATORS_LIST, index, newGenericGenerator); + return newGenericGenerator; + } + = + protected void addGenericGenerator(JavaGenericGenerator genericGenerator)= { + this.addGenericGenerator(genericGeneratorsSize(), genericGenerator); + } + = + protected void addGenericGenerator(int index, JavaGenericGenerator generi= cGenerator) { + addItemToList(index, genericGenerator, this.genericGenerators, GENERIC_G= ENERATORS_LIST); + } + + @SuppressWarnings("unchecked") + public ListIterator genericGenerators() { + return new CloneListIterator(genericGenerators); + } + + public int genericGeneratorsSize() { + return this.genericGenerators.size(); + } + + public void moveGenericGenerator(int targetIndex, int sourceIndex) { + CollectionTools.move(this.genericGenerators, targetIndex, sourceIndex); + this.javaResourcePersistentType.moveSupportingAnnotation(targetIndex, so= urceIndex, GenericGeneratorAnnotation.ANNOTATION_NAME); + fireItemMoved(GENERIC_GENERATORS_LIST, targetIndex, sourceIndex); = + } + + public void removeGenericGenerator(int index) { + JavaGenericGenerator removedGenericGenerator =3D this.genericGenerators.= remove(index); + this.javaResourcePersistentType.removeSupportingAnnotation(index, Generi= cGeneratorAnnotation.ANNOTATION_NAME, GenericGeneratorsAnnotation.ANNOTATIO= N_NAME); + fireItemRemoved(GENERIC_GENERATORS_LIST, index, removedGenericGenerator); + } + + public void removeGenericGenerator(GenericGenerator generator) { + removeGenericGenerator(this.genericGenerators.indexOf(generator)); = + } + + protected void removeGenericGenerator_(JavaGenericGenerator generator) { + removeItemFromList(generator, this.genericGenerators, GENERIC_GENERATORS= _LIST); + } + + protected void initializeGenericGenerators() { + for (ListIterator stream =3D this.javaResourcePersis= tentType.supportingAnnotations(GenericGeneratorAnnotation.ANNOTATION_NAME, = GenericGeneratorsAnnotation.ANNOTATION_NAME); stream.hasNext(); ) { + this.genericGenerators.add(buildGenericGenerator((GenericGeneratorAnnot= ation) stream.next())); + } + } + = + protected JavaGenericGenerator buildGenericGenerator(GenericGeneratorAnno= tation genericGeneratorResource) { + JavaGenericGenerator generator =3D getJpaFactory().buildJavaGenericGener= ator(this); + generator.initialize(genericGeneratorResource); + return generator; + } + = + @Override + protected void addGeneratorsTo(ArrayList generators) { + super.addGeneratorsTo(generators); + for (JavaGenericGenerator genericGenerator : genericGenerators) { + generators.add(genericGenerator); + } + } + = + protected void updateGenericGenerators() { + ListIterator genericGenerators =3D genericGenerato= rs(); + ListIterator resourceGenericGenerators =3D this.java= ResourcePersistentType.supportingAnnotations(GenericGeneratorAnnotation.ANN= OTATION_NAME, GenericGeneratorsAnnotation.ANNOTATION_NAME); + + while (genericGenerators.hasNext()) { + JavaGenericGenerator genericGenerator =3D genericGenerators.next(); + if (resourceGenericGenerators.hasNext()) { + genericGenerator.update((GenericGeneratorAnnotation) resourceGenericGe= nerators.next()); + } + else { + removeGenericGenerator_(genericGenerator); + } + } + + while (resourceGenericGenerators.hasNext()) { + addGenericGenerator(buildGenericGenerator((GenericGeneratorAnnotation) = resourceGenericGenerators.next())); + } + } + // ********************* NamedQuery ************** + public ListIterator hibernateNamedQueries() { + return new CloneListIterator(this.hibernateNamedQue= ries); + } + = + public int hibernateNamedQueriesSize() { + return this.hibernateNamedQueries.size(); + } + = + protected void initializeHibernateNamedQueries() { + for (ListIterator stream =3D this.javaResourcePersis= tentType.supportingAnnotations(HibernateNamedQueryAnnotation.ANNOTATION_NAM= E, HibernateNamedQueriesAnnotation.ANNOTATION_NAME); stream.hasNext(); ) { + this.hibernateNamedQueries.add(buildHibernateNamedQuery((HibernateNamed= QueryAnnotation) stream.next())); + } + } + = + protected HibernateNamedQuery buildHibernateNamedQuery(HibernateNamedQuer= yAnnotation namedQueryResource) { + HibernateNamedQuery hibernateNamedQuery =3D getJpaFactory().buildHiberna= teNamedQuery(this); + hibernateNamedQuery.initialize(namedQueryResource); + return hibernateNamedQuery; + } + = + protected void updateHibernateNamedQueries() { + ListIterator queries =3D hibernateNamedQueries(); + ListIterator resourceNamedQueries =3D this.javaResou= rcePersistentType.supportingAnnotations(HibernateNamedQueryAnnotation.ANNOT= ATION_NAME, HibernateNamedQueriesAnnotation.ANNOTATION_NAME); + = + while (queries.hasNext()) { + HibernateNamedQuery hibernateNamedQuery =3D queries.next(); + if (resourceNamedQueries.hasNext()) { + hibernateNamedQuery.update((HibernateNamedQueryAnnotation) resourceNam= edQueries.next()); + } + else { + removeHibernateNamedQuery_(hibernateNamedQuery); + } + } + = + while (resourceNamedQueries.hasNext()) { + addHibernateNamedQuery(buildHibernateNamedQuery((HibernateNamedQueryAnn= otation) resourceNamedQueries.next())); + } + } + = + public HibernateNamedQuery addHibernateNamedQuery(int index) { + HibernateNamedQuery hibernateNamedQuery =3D getJpaFactory().buildHiberna= teNamedQuery(this); + this.hibernateNamedQueries.add(index, hibernateNamedQuery); + HibernateNamedQueryAnnotation hibernateNamedQueryAnnotation =3D (Hiberna= teNamedQueryAnnotation) this.javaResourcePersistentType + .addSupportingAnnotation(index, HibernateNamedQueryAnnotation.ANNOTATIO= N_NAME, HibernateNamedQueriesAnnotation.ANNOTATION_NAME); + hibernateNamedQuery.initialize(hibernateNamedQueryAnnotation); + fireItemAdded(HIBERNATE_NAMED_QUERIES_LIST, index, hibernateNamedQuery); + return hibernateNamedQuery; + } + = + protected void addHibernateNamedQuery(int index, HibernateNamedQuery hibe= rnateNamedQuery) { + addItemToList(index, hibernateNamedQuery, this.hibernateNamedQueries, HI= BERNATE_NAMED_QUERIES_LIST); + } + = + protected void addHibernateNamedQuery(HibernateNamedQuery hibernateNamedQ= uery) { + this.addHibernateNamedQuery(this.hibernateNamedQueries.size(), hibernate= NamedQuery); + } + = + public void removeHibernateNamedQuery(HibernateNamedQuery hibernateNamedQ= uery) { + removeHibernateNamedQuery(this.hibernateNamedQueries.indexOf(hibernateNa= medQuery)); + } + = + public void removeHibernateNamedQuery(int index) { + HibernateNamedQuery removedHibernateNamedQuery =3D this.hibernateNamedQu= eries.remove(index); + this.javaResourcePersistentType.removeSupportingAnnotation(index, Hibern= ateNamedQueryAnnotation.ANNOTATION_NAME, HibernateNamedQueriesAnnotation.AN= NOTATION_NAME); + fireItemRemoved(HIBERNATE_NAMED_QUERIES_LIST, index, removedHibernateNam= edQuery); + } = + = + protected void removeHibernateNamedQuery_(HibernateNamedQuery hibernateNa= medQuery) { + removeItemFromList(hibernateNamedQuery, this.hibernateNamedQueries, HIBE= RNATE_NAMED_QUERIES_LIST); + } + = + public void moveHibernateNamedQuery(int targetIndex, int sourceIndex) { + CollectionTools.move(this.hibernateNamedQueries, targetIndex, sourceInde= x); + this.javaResourcePersistentType.moveSupportingAnnotation(targetIndex, so= urceIndex, HibernateNamedQueriesAnnotation.ANNOTATION_NAME); + fireItemMoved(HIBERNATE_NAMED_QUERIES_LIST, targetIndex, sourceIndex); = + } + = + // ********************* NamedNativeQuery ************** + public ListIterator hibernateNamedNativeQuerie= s() { + return new CloneListIterator(this.hibernateNa= medNativeQueries); + } + = + public int hibernateNamedNativeQueriesSize() { + return this.hibernateNamedNativeQueries.size(); + } + = + protected void initializeHibernateNamedNativeQueries() { + for (ListIterator stream =3D this.javaResourcePersis= tentType.supportingAnnotations(HibernateNamedNativeQueryAnnotation.ANNOTATI= ON_NAME, HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); stream.has= Next(); ) { + this.hibernateNamedNativeQueries.add(buildHibernateNamedNativeQuery((Hi= bernateNamedNativeQueryAnnotation) stream.next())); + } + } + = + protected HibernateNamedNativeQuery buildHibernateNamedNativeQuery(Hibern= ateNamedNativeQueryAnnotation namedQueryResource) { + HibernateNamedNativeQuery hibernateNamedNativeQuery =3D getJpaFactory().= buildHibernateNamedNativeQuery(this); + hibernateNamedNativeQuery.initialize(namedQueryResource); + return hibernateNamedNativeQuery; + } + = + protected void updateHibernateNamedNativeQueries() { + ListIterator queries =3D hibernateNamedNative= Queries(); + ListIterator resourceNamedNativeQueries =3D this.jav= aResourcePersistentType.supportingAnnotations(HibernateNamedNativeQueryAnno= tation.ANNOTATION_NAME, HibernateNamedNativeQueriesAnnotation.ANNOTATION_NA= ME); + = + while (queries.hasNext()) { + HibernateNamedNativeQuery hibernateNamedNativeQuery =3D queries.next(); + if (resourceNamedNativeQueries.hasNext()) { + hibernateNamedNativeQuery.update((HibernateNamedNativeQueryAnnotation)= resourceNamedNativeQueries.next()); + } + else { + removeHibernateNamedNativeQuery_(hibernateNamedNativeQuery); + } + } + = + while (resourceNamedNativeQueries.hasNext()) { + Object test =3D resourceNamedNativeQueries.next(); + if (!(test instanceof HibernateNamedNativeQueryAnnotation)){ + System.out.println("error!");//$NON-NLS-1$ + } + addHibernateNamedNativeQuery(buildHibernateNamedNativeQuery((HibernateN= amedNativeQueryAnnotation) test)); + } + } + = + public HibernateNamedNativeQuery addHibernateNamedNativeQuery(int index) { + HibernateNamedNativeQuery hibernateNamedNativeQuery =3D getJpaFactory().= buildHibernateNamedNativeQuery(this); + this.hibernateNamedNativeQueries.add(index, hibernateNamedNativeQuery); + HibernateNamedNativeQueryAnnotation hibernateNamedNativeQueryAnnotation = =3D (HibernateNamedNativeQueryAnnotation) this.javaResourcePersistentType + .addSupportingAnnotation(index, HibernateNamedNativeQueryAnnotation.ANN= OTATION_NAME, HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); + hibernateNamedNativeQuery.initialize(hibernateNamedNativeQueryAnnotation= ); + fireItemAdded(HIBERNATE_NAMED_NATIVE_QUERIES_LIST, index, hibernateNamed= NativeQuery); + return hibernateNamedNativeQuery; + } + = + protected void addHibernateNamedNativeQuery(int index, HibernateNamedNati= veQuery hibernateNamedNativeQuery) { + addItemToList(index, hibernateNamedNativeQuery, this.hibernateNamedNativ= eQueries, HIBERNATE_NAMED_NATIVE_QUERIES_LIST); + } + = + protected void addHibernateNamedNativeQuery(HibernateNamedNativeQuery hib= ernateNamedNativeQuery) { + this.addHibernateNamedNativeQuery(this.hibernateNamedNativeQueries.size(= ), hibernateNamedNativeQuery); + } + = + public void removeHibernateNamedNativeQuery(HibernateNamedNativeQuery hib= ernateNamedNativeQuery) { + removeHibernateNamedNativeQuery(this.hibernateNamedNativeQueries.indexOf= (hibernateNamedNativeQuery)); + } + = + public void removeHibernateNamedNativeQuery(int index) { + HibernateNamedNativeQuery removedHibernateNamedNativeQuery =3D this.hibe= rnateNamedNativeQueries.remove(index); + this.javaResourcePersistentType.removeSupportingAnnotation(index, Hibern= ateNamedNativeQueryAnnotation.ANNOTATION_NAME, HibernateNamedNativeQueriesA= nnotation.ANNOTATION_NAME); + fireItemRemoved(HIBERNATE_NAMED_NATIVE_QUERIES_LIST, index, removedHiber= nateNamedNativeQuery); + } = + = + protected void removeHibernateNamedNativeQuery_(HibernateNamedNativeQuery= hibernateNamedNativeQuery) { + removeItemFromList(hibernateNamedNativeQuery, this.hibernateNamedNativeQ= ueries, HIBERNATE_NAMED_NATIVE_QUERIES_LIST); + } + = + public void moveHibernateNamedNativeQuery(int targetIndex, int sourceInde= x) { + CollectionTools.move(this.hibernateNamedNativeQueries, targetIndex, sour= ceIndex); + this.javaResourcePersistentType.moveSupportingAnnotation(targetIndex, so= urceIndex, HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); + fireItemMoved(HIBERNATE_NAMED_NATIVE_QUERIES_LIST, targetIndex, sourceIn= dex); = + } + = // ********************* foreignKey ************** = protected void initializeForeignKey() { @@ -212,7 +480,7 @@ throw new IllegalStateException("foreignKey already exists"); //$NON-NL= S-1$ } this.foreignKey =3D getJpaFactory().buildForeignKey(this); - ForeignKeyAnnotation foreignKeyResource =3D (ForeignKeyAnnotation) javaR= esourcePersistentType.addAnnotation(ForeignKeyAnnotation.ANNOTATION_NAME); + ForeignKeyAnnotation foreignKeyResource =3D (ForeignKeyAnnotation) javaR= esourcePersistentType.addSupportingAnnotation(ForeignKeyAnnotation.ANNOTATI= ON_NAME); this.foreignKey.initialize(foreignKeyResource); firePropertyChanged(FOREIGN_KEY_PROPERTY, null, this.foreignKey); return this.foreignKey; @@ -234,7 +502,7 @@ } ForeignKey oldForeignKey =3D this.foreignKey; this.foreignKey =3D null; - this.javaResourcePersistentType.removeAnnotation(ForeignKeyAnnotation.AN= NOTATION_NAME); + this.javaResourcePersistentType.removeSupportingAnnotation(ForeignKeyAnn= otation.ANNOTATION_NAME); firePropertyChanged(FOREIGN_KEY_PROPERTY, oldForeignKey, null); } = @@ -245,17 +513,12 @@ } = protected ForeignKeyAnnotation getResourceForeignKey() { - return (ForeignKeyAnnotation) this.javaResourcePersistentType.getAnnotat= ion(ForeignKeyAnnotation.ANNOTATION_NAME); + return (ForeignKeyAnnotation) this.javaResourcePersistentType.getSupport= ingAnnotation(ForeignKeyAnnotation.ANNOTATION_NAME); } = public org.eclipse.jpt.db.Table getForeignKeyDbTable() { return getPrimaryDbTable(); } - = - @Override - public HibernateJavaGeneratorContainer getGeneratorContainer() { - return (HibernateJavaGeneratorContainer)super.getGeneratorContainer(); - } = // ************************* validation *********************** @Override @@ -266,8 +529,8 @@ } = protected void validateGenericGenerator(List messages, IReporte= r reporter, CompilationUnit astRoot) { - while (getGeneratorContainer().genericGenerators().hasNext()) { - getGeneratorContainer().genericGenerators().next().validate(messages, r= eporter, astRoot); + for (JavaGenericGenerator genericGenerator : genericGenerators) { + genericGenerator.validate(messages, reporter, astRoot); } = } = @@ -276,7 +539,7 @@ if (!shouldValidateAgainstDatabase() || foreignKey =3D=3D null || table = =3D=3D null ){ return; } = - Iterator fks =3D table.getForeignKeys().i= terator(); + Iterator fks =3D table.foreignKeys(); while (fks.hasNext()) { org.eclipse.jpt.db.ForeignKey fk =3D (org.eclipse.jpt.db.ForeignKey) fk= s.next(); if (foreignKey.getName().equals(fk.getIdentifier())){ @@ -300,9 +563,8 @@ if (result !=3D null) { return result; } - while (getGeneratorContainer().genericGenerators().hasNext()) { - result =3D getGeneratorContainer().genericGenerators().next() - .javaCompletionProposals(pos, filter, astRoot); + for (JavaGenericGenerator genericGenerator : genericGenerators) { + result =3D genericGenerator.javaCompletionProposals(pos, filter, astRoo= t); if (result !=3D null) { return result; } @@ -325,7 +587,7 @@ }*/ = @Override - protected JavaBaseJoinColumn.Owner buildPrimaryKeyJoinColumnOwner() { + protected Owner createPrimaryKeyJoinColumnOwner() { return new HibernatePrimaryKeyJoinColumnOwner(); } = @@ -336,10 +598,6 @@ public TextRange getValidationTextRange(CompilationUnit astRoot) { return HibernateJavaEntityImpl.this.getValidationTextRange(astRoot); } - = - public String getDefaultTableName() { - return HibernateJavaEntityImpl.this.getPrimaryTableName(); - } = public TypeMapping getTypeMapping() { return HibernateJavaEntityImpl.this; @@ -368,44 +626,24 @@ } = Entity parentEntity =3D HibernateJavaEntityImpl.this.getParentEntity(); - if (parentEntity !=3D null) { - HibernateJpaProject hibernateJpaProject =3D HibernateJavaEntityImpl.th= is.getJpaProject(); - NamingStrategy ns =3D hibernateJpaProject.getNamingStrategy(); - if (hibernateJpaProject.isNamingStrategyEnabled() && ns !=3D null) { - try { - String name =3D ns.joinKeyColumnName(parentEntity.getPrimaryKeyColum= nName(), - parentEntity.getPrimaryTableName()); - if (parentEntity.getPrimaryDbTable() !=3D null){ - return parentEntity.getPrimaryDbTable().getDatabase().convertNameTo= Identifier(name); - } - return name ; - } catch (Exception e) { - Message m =3D new LocalMessage(IMessage.HIGH_SEVERITY, = - Messages.NAMING_STRATEGY_EXCEPTION, new String[0], null); - HibernateJptPlugin.logException(m.getText(), e); + /*HibernateJpaProject hibernateJpaProject =3D HibernateJavaEntityImpl.t= his.getJpaProject(); + NamingStrategy ns =3D hibernateJpaProject.getNamingStrategy(); + if (hibernateJpaProject.isNamingStrategyEnabled() && ns !=3D null) { + try { + String name =3D ns.joinKeyColumnName(parentEntity.getPrimaryKeyColumn= Name(), + parentEntity.getPrimaryTableName()); + if (parentEntity.getPrimaryDbTable() !=3D null){ + return parentEntity.getPrimaryDbTable().getDatabase().convertNameToI= dentifier(name); } + return name ; + } catch (Exception e) { + Message m =3D new LocalMessage(IMessage.HIGH_SEVERITY, = + Messages.NAMING_STRATEGY_EXCEPTION, new String[0], null); + HibernateJptPlugin.logException(m.getText(), e); } - return parentEntity.getPrimaryKeyColumnName(); - } else { - return getPrimaryKeyColumnName(); - } + }*/ + return parentEntity.getPrimaryKeyColumnName(); } - - public IMessage buildUnresolvedNameMessage(NamedColumn column, TextRange= textRange) { - throw new UnsupportedOperationException("validation not supported yet: = bug 148262"); //$NON-NLS-1$ - } - - public IMessage buildUnresolvedReferencedColumnNameMessage(BaseJoinColum= n column, TextRange textRange) { - throw new UnsupportedOperationException("validation not supported yet: = bug 148262"); //$NON-NLS-1$ - } - - public IMessage buildUnspecifiedNameMultipleJoinColumnsMessage(BaseJoinC= olumn column, TextRange textRange) { - throw new UnsupportedOperationException("validation not supported yet: = bug 148262"); //$NON-NLS-1$ - } - = - public IMessage buildUnspecifiedReferencedColumnNameMultipleJoinColumnsM= essage(BaseJoinColumn column, TextRange textRange) { - throw new UnsupportedOperationException("validation not supported yet: = bug 148262"); //$NON-NLS-1$ - } } = @Override @@ -433,14 +671,6 @@ } }; } - - public JavaCacheable2_0 getCacheable() { - return cachable; - } - - public boolean calculateDefaultCacheable() { - return false; - } = } = Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaGen= eratorContainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaGenerato= rContainer.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaGenerato= rContainer.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,30 +0,0 @@ -/*************************************************************************= ****** - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ************************************************************************= ******/ -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import java.util.ListIterator; - -import org.eclipse.jpt.core.context.java.JavaGeneratorContainer; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateGenera= torContainer; - -/** - * = - * @author Dmitry Geraskov - * - */ -public interface HibernateJavaGeneratorContainer extends - HibernateGeneratorContainer, JavaGeneratorContainer { - = - ListIterator genericGenerators(); - = - JavaGenericGenerator addGenericGenerator(int index); - -} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaGen= eratorContainerImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaGenerato= rContainerImpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaGenerato= rContainerImpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,153 +0,0 @@ -/*************************************************************************= ****** - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ************************************************************************= ******/ -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; - -import org.eclipse.jpt.core.context.java.JavaGenerator; -import org.eclipse.jpt.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaGenerato= rContainer; -import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; -import org.eclipse.jpt.core.resource.java.NestableAnnotation; -import org.eclipse.jpt.utility.internal.CollectionTools; -import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; -import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; -import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= r; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.GenericGe= neratorAnnotation; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.GenericGe= neratorsAnnotation; - -/** - * @author Dmitry Geraskov - * - */ -public class HibernateJavaGeneratorContainerImpl extends - GenericJavaGeneratorContainer implements - HibernateJavaGeneratorContainer { - = - protected final List genericGenerators; - - public HibernateJavaGeneratorContainerImpl(JavaJpaContextNode parent) { - super(parent); - this.genericGenerators =3D new ArrayList(); - } - = - public HibernateJpaFactory getJpaFactory(){ - return (HibernateJpaFactory)super.getJpaFactory(); - } - = - @Override - public void initialize(JavaResourcePersistentMember jrpm) { - super.initialize(jrpm); - this.initializeGenericGenerators(); - } - = - @Override - public void update(JavaResourcePersistentMember jrpm) { - super.update(jrpm); - this.updateGenericGenerators(); - } - - public JavaGenericGenerator addGenericGenerator(int index) { - JavaGenericGenerator newGenericGenerator =3D getJpaFactory().buildJavaGe= nericGenerator(this); - this.genericGenerators.add(index, newGenericGenerator); - GenericGeneratorAnnotation genericGeneratorAnnotation =3D (GenericGenera= torAnnotation)this.javaResourcePersistentMember - .addAnnotation(index, GenericGeneratorAnnotation.ANNOTATION_NAME, Gener= icGeneratorsAnnotation.ANNOTATION_NAME); - newGenericGenerator.initialize(genericGeneratorAnnotation); - fireItemAdded(GENERIC_GENERATORS_LIST, index, newGenericGenerator); - return newGenericGenerator; - } - = - protected void addGenericGenerator(JavaGenericGenerator genericGenerator)= { - this.addGenericGenerator(genericGeneratorsSize(), genericGenerator); - } - = - protected void addGenericGenerator(int index, JavaGenericGenerator generi= cGenerator) { - addItemToList(index, genericGenerator, this.genericGenerators, GENERIC_G= ENERATORS_LIST); - } - - public ListIterator genericGenerators() { - return new CloneListIterator(genericGenerators); - } - - public int genericGeneratorsSize() { - return this.genericGenerators.size(); - } - - public void moveGenericGenerator(int targetIndex, int sourceIndex) { - CollectionTools.move(this.genericGenerators, targetIndex, sourceIndex); - this.javaResourcePersistentMember.moveAnnotation(targetIndex, sourceInde= x, GenericGeneratorsAnnotation.ANNOTATION_NAME); - fireItemMoved(GENERIC_GENERATORS_LIST, targetIndex, sourceIndex); = - } - - public void removeGenericGenerator(int index) { - JavaGenericGenerator removedGenericGenerator =3D this.genericGenerators.= remove(index); - this.javaResourcePersistentMember.removeAnnotation(index, GenericGenerat= orAnnotation.ANNOTATION_NAME, GenericGeneratorsAnnotation.ANNOTATION_NAME); - fireItemRemoved(GENERIC_GENERATORS_LIST, index, removedGenericGenerator); - } - - public void removeGenericGenerator(GenericGenerator generator) { - removeGenericGenerator(this.genericGenerators.indexOf(generator)); = - } - - protected void removeGenericGenerator_(JavaGenericGenerator generator) { - removeItemFromList(generator, this.genericGenerators, GENERIC_GENERATORS= _LIST); - } - - protected void initializeGenericGenerators() { - for (Iterator stream =3D this.javaResourcePersistent= Member.annotations( - GenericGeneratorAnnotation.ANNOTATION_NAME, - GenericGeneratorsAnnotation.ANNOTATION_NAME); - stream.hasNext(); ) { - this.genericGenerators.add(buildGenericGenerator((GenericGeneratorAnnot= ation) stream.next())); - } - } - = - protected JavaGenericGenerator buildGenericGenerator(GenericGeneratorAnno= tation genericGeneratorResource) { - JavaGenericGenerator generator =3D getJpaFactory().buildJavaGenericGener= ator(this); - generator.initialize(genericGeneratorResource); - return generator; - } - = - @Override - protected void addGeneratorsTo(ArrayList generators) { - super.addGeneratorsTo(generators); - for (JavaGenericGenerator genericGenerator : genericGenerators) { - generators.add(genericGenerator); - } - } - = - protected void updateGenericGenerators() { - ListIterator genericGenerators =3D genericGenerato= rs(); - Iterator resourceGenericGenerators =3D - this.javaResourcePersistentMember.annotations( - GenericGeneratorAnnotation.ANNOTATION_NAME, - GenericGeneratorsAnnotation.ANNOTATION_NAME); - - while (genericGenerators.hasNext()) { - JavaGenericGenerator genericGenerator =3D genericGenerators.next(); - if (resourceGenericGenerators.hasNext()) { - genericGenerator.update((GenericGeneratorAnnotation) resourceGenericGe= nerators.next()); - } - else { - removeGenericGenerator_(genericGenerator); - } - } - - while (resourceGenericGenerators.hasNext()) { - addGenericGenerator(buildGenericGenerator((GenericGeneratorAnnotation) = resourceGenericGenerators.next())); - } - } - - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaId= Mapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMappin= g.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMappin= g.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -12,15 +12,15 @@ package org.jboss.tools.hibernate.jpt.core.internal.context.java; = import org.eclipse.jpt.core.context.java.JavaIdMapping; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateIdMapp= ing; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= rHolder; import org.jboss.tools.hibernate.jpt.core.internal.context.IndexHolder; +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate= IdMapping; = /** * @author Dmitry Geraskov * */ -public interface HibernateJavaIdMapping extends JavaIdMapping, IndexHolder= , HibernateIdMapping { - = - HibernateJavaGeneratorContainer getGeneratorContainer(); +public interface HibernateJavaIdMapping extends HibernateIdMapping, + JavaIdMapping, GenericGeneratorHolder, IndexHolder { = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaId= MappingImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMappin= gImpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaIdMappin= gImpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -10,11 +10,25 @@ *************************************************************************= *****/ package org.jboss.tools.hibernate.jpt.core.internal.context.java; = -import java.util.Vector; +import java.util.Iterator; +import java.util.List; +import java.util.ListIterator; = +import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jpt.core.context.java.JavaGenerator; import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.core.internal.context.java.AbstractJavaIdMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaIdMapping; +import org.eclipse.jpt.utility.Filter; +import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; +import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; +import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; +import org.eclipse.jpt.utility.internal.iterators.SingleElementIterator; +import org.eclipse.jpt.utility.internal.iterators.SingleElementListIterato= r; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= r; +import org.jboss.tools.hibernate.jpt.core.internal.context.Index; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.GenericGe= neratorAnnotation; import org.jboss.tools.hibernate.jpt.core.internal.resource.java.IndexAnno= tation; @@ -23,12 +37,12 @@ * @author Dmitry Geraskov * */ -public class HibernateJavaIdMappingImpl extends AbstractJavaIdMapping = +public class HibernateJavaIdMappingImpl extends GenericJavaIdMapping = implements HibernateJavaIdMapping { = protected JavaGenericGenerator genericGenerator; = - protected JavaIndex index; + protected Index index; = /** * @param parent @@ -38,17 +52,12 @@ } = @Override - public HibernateJavaGeneratorContainer getGeneratorContainer() { - return (HibernateJavaGeneratorContainer)super.getGeneratorContainer(); + public Iterator supportingAnnotationNames() { + return new CompositeIterator(super.supportingAnnotationNames(), + Hibernate.INDEX); } = @Override - protected void addSupportingAnnotationNamesTo(Vector names) { - super.addSupportingAnnotationNamesTo(names); - names.add(Hibernate.INDEX); - } - = - @Override protected HibernateJpaFactory getJpaFactory() { return (HibernateJpaFactory) super.getJpaFactory(); } @@ -56,12 +65,14 @@ @Override protected void initialize() { super.initialize(); + this.initializeGenericGenerator(); this.initializeIndex(); } = @Override public void update() { super.update(); + updateGenericGenerator(); this.updateIndex(); } = @@ -83,7 +94,7 @@ } = protected GenericGeneratorAnnotation getResourceGenericGenerator() { - return (GenericGeneratorAnnotation) this.getResourcePersistentAttribute(= ).getAnnotation(GenericGeneratorAnnotation.ANNOTATION_NAME); + return (GenericGeneratorAnnotation) this.getResourcePersistentAttribute(= ).getSupportingAnnotation(GenericGeneratorAnnotation.ANNOTATION_NAME); } = protected JavaGenericGenerator buildGenericGenerator(GenericGeneratorAnno= tation genericGeneratorResource) { @@ -92,7 +103,7 @@ return generator; } = - /*@SuppressWarnings("unchecked") + @SuppressWarnings("unchecked") public Iterator generators() { return new CompositeIterator(super.generators(), (getGenericGenerator() =3D=3D null) ? EmptyIterator.instance() = @@ -105,7 +116,7 @@ } this.genericGenerator =3D ((HibernateJpaFactory)getJpaFactory()).buildJa= vaGenericGenerator(this); GenericGeneratorAnnotation genericGeneratorResource =3D (GenericGenerato= rAnnotation)getResourcePersistentAttribute() - .addAnnotation(GenericGeneratorAnnotation.ANNOTATION_NAME); + .addSupportingAnnotation(GenericGeneratorAnnotation.ANNOTATION_NAM= E); this.genericGenerator.initialize(genericGeneratorResource); firePropertyChanged(GENERIC_GENERATORS_LIST, null, this.genericGenerator= ); return this.genericGenerator; @@ -121,7 +132,7 @@ } JavaGenericGenerator oldGenericGenerator =3D this.genericGenerator; this.genericGenerator =3D null; - this.getResourcePersistentAttribute().removeAnnotation(GenericGeneratorA= nnotation.ANNOTATION_NAME); + this.getResourcePersistentAttribute().removeSupportingAnnotation(Generic= GeneratorAnnotation.ANNOTATION_NAME); firePropertyChanged(GENERIC_GENERATORS_LIST, oldGenericGenerator,null); } = @@ -200,7 +211,7 @@ if (this.genericGenerator =3D=3D generator){ removeGenericGenerator(); } - }*/ + } = // *** index = @@ -228,23 +239,23 @@ } } = - public JavaIndex addIndex() { + public Index addIndex() { if (getIndex() !=3D null) { throw new IllegalStateException("index already exists"); //$NON-NLS-1$ } this.index =3D getJpaFactory().buildIndex(this); - IndexAnnotation indexResource =3D (IndexAnnotation) getResourcePersisten= tAttribute().addAnnotation(IndexAnnotation.ANNOTATION_NAME); + IndexAnnotation indexResource =3D (IndexAnnotation) getResourcePersisten= tAttribute().addSupportingAnnotation(IndexAnnotation.ANNOTATION_NAME); this.index.initialize(indexResource); firePropertyChanged(INDEX_PROPERTY, null, this.index); return this.index; } = - public JavaIndex getIndex() { + public Index getIndex() { return this.index; } = - protected void setIndex(JavaIndex newIndex) { - JavaIndex oldIndex =3D this.index; + protected void setIndex(Index newIndex) { + Index oldIndex =3D this.index; this.index =3D newIndex; firePropertyChanged(INDEX_PROPERTY, oldIndex, newIndex); } @@ -253,20 +264,20 @@ if (getIndex() =3D=3D null) { throw new IllegalStateException("index does not exist, cannot be remove= d"); //$NON-NLS-1$ } - JavaIndex oldIndex =3D this.index; + Index oldIndex =3D this.index; this.index =3D null; - this.getResourcePersistentAttribute().removeAnnotation(IndexAnnotation.A= NNOTATION_NAME); + this.getResourcePersistentAttribute().removeSupportingAnnotation(IndexAn= notation.ANNOTATION_NAME); firePropertyChanged(INDEX_PROPERTY, oldIndex, null); } = - protected JavaIndex buildIndex(IndexAnnotation indexResource) { - JavaIndex index =3D getJpaFactory().buildIndex(this); + protected Index buildIndex(IndexAnnotation indexResource) { + Index index =3D getJpaFactory().buildIndex(this); index.initialize(indexResource); return index; } = protected IndexAnnotation getResourceIndex() { - return (IndexAnnotation) this.getResourcePersistentAttribute().getAnnota= tion(IndexAnnotation.ANNOTATION_NAME); + return (IndexAnnotation) this.getResourcePersistentAttribute().getSuppor= tingAnnotation(IndexAnnotation.ANNOTATION_NAME); } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJo= inColumnImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColu= mnImpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColu= mnImpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -12,12 +12,17 @@ package org.jboss.tools.hibernate.jpt.core.internal.context.java; = import java.util.Iterator; +import java.util.List; = +import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.Entity; import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.core.context.java.JavaJoinColumn; import org.eclipse.jpt.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaJoinColu= mn; +import org.eclipse.jpt.core.internal.context.java.GenericJavaJoinColumn; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessag= es; +import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.db.Column; import org.eclipse.jpt.db.Table; import org.eclipse.wst.validation.internal.core.Message; @@ -25,9 +30,9 @@ import org.hibernate.cfg.NamingStrategy; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; import org.jboss.tools.hibernate.jpt.core.internal.context.NamingStrategyM= appingTools; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; = /** * @author Dmitry Geraskov @@ -47,10 +52,14 @@ = @Override protected String buildDefaultName() { - return NamingStrategyMappingTools.buildJoinColumnDefaultName(this, getOw= ner()); + return NamingStrategyMappingTools.buildJoinColumnDefaultName(this); } = public PersistentAttribute getReferencedPersistentAttribute() { + RelationshipMapping relationshipMapping =3D this.getOwner().getRelations= hipMapping(); + if (relationshipMapping =3D=3D null) { + return null; + } if (this.getOwner().joinColumnsSize() !=3D 1) { return null; } @@ -134,7 +143,7 @@ return specifiedReferencedColumnName; } = - /*protected void validateJoinColumnName(List messages, Compilat= ionUnit astRoot) { + protected void validateName(List messages, CompilationUnit astR= oot) { if ( ! this.isResolved() && getDbTable() !=3D null) { if (getDBColumnName() !=3D null) { messages.add( @@ -148,7 +157,14 @@ ); } else if (getOwner().joinColumnsSize() > 1) { - messages.add(this.buildUnspecifiedReferencedColumnNameMultipleJoinColu= mnsMessage(astRoot)); + messages.add( + DefaultJpaValidationMessages.buildMessage( + IMessage.HIGH_SEVERITY, + JpaValidationMessages.JOIN_COLUMN_UNRESOLVED_NAME_MULTIPLE_JOIN_COL= UMNS, + this, + this.getNameTextRange(astRoot) + ) + ); } //If the name is null and there is only one join-column, one of these v= alidation messages will apply // 1. target entity does not have a primary key @@ -185,7 +201,7 @@ // 2. target entity is not specified // 3. target entity is not an entity } - }*/ + } = = = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJo= inColumnJoiningStrategy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColu= mnJoiningStrategy.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinColu= mnJoiningStrategy.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -11,9 +11,16 @@ = package org.jboss.tools.hibernate.jpt.core.internal.context.java; = +import java.util.List; + +import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.java.JavaJoinColumn; import org.eclipse.jpt.core.context.java.JavaJoinColumnEnabledRelationship= Reference; import org.eclipse.jpt.core.internal.context.java.GenericJavaJoinColumnJoi= ningStrategy; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessag= es; +import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateJoinCo= lumn; = /** * @author Dmitry Geraskov @@ -26,13 +33,8 @@ JavaJoinColumnEnabledRelationshipReference parent) { super(parent); } - = - @Override - protected JavaJoinColumn.Owner buildJoinColumnOwner() { - return new HibernateJoinColumnOwner(); - } = - /*protected void validateJoinColumnName(JavaJoinColumn joinColumn, List messages, CompilationUnit astRoot) { + protected void validateJoinColumnName(JavaJoinColumn joinColumn, List messages, CompilationUnit astRoot) { if ( ! joinColumn.isResolved() && joinColumn.getDbTable() !=3D null) { if (((HibernateJoinColumn)joinColumn).getDBColumnName() !=3D null) { messages.add( @@ -90,14 +92,6 @@ // 2. target entity is not specified // 3. target entity is not an entity = } - }*/ - = - protected class HibernateJoinColumnOwner extends JoinColumnOwner { - protected HibernateJoinColumnOwner() { - super(); - } - = - //TODO implement validator messages } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJo= inTableImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTabl= eImpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTabl= eImpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -14,7 +14,7 @@ = import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.java.JavaJoinTableJoiningStrategy; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaJoinTabl= e; +import org.eclipse.jpt.core.internal.context.java.GenericJavaJoinTable; import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessag= es; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.db.Schema; @@ -24,8 +24,8 @@ import org.hibernate.cfg.NamingStrategy; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; +import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; -import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; = /** * @author Dmitry Geraskov @@ -73,7 +73,7 @@ return getDefaultName(); } = - protected boolean validateAgainstDatabase(List messages, IRepor= ter reporter, CompilationUnit astRoot) { + protected void validateAgainstDatabase(List messages, IReporter= reporter, CompilationUnit astRoot) { if ( ! this.hasResolvedCatalog()) { messages.add( DefaultJpaValidationMessages.buildMessage( @@ -84,7 +84,7 @@ this.getCatalogTextRange(astRoot) ) ); - return false; + return; } = if ( ! this.hasResolvedSchema()) { @@ -97,7 +97,7 @@ this.getSchemaTextRange(astRoot) ) ); - return false; + return; } = if ( ! this.isResolved()) { @@ -111,8 +111,10 @@ this.getNameTextRange(astRoot)) ); = } - return false; + return; } - return true; + = + this.validateJoinColumns(this.joinColumns(), messages, reporter, astRoot= ); + this.validateJoinColumns(this.inverseJoinColumns(), messages, reporter, = astRoot); } } Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoi= nTableJoiningStrategy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTabl= eJoiningStrategy.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaJoinTabl= eJoiningStrategy.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,36 +0,0 @@ -/*************************************************************************= ****** - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ************************************************************************= ******/ -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import org.eclipse.jpt.core.context.java.JavaJoinTableEnabledRelationshipR= eference; -import org.eclipse.jpt.core.internal.context.java.GenericJavaJoinTableJoin= ingStrategy; -import org.jboss.tools.hibernate.jpt.core.internal.context.NamingStrategyM= appingTools; - -/** - * @author Dmitry Geraskov - * - */ -public class HibernateJavaJoinTableJoiningStrategy extends - GenericJavaJoinTableJoiningStrategy { - - /** - * @param parent - */ - public HibernateJavaJoinTableJoiningStrategy( - JavaJoinTableEnabledRelationshipReference parent) { - super(parent); - } - = - public String getJoinTableDefaultName() { - return NamingStrategyMappingTools.buildJoinTableDefaultName(getRelations= hipReference()); - } - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaMa= nyToManyMapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaManyToMa= nyMapping.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaManyToMa= nyMapping.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -13,21 +13,21 @@ = import java.util.Iterator; import java.util.List; -import java.util.Vector; = import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.core.context.java.JavaRelationshipReference; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaManyToMa= nyMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaManyToManyMap= ping; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.db.Table; +import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; import org.jboss.tools.hibernate.jpt.core.internal.context.ForeignKey; import org.jboss.tools.hibernate.jpt.core.internal.context.ForeignKeyHolde= r; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; +import org.jboss.tools.hibernate.jpt.core.internal.context.NamingStrategyM= appingTools; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; = /** @@ -45,14 +45,13 @@ } = @Override - protected JavaRelationshipReference buildRelationshipReference() { - return new HibernateJavaManyToManyRelationshipReference(this); + public String getJoinTableDefaultName() { + return NamingStrategyMappingTools.buildJoinTableDefaultName(this); } = - @Override - protected void addSupportingAnnotationNamesTo(Vector names) { - super.addSupportingAnnotationNamesTo(names); - names.add(Hibernate.FOREIGN_KEY); + public Iterator supportingAnnotationNames() { + return new CompositeIterator(super.supportingAnnotationNames(), + Hibernate.FOREIGN_KEY); } = @Override @@ -105,7 +104,7 @@ throw new IllegalStateException("foreignKey already exists"); //$NON-NL= S-1$ } this.foreignKey =3D getJpaFactory().buildForeignKey(this); - ForeignKeyAnnotation foreignKeyResource =3D (ForeignKeyAnnotation) getRe= sourcePersistentAttribute().addAnnotation(ForeignKeyAnnotation.ANNOTATION_N= AME); + ForeignKeyAnnotation foreignKeyResource =3D (ForeignKeyAnnotation) getRe= sourcePersistentAttribute().addSupportingAnnotation(ForeignKeyAnnotation.AN= NOTATION_NAME); this.foreignKey.initialize(foreignKeyResource); firePropertyChanged(FOREIGN_KEY_PROPERTY, null, this.foreignKey); return this.foreignKey; @@ -127,7 +126,7 @@ } ForeignKey oldForeignKey =3D this.foreignKey; this.foreignKey =3D null; - this.getResourcePersistentAttribute().removeAnnotation(ForeignKeyAnnotat= ion.ANNOTATION_NAME); + this.getResourcePersistentAttribute().removeSupportingAnnotation(Foreign= KeyAnnotation.ANNOTATION_NAME); firePropertyChanged(FOREIGN_KEY_PROPERTY, oldForeignKey, null); } = @@ -138,7 +137,7 @@ } = protected ForeignKeyAnnotation getResourceForeignKey() { - return (ForeignKeyAnnotation) this.getResourcePersistentAttribute().getA= nnotation(ForeignKeyAnnotation.ANNOTATION_NAME); + return (ForeignKeyAnnotation) this.getResourcePersistentAttribute().getS= upportingAnnotation(ForeignKeyAnnotation.ANNOTATION_NAME); } = public Table getForeignKeyDbTable() { @@ -157,7 +156,7 @@ if (!shouldValidateAgainstDatabase() || foreignKey =3D=3D null || table = =3D=3D null ){ return; } = - Iterator fks =3D table.getForeignKeys().i= terator(); + Iterator fks =3D table.foreignKeys(); while (fks.hasNext()) { org.eclipse.jpt.db.ForeignKey fk =3D (org.eclipse.jpt.db.ForeignKey) fk= s.next(); if (foreignKey.getName().equals(fk.getIdentifier())){ Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaMan= yToManyRelationshipReference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaManyToMa= nyRelationshipReference.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaManyToMa= nyRelationshipReference.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,36 +0,0 @@ -/*************************************************************************= ****** - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ************************************************************************= ******/ -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import org.eclipse.jpt.core.context.java.JavaJoinTableJoiningStrategy; -import org.eclipse.jpt.core.context.java.JavaManyToManyMapping; -import org.eclipse.jpt.core.internal.context.java.GenericJavaManyToManyRel= ationshipReference; - -/** - * @author Dmitry Geraskov - * - */ -public class HibernateJavaManyToManyRelationshipReference extends - GenericJavaManyToManyRelationshipReference { - - /** - * @param parent - */ - public HibernateJavaManyToManyRelationshipReference( - JavaManyToManyMapping parent) { - super(parent); - } - = - protected JavaJoinTableJoiningStrategy buildJoinTableJoiningStrategy() { - return new HibernateJavaJoinTableJoiningStrategy(this); - } - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaMa= nyToOneMapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaManyToOn= eMapping.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaManyToOn= eMapping.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -13,20 +13,22 @@ = import java.util.Iterator; import java.util.List; -import java.util.Vector; = import org.eclipse.jdt.core.dom.CompilationUnit; +import org.eclipse.jpt.core.context.java.JavaManyToOneRelationshipReferenc= e; import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaManyToOn= eMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaManyToOneMapp= ing; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.db.Table; +import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; import org.jboss.tools.hibernate.jpt.core.internal.context.ForeignKey; import org.jboss.tools.hibernate.jpt.core.internal.context.ForeignKeyHolde= r; +import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; +import org.jboss.tools.hibernate.jpt.core.internal.context.NamingStrategyM= appingTools; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; -import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; = /** @@ -43,11 +45,20 @@ } = @Override - protected void addSupportingAnnotationNamesTo(Vector names) { - super.addSupportingAnnotationNamesTo(names); - names.add(Hibernate.FOREIGN_KEY); + public String getJoinTableDefaultName() { + return NamingStrategyMappingTools.buildJoinTableDefaultName(this); } + + @Override + protected JavaManyToOneRelationshipReference buildRelationshipReference()= { + return new HibernateJavaManyToOneRelationshipReference(this); + } = + public Iterator supportingAnnotationNames() { + return new CompositeIterator(super.supportingAnnotationNames(), + Hibernate.FOREIGN_KEY); + } + = @Override protected HibernateJpaFactory getJpaFactory() { return (HibernateJpaFactory) super.getJpaFactory(); @@ -98,7 +109,7 @@ throw new IllegalStateException("foreignKey already exists"); //$NON-NL= S-1$ } this.foreignKey =3D getJpaFactory().buildForeignKey(this); - ForeignKeyAnnotation foreignKeyResource =3D (ForeignKeyAnnotation) getRe= sourcePersistentAttribute().addAnnotation(ForeignKeyAnnotation.ANNOTATION_N= AME); + ForeignKeyAnnotation foreignKeyResource =3D (ForeignKeyAnnotation) getRe= sourcePersistentAttribute().addSupportingAnnotation(ForeignKeyAnnotation.AN= NOTATION_NAME); this.foreignKey.initialize(foreignKeyResource); firePropertyChanged(FOREIGN_KEY_PROPERTY, null, this.foreignKey); return this.foreignKey; @@ -120,7 +131,7 @@ } ForeignKey oldForeignKey =3D this.foreignKey; this.foreignKey =3D null; - this.getResourcePersistentAttribute().removeAnnotation(ForeignKeyAnnotat= ion.ANNOTATION_NAME); + this.getResourcePersistentAttribute().removeSupportingAnnotation(Foreign= KeyAnnotation.ANNOTATION_NAME); firePropertyChanged(FOREIGN_KEY_PROPERTY, oldForeignKey, null); } = @@ -131,7 +142,7 @@ } = protected ForeignKeyAnnotation getResourceForeignKey() { - return (ForeignKeyAnnotation) this.getResourcePersistentAttribute().getA= nnotation(ForeignKeyAnnotation.ANNOTATION_NAME); + return (ForeignKeyAnnotation) this.getResourcePersistentAttribute().getS= upportingAnnotation(ForeignKeyAnnotation.ANNOTATION_NAME); } = public Table getForeignKeyDbTable() { @@ -150,7 +161,7 @@ if (!shouldValidateAgainstDatabase() || foreignKey =3D=3D null || table = =3D=3D null ){ return; } = - Iterator fks =3D table.getForeignKeys().i= terator(); + Iterator fks =3D table.foreignKeys(); while (fks.hasNext()) { org.eclipse.jpt.db.ForeignKey fk =3D (org.eclipse.jpt.db.ForeignKey) fk= s.next(); if (foreignKey.getName().equals(fk.getIdentifier())){ Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaOn= eToManyMapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaOneToMan= yMapping.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaOneToMan= yMapping.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -12,8 +12,8 @@ package org.jboss.tools.hibernate.jpt.core.internal.context.java; = import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.core.context.java.JavaRelationshipReference; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaOneToMan= yMapping; +import org.eclipse.jpt.core.internal.context.java.GenericJavaOneToManyMapp= ing; +import org.jboss.tools.hibernate.jpt.core.internal.context.NamingStrategyM= appingTools; = /** * @author Dmitry Geraskov @@ -26,8 +26,8 @@ } = @Override - protected JavaRelationshipReference buildRelationshipReference() { - return super.buildRelationshipReference(); + public String getJoinTableDefaultName() { + return NamingStrategyMappingTools.buildJoinTableDefaultName(this); } = } Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaOne= ToManyRelationshipReference.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaOneToMan= yRelationshipReference.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaOneToMan= yRelationshipReference.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,36 +0,0 @@ -/*************************************************************************= ****** - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ************************************************************************= ******/ -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import org.eclipse.jpt.core.context.java.JavaJoinTableJoiningStrategy; -import org.eclipse.jpt.core.context.java.JavaOneToManyMapping; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaOneToMan= yRelationshipReference; - -/** - * @author Dmitry Geraskov - * - */ -public class HibernateJavaOneToManyRelationshipReference extends - GenericJavaOneToManyRelationshipReference { - - /** - * @param parent - */ - public HibernateJavaOneToManyRelationshipReference( - JavaOneToManyMapping parent) { - super(parent); - } - = - protected JavaJoinTableJoiningStrategy buildJoinTableJoiningStrategy() { - return new HibernateJavaJoinTableJoiningStrategy(this); - } - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaOn= eToOneMapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaOneToOne= Mapping.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaOneToOne= Mapping.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -13,20 +13,22 @@ = import java.util.Iterator; import java.util.List; -import java.util.Vector; = import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaOneToOne= Mapping; +import org.eclipse.jpt.core.context.java.JavaRelationshipReference; +import org.eclipse.jpt.core.internal.context.java.GenericJavaOneToOneMappi= ng; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.db.Table; +import org.eclipse.jpt.utility.internal.iterators.CompositeIterator; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; import org.jboss.tools.hibernate.jpt.core.internal.context.ForeignKey; import org.jboss.tools.hibernate.jpt.core.internal.context.ForeignKeyHolde= r; +import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; +import org.jboss.tools.hibernate.jpt.core.internal.context.NamingStrategyM= appingTools; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; -import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; = /** @@ -42,7 +44,7 @@ super(parent); } = - /*@Override + @Override public String getJoinTableDefaultName() { return NamingStrategyMappingTools.buildJoinTableDefaultName(this); } @@ -50,12 +52,11 @@ @Override protected JavaRelationshipReference buildRelationshipReference() { return new HibernateJavaOneToOneRelationshipReference(this); - }*/ + } = - @Override - protected void addSupportingAnnotationNamesTo(Vector names) { - super.addSupportingAnnotationNamesTo(names); - names.add(Hibernate.FOREIGN_KEY); + public Iterator supportingAnnotationNames() { + return new CompositeIterator(super.supportingAnnotationNames(), + Hibernate.FOREIGN_KEY); } = @Override @@ -108,7 +109,7 @@ throw new IllegalStateException("foreignKey already exists"); //$NON-NL= S-1$ } this.foreignKey =3D getJpaFactory().buildForeignKey(this); - ForeignKeyAnnotation foreignKeyResource =3D (ForeignKeyAnnotation) getRe= sourcePersistentAttribute().addAnnotation(ForeignKeyAnnotation.ANNOTATION_N= AME); + ForeignKeyAnnotation foreignKeyResource =3D (ForeignKeyAnnotation) getRe= sourcePersistentAttribute().addSupportingAnnotation(ForeignKeyAnnotation.AN= NOTATION_NAME); this.foreignKey.initialize(foreignKeyResource); firePropertyChanged(FOREIGN_KEY_PROPERTY, null, this.foreignKey); return this.foreignKey; @@ -130,7 +131,7 @@ } ForeignKey oldForeignKey =3D this.foreignKey; this.foreignKey =3D null; - this.getResourcePersistentAttribute().removeAnnotation(ForeignKeyAnnotat= ion.ANNOTATION_NAME); + this.getResourcePersistentAttribute().removeSupportingAnnotation(Foreign= KeyAnnotation.ANNOTATION_NAME); firePropertyChanged(FOREIGN_KEY_PROPERTY, oldForeignKey, null); } = @@ -141,7 +142,7 @@ } = protected ForeignKeyAnnotation getResourceForeignKey() { - return (ForeignKeyAnnotation) this.getResourcePersistentAttribute().getA= nnotation(ForeignKeyAnnotation.ANNOTATION_NAME); + return (ForeignKeyAnnotation) this.getResourcePersistentAttribute().getS= upportingAnnotation(ForeignKeyAnnotation.ANNOTATION_NAME); } = public Table getForeignKeyDbTable() { @@ -160,7 +161,7 @@ if (!shouldValidateAgainstDatabase() || foreignKey =3D=3D null || table = =3D=3D null ){ return; } = - Iterator fks =3D table.getForeignKeys().i= terator(); + Iterator fks =3D table.foreignKeys(); while (fks.hasNext()) { org.eclipse.jpt.db.ForeignKey fk =3D (org.eclipse.jpt.db.ForeignKey) fk= s.next(); if (foreignKey.getName().equals(fk.getIdentifier())){ Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQue= ryContainer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryCon= tainer.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryCon= tainer.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,68 +0,0 @@ -/*************************************************************************= ****** - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import java.util.ListIterator; - -import org.eclipse.jpt.core.context.java.JavaQueryContainer; -import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedN= ativeQuery; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQ= uery; - -/** - * = - * @author Dmitry Geraskov - * - */ -public interface HibernateJavaQueryContainer extends JavaQueryContainer { - - //********** Hibernate Named Queries ************** = - ListIterator hibernateNamedQueries(); - = - int hibernateNamedQueriesSize(); - - HibernateNamedQuery addHibernateNamedQuery(int index); - = - void removeHibernateNamedQuery(int index); - - void removeHibernateNamedQuery(HibernateNamedQuery namedQuery); - - void moveHibernateNamedQuery(int targetIndex, int sourceIndex); - - String HIBERNATE_NAMED_QUERIES_LIST =3D "hibernateNamedQueries"; //$NON-N= LS-1$ - = - //********** Hibernate Named Native Queries **************; - - ListIterator hibernateNamedNativeQueries(); - = - int hibernateNamedNativeQueriesSize(); - - HibernateNamedNativeQuery addHibernateNamedNativeQuery(int index); - = - void removeHibernateNamedNativeQuery(int index); - - void removeHibernateNamedNativeQuery(HibernateNamedNativeQuery namedQuery= ); - - void moveHibernateNamedNativeQuery(int targetIndex, int sourceIndex); - - String HIBERNATE_NAMED_NATIVE_QUERIES_LIST =3D "hibernateNamedQueries"; /= /$NON-NLS-1$ - = - = - void initialize(JavaResourcePersistentMember jrpm); - = - /** - * Update the JavaGeneratorContainer context model object to match the Ja= vaResourcePersistentMember = - * resource model object. see {@link org.eclipse.jpt.core.JpaProject#upda= te()} - */ - void update(JavaResourcePersistentMember jrpm); - - -} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQue= ryContainerImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryCon= tainerImpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaQueryCon= tainerImpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,253 +0,0 @@ -/*************************************************************************= ****** - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.ListIterator; - -import org.eclipse.jpt.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.core.context.java.JavaNamedNativeQuery; -import org.eclipse.jpt.core.context.java.JavaNamedQuery; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaQueryCon= tainer; -import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; -import org.eclipse.jpt.core.resource.java.NamedNativeQueryAnnotation; -import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation; -import org.eclipse.jpt.core.resource.java.NestableAnnotation; -import org.eclipse.jpt.utility.internal.CollectionTools; -import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; -import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaFactory; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedN= ativeQuery; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQ= uery; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedNativeQueriesAnnotation; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedNativeQueryAnnotation; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedQueriesAnnotation; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.Hibernate= NamedQueryAnnotation; - -/** - * = - * @author Dmitry Geraskov - * - */ -public class HibernateJavaQueryContainerImpl extends GenericJavaQueryConta= iner -implements HibernateJavaQueryContainer{ - = - protected final List hibernateNamedQueries; - - protected final List hibernateNamedNativeQueri= es; - - public HibernateJavaQueryContainerImpl(JavaJpaContextNode parent) { - super(parent); - this.hibernateNamedQueries =3D new ArrayList(); - this.hibernateNamedNativeQueries =3D new ArrayList(); - } - = - public HibernateJpaFactory getJpaFactory(){ - return (HibernateJpaFactory)super.getJpaFactory(); - } - = - public void initialize(JavaResourcePersistentMember jrpm) { - super.initialize(jrpm); - initializeHibernateNamedQueries(); - initializeHibernateNamedNativeQueries(); - } - = - public void update(JavaResourcePersistentMember jrpm) { - super.update(jrpm); - this.updateHibernateNamedQueries(); - this.updateHibernateNamedNativeQueries(); - } - = - // *********** Named Queries - - protected void initializeHibernateNamedQueries() { - for (Iterator stream =3D this.javaResourcePersistent= Member. - annotations( - HibernateNamedQueryAnnotation.ANNOTATION_NAME, = - HibernateNamedQueriesAnnotation.ANNOTATION_NAME); = - stream.hasNext(); ) { - this.hibernateNamedQueries.add(buildHibernateNamedQuery((NamedQueryAnno= tation) stream.next())); - } - } - = - protected void updateHibernateNamedQueries() { - ListIterator queries =3D hibernateNamedQueries(); - Iterator resourceNamedQueries =3D = - this.javaResourcePersistentMember.annotations( - HibernateNamedQueryAnnotation.ANNOTATION_NAME, = - HibernateNamedQueriesAnnotation.ANNOTATION_NAME); - = - while (queries.hasNext()) { - HibernateNamedQuery namedQuery =3D queries.next(); - if (resourceNamedQueries.hasNext()) { - namedQuery.update((NamedQueryAnnotation) resourceNamedQueries.next()); - } - else { - removeHibernateNamedQuery_(namedQuery); - } - } - = - while (resourceNamedQueries.hasNext()) { - addHibernateNamedQuery(buildHibernateNamedQuery((NamedQueryAnnotation) = resourceNamedQueries.next())); - } - } = - = - public HibernateNamedQuery addHibernateNamedQuery(int index) { - HibernateNamedQuery namedQuery =3D getJpaFactory().buildHibernateJavaNam= edQuery(this); - this.hibernateNamedQueries.add(index, namedQuery); - NamedQueryAnnotation namedQueryAnnotation =3D = - (NamedQueryAnnotation) this.javaResourcePersistentMember. - addAnnotation( - index, HibernateNamedQueryAnnotation.ANNOTATION_NAME, = - HibernateNamedQueriesAnnotation.ANNOTATION_NAME); - namedQuery.initialize(namedQueryAnnotation); - fireItemAdded(HIBERNATE_NAMED_QUERIES_LIST, index, namedQuery); - return namedQuery; - } - = - public ListIterator hibernateNamedQueries() { - return new CloneListIterator(this.hibernateNamedQue= ries); - } - - public int hibernateNamedQueriesSize() { - return this.hibernateNamedQueries.size(); - } - - public void removeHibernateNamedQuery(int index) { - JavaNamedQuery removedNamedQuery =3D this.hibernateNamedQueries.remove(i= ndex); - this.javaResourcePersistentMember.removeAnnotation( - index, HibernateNamedQueryAnnotation.ANNOTATION_NAME, HibernateNamedQu= eriesAnnotation.ANNOTATION_NAME); - fireItemRemoved(HIBERNATE_NAMED_QUERIES_LIST, index, removedNamedQuery); - } - - public void removeHibernateNamedQuery(HibernateNamedQuery namedQuery) { - removeHibernateNamedQuery(this.hibernateNamedQueries.indexOf(namedQuery)= ); - } - = - protected void removeHibernateNamedQuery_(HibernateNamedQuery namedQuery)= { - removeItemFromList(namedQuery, this.hibernateNamedQueries, HIBERNATE_NAM= ED_QUERIES_LIST); - } - - public void moveHibernateNamedQuery(int targetIndex, int sourceIndex) { - CollectionTools.move(this.hibernateNamedQueries, targetIndex, sourceInde= x); - this.javaResourcePersistentMember.moveAnnotation( - targetIndex, sourceIndex, HibernateNamedQueriesAnnotation.ANNOTATION_N= AME); - fireItemMoved(HIBERNATE_NAMED_QUERIES_LIST, targetIndex, sourceIndex); - } - = - protected void addHibernateNamedQuery(int index, HibernateNamedQuery hibe= rnateNamedQuery) { - addItemToList(index, hibernateNamedQuery, this.hibernateNamedQueries, HI= BERNATE_NAMED_QUERIES_LIST); - } - = - protected void addHibernateNamedQuery(HibernateNamedQuery hibernateNamedQ= uery) { - this.addHibernateNamedQuery(this.hibernateNamedQueries.size(), hibernate= NamedQuery); - } - = - protected HibernateNamedQuery buildHibernateNamedQuery(NamedQueryAnnotati= on namedQueryResource) { - HibernateNamedQuery namedQuery =3D getJpaFactory().buildHibernateJavaNam= edQuery(this); - namedQuery.initialize(namedQueryResource); - return namedQuery; - } - - - // *********** Native Queries - = - protected void initializeHibernateNamedNativeQueries() { - for (Iterator stream =3D this.javaResourcePersistent= Member. - annotations( - HibernateNamedNativeQueryAnnotation.ANNOTATION_NAME, = - HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); = - stream.hasNext(); ) { - this.hibernateNamedNativeQueries.add(buildHibernateNamedNativeQuery((Na= medNativeQueryAnnotation) stream.next())); - } - } - = - protected void updateHibernateNamedNativeQueries() { - ListIterator queries =3D hibernateNamedNative= Queries(); - Iterator resourceNamedNativeQueries =3D = - this.javaResourcePersistentMember.annotations( - HibernateNamedNativeQueryAnnotation.ANNOTATION_NAME, = - HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); - = - while (queries.hasNext()) { - HibernateNamedNativeQuery namedQuery =3D queries.next(); - if (resourceNamedNativeQueries.hasNext()) { - namedQuery.update((NamedNativeQueryAnnotation) resourceNamedNativeQuer= ies.next()); - } - else { - removeHibernateNamedNativeQuery_(namedQuery); - } - } - = - while (resourceNamedNativeQueries.hasNext()) { - addHibernateNamedNativeQuery(buildHibernateNamedNativeQuery((HibernateN= amedNativeQueryAnnotation) resourceNamedNativeQueries.next())); - } - } - = - protected HibernateNamedNativeQuery buildHibernateNamedNativeQuery(NamedN= ativeQueryAnnotation namedNativeQueryResource) { - HibernateNamedNativeQuery namedNativeQuery =3D getJpaFactory().buildHibe= rnateJavaNamedNativeQuery(this); - namedNativeQuery.initialize(namedNativeQueryResource); - return namedNativeQuery; - } - = - public HibernateNamedNativeQuery addHibernateNamedNativeQuery(int index) { - HibernateNamedNativeQuery namedNativeQuery =3D getJpaFactory().buildHibe= rnateJavaNamedNativeQuery(this); - this.hibernateNamedNativeQueries.add(index, namedNativeQuery); - NamedNativeQueryAnnotation namedNativeQueryAnnotation =3D = - (NamedNativeQueryAnnotation) this.javaResourcePersistentMember. - addAnnotation( - index, HibernateNamedNativeQueryAnnotation.ANNOTATION_NAME, = - HibernateNamedNativeQueriesAnnotation.ANNOTATION_NAME); - namedNativeQuery.initialize(namedNativeQueryAnnotation); = - fireItemAdded(HIBERNATE_NAMED_NATIVE_QUERIES_LIST, index, namedNativeQue= ry); - return namedNativeQuery; - } - = - protected void addHibernateNamedNativeQuery(int index, HibernateNamedNati= veQuery namedNativeQuery) { - addItemToList(index, namedNativeQuery, this.hibernateNamedNativeQueries,= HIBERNATE_NAMED_NATIVE_QUERIES_LIST); - } - = - protected void addHibernateNamedNativeQuery(HibernateNamedNativeQuery nam= edNativeQuery) { - this.addHibernateNamedNativeQuery(this.hibernateNamedNativeQueries.size(= ), namedNativeQuery); - } - - public ListIterator hibernateNamedNativeQuerie= s() { - return new CloneListIterator(this.hibernateNa= medNativeQueries); - } - - public int hibernateNamedNativeQueriesSize() { - return this.hibernateNamedNativeQueries.size(); - } - - public void removeHibernateNamedNativeQuery(int index) { - JavaNamedNativeQuery removedNamedQuery =3D this.hibernateNamedNativeQuer= ies.remove(index); - this.javaResourcePersistentMember.removeAnnotation( - index, HibernateNamedNativeQueryAnnotation.ANNOTATION_NAME, HibernateN= amedNativeQueriesAnnotation.ANNOTATION_NAME); - fireItemRemoved(HIBERNATE_NAMED_NATIVE_QUERIES_LIST, index, removedNamed= Query); - } - - public void removeHibernateNamedNativeQuery(HibernateNamedNativeQuery nam= edQuery) { - removeHibernateNamedNativeQuery(this.hibernateNamedNativeQueries.indexOf= (namedQuery)); - } - = - protected void removeHibernateNamedNativeQuery_(HibernateNamedNativeQuery= namedQuery) { - removeItemFromList(namedQuery, this.hibernateNamedNativeQueries, HIBERNA= TE_NAMED_NATIVE_QUERIES_LIST); - } - - public void moveHibernateNamedNativeQuery(int targetIndex, int sourceInde= x) { - CollectionTools.move(this.hibernateNamedNativeQueries, targetIndex, sour= ceIndex); - this.javaResourcePersistentMember.moveAnnotation( - targetIndex, sourceIndex, HibernateNamedNativeQueriesAnnotation.ANNOTA= TION_NAME); - fireItemMoved(HIBERNATE_NAMED_NATIVE_QUERIES_LIST, targetIndex, sourceIn= dex); - } - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaSe= condaryTableImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaSecondar= yTableImpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaSecondar= yTableImpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -14,7 +14,7 @@ = import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.java.JavaEntity; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaSecondar= yTable; +import org.eclipse.jpt.core.internal.context.java.GenericJavaSecondaryTabl= e; import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessag= es; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.db.Schema; @@ -74,7 +74,7 @@ return this.getName(); } = - protected boolean validateAgainstDatabase(List messages, Compil= ationUnit astRoot) { + protected void validateAgainstDatabase(List messages, Compilati= onUnit astRoot) { if ( ! this.hasResolvedCatalog()) { messages.add( DefaultJpaValidationMessages.buildMessage( @@ -85,7 +85,7 @@ this.getCatalogTextRange(astRoot) ) ); - return false; + return; } = if ( ! this.hasResolvedSchema()) { @@ -98,7 +98,7 @@ this.getSchemaTextRange(astRoot) ) ); - return false; + return; } = if ( ! this.isResolved()) { @@ -111,9 +111,8 @@ this.getNameTextRange(astRoot) ) ); - return false; + return; } - return true; } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaTa= bleImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaTableImp= l.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateJavaTableImp= l.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -14,7 +14,7 @@ = import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.context.java.JavaEntity; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaTable; +import org.eclipse.jpt.core.internal.context.java.GenericJavaTable; import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessag= es; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.core.resource.java.JavaResourcePersistentMember; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedN= ativeQueryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedNativeQ= ueryImpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedNativeQ= ueryImpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -11,7 +11,7 @@ package org.jboss.tools.hibernate.jpt.core.internal.context.java; = import org.eclipse.jpt.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaNamedNat= iveQuery; +import org.eclipse.jpt.core.internal.context.java.GenericJavaNamedNativeQu= ery; import org.jboss.tools.hibernate.jpt.core.internal.context.CacheModeType; import org.jboss.tools.hibernate.jpt.core.internal.context.FlushModeType; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedN= ativeQuery; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedQ= ueryImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedQueryIm= pl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/HibernateNamedQueryIm= pl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -11,7 +11,7 @@ package org.jboss.tools.hibernate.jpt.core.internal.context.java; = import org.eclipse.jpt.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.core.internal.jpa1.context.java.GenericJavaNamedQue= ry; +import org.eclipse.jpt.core.internal.context.java.GenericJavaNamedQuery; import org.jboss.tools.hibernate.jpt.core.internal.context.CacheModeType; import org.jboss.tools.hibernate.jpt.core.internal.context.FlushModeType; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQ= uery; Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/java/IndexImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/IndexImpl.java 2010-0= 5-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/IndexImpl.java 2010-0= 5-26 13:13:34 UTC (rev 22326) @@ -1,115 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2009 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ - -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import java.util.ArrayList; -import java.util.List; - -import org.eclipse.jdt.core.dom.CompilationUnit; -import org.eclipse.jpt.core.context.java.JavaJpaContextNode; -import org.eclipse.jpt.core.internal.context.java.AbstractJavaJpaContextNo= de; -import org.eclipse.jpt.core.utility.TextRange; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.IndexAnno= tation; - -/** - * @author Dmitry Geraskov - * - */ -public class IndexImpl extends AbstractJavaJpaContextNode implements JavaI= ndex { - = - private IndexAnnotation indexResource; - = - private String name; - = - private String[] columnNames =3D new String[0]; - - public IndexImpl(JavaJpaContextNode parent) { - super(parent); - } - - public void initialize(IndexAnnotation indexResource) { - this.indexResource =3D indexResource; - this.name =3D indexResource.getName(); - this.columnNames =3D indexResource.getColumnNames(); - } - = - public void update(IndexAnnotation indexResource) { - this.indexResource =3D indexResource; - this.setName_(indexResource.getName()); - this.setColumnNames_(indexResource.getColumnNames()); - } - - // ***** name - = - public String getName() { - return name; - } - = - public void setName(String name) { - String old =3D this.name; - this.name =3D name; - this.getResourceIndex().setName(name); - this.firePropertyChanged(INDEX_NAME, old, name); - } - = - public void setName_(String name) { - String old =3D this.name; - this.name =3D name; - this.firePropertyChanged(INDEX_NAME, old, name); - } - = - // ***** columnNames - = - public String[] getColumnNames() { - return columnNames; - } - - public void setColumnNames(String[] columnNames) { - if (columnNames =3D=3D null) columnNames =3D new String[0]; - String[] old =3D this.columnNames; - this.columnNames =3D columnNames; - this.getResourceIndex().setColumnNames(columnNames); - this.firePropertyChanged(INDEX_COLUMN_NAMES, old, columnNames); - } - = - public void setColumnNames_(String[] columnNames) { - String[] old =3D this.columnNames; - this.columnNames =3D columnNames; - this.firePropertyChanged(INDEX_COLUMN_NAMES, old, columnNames); - } - = - private IndexAnnotation getResourceIndex() { - return indexResource; - } - - public TextRange getValidationTextRange(CompilationUnit astRoot) { - return this.indexResource.getTextRange(astRoot); - } - - public void addColumn(String columnName) { - String[] old =3D this.columnNames; - String[] newColumns =3D new String[old.length + 1]; - System.arraycopy(old, 0, newColumns, 0, old.length); - newColumns[newColumns.length - 1] =3D columnName; - this.setColumnNames(newColumns); - } - - public void removeColumn(String columnName) { - String[] old =3D this.columnNames; - List newColumns =3D new ArrayList(); - for (String column : old) { - if (!column.equals(columnName)) newColumns.add(column); - } - this.setColumnNames(newColumns.toArray(new String[newColumns.size()])); - } = - -} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/java/JavaIndex.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/JavaIndex.java 2010-0= 5-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/java/JavaIndex.java 2010-0= 5-26 13:13:34 UTC (rev 22326) @@ -1,37 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2009 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ - -package org.jboss.tools.hibernate.jpt.core.internal.context.java; - -import org.eclipse.jpt.core.context.java.JavaJpaContextNode; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.IndexAnno= tation; - -/** - * @author Dmitry Geraskov - * - */ -public interface JavaIndex extends JavaJpaContextNode { - = - String getName(); - void setName(String name); - String INDEX_NAME =3D "name"; //$NON-NLS-1$ - = - String[] getColumnNames(); - void addColumn(String columnName); - void removeColumn(String columnName); - String INDEX_COLUMN_NAMES =3D "ColumnNames"; //$NON-NLS-1$ - - - public void initialize(IndexAnnotation indexResource); - - public void update(IndexAnnotation indexResource); - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasi= cMapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMappi= ng.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmBasicMappi= ng.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -12,21 +12,21 @@ package org.jboss.tools.hibernate.jpt.core.internal.context.orm; = import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.core.internal.context.orm.AbstractOrmBasicMapping; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmBasicMapping; import org.eclipse.jpt.core.resource.orm.XmlBasic; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.hibernate.cfg.NamingStrategy; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; +import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; -import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; = /** * @author Dmitry Geraskov * */ -public class HibernateOrmBasicMapping extends AbstractOrmBasicMapping { +public class HibernateOrmBasicMapping extends GenericOrmBasicMapping { = public HibernateOrmBasicMapping(OrmPersistentAttribute parent, XmlBasic resourceMapping) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColu= mnImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl= .java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmColumnImpl= .java 2010-05-26 13:13:34 UTC (rev 22326) @@ -13,7 +13,7 @@ = import org.eclipse.jpt.core.context.XmlContextNode; import org.eclipse.jpt.core.context.orm.OrmColumn; -import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmColumn; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmColumn; import org.eclipse.jpt.db.Column; import org.eclipse.jpt.db.Table; import org.eclipse.wst.validation.internal.core.Message; @@ -21,8 +21,8 @@ import org.hibernate.cfg.NamingStrategy; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; +import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; -import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; = /** * @author Dmitry Geraskov @@ -70,8 +70,9 @@ return getDefaultName(); } = - public Table getDbTable() { - return getOwner().getDbTable(this.getDBTableName()); + @Override + protected String getOwningTableName() { + return getDBTableName(); } = public String getDBTableName() { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEnti= tyImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl= .java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmEntityImpl= .java 2010-05-26 13:13:34 UTC (rev 22326) @@ -16,14 +16,11 @@ = import org.eclipse.jpt.core.context.BaseJoinColumn; import org.eclipse.jpt.core.context.Entity; -import org.eclipse.jpt.core.context.NamedColumn; import org.eclipse.jpt.core.context.Table; import org.eclipse.jpt.core.context.TypeMapping; import org.eclipse.jpt.core.context.orm.OrmBaseJoinColumn; import org.eclipse.jpt.core.context.orm.OrmPersistentType; import org.eclipse.jpt.core.internal.context.orm.AbstractOrmEntity; -import org.eclipse.jpt.core.internal.jpa2.context.orm.NullOrmCacheable2_0; -import org.eclipse.jpt.core.jpa2.context.orm.OrmCacheable2_0; import org.eclipse.jpt.core.resource.orm.XmlEntity; import org.eclipse.jpt.core.utility.TextRange; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; @@ -34,11 +31,11 @@ import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= r; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedN= ativeQuery; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQ= uery; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateTable; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; = /** * @author Dmitry Geraskov @@ -46,27 +43,12 @@ */ public class HibernateOrmEntityImpl extends AbstractOrmEntity implements HibernateOrmEntity { - = - protected OrmCacheable2_0 cachable; = public HibernateOrmEntityImpl(OrmPersistentType parent, XmlEntity resourceMapping) { super(parent, resourceMapping); - this.cachable =3D buildOrmCachable(); } = - protected OrmCacheable2_0 buildOrmCachable() { - return new NullOrmCacheable2_0(this); - } - = - public OrmCacheable2_0 getCacheable() { - return cachable; - } - - public boolean calculateDefaultCacheable() { - return false; - } - = @Override public HibernateJpaProject getJpaProject() { return (HibernateJpaProject) super.getJpaProject(); @@ -144,30 +126,9 @@ return parentEntity.getPrimaryKeyColumnName(); } = - public String getDefaultTableName() { - //FIXME: use NamingStrategy here - return HibernateOrmEntityImpl.this.getPrimaryTableName(); - } - = public TextRange getValidationTextRange() { return null; } - = - public IMessage buildUnresolvedNameMessage(NamedColumn column, TextRange= textRange) { - throw new UnsupportedOperationException("validation not supported yet: = bug 148262"); //$NON-NLS-1$ - } - - public IMessage buildUnresolvedReferencedColumnNameMessage(BaseJoinColum= n column, TextRange textRange) { - throw new UnsupportedOperationException("validation not supported yet: = bug 148262"); //$NON-NLS-1$ - } - - public IMessage buildUnspecifiedNameMultipleJoinColumnsMessage(BaseJoinC= olumn column, TextRange textRange) { - throw new UnsupportedOperationException("validation not supported yet: = bug 148262"); //$NON-NLS-1$ - } - = - public IMessage buildUnspecifiedReferencedColumnNameMultipleJoinColumnsM= essage(BaseJoinColumn column, TextRange textRange) { - throw new UnsupportedOperationException("validation not supported yet: = bug 148262"); //$NON-NLS-1$ - } } = @Override Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMa= pping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.= java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMapping.= java 2010-05-26 13:13:34 UTC (rev 22326) @@ -12,7 +12,7 @@ package org.jboss.tools.hibernate.jpt.core.internal.context.orm; = import org.eclipse.jpt.core.context.orm.OrmIdMapping; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateIdMapp= ing; +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate= IdMapping; = /** * @author Dmitry Geraskov Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMa= ppingImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingI= mpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmIdMappingI= mpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -14,7 +14,7 @@ import java.util.List; = import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.core.internal.context.orm.AbstractOrmIdMapping; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmIdMapping; import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessag= es; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.core.resource.orm.XmlId; @@ -23,14 +23,14 @@ import org.hibernate.cfg.NamingStrategy; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; +import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; -import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; = /** * @author Dmitry Geraskov * */ -public class HibernateOrmIdMappingImpl extends AbstractOrmIdMapping +public class HibernateOrmIdMappingImpl extends GenericOrmIdMapping implements HibernateOrmIdMapping { = public HibernateOrmIdMappingImpl(OrmPersistentAttribute parent, @@ -76,7 +76,7 @@ messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_TABLE_NOT_VALID, + JpaValidationMessages.VIRTUAL_ATTRIBUTE_COLUMN_UNRESOLVED_TABLE, new String[] {pa.getName(), tableName, this.getColumn().getDBColumnN= ame()}, this.column, = this.column.getTableTextRange() Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoin= ColumnImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumn= Impl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumn= Impl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -15,9 +15,10 @@ = import org.eclipse.jpt.core.context.Entity; import org.eclipse.jpt.core.context.PersistentAttribute; +import org.eclipse.jpt.core.context.RelationshipMapping; import org.eclipse.jpt.core.context.XmlContextNode; import org.eclipse.jpt.core.context.orm.OrmJoinColumn; -import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmJoinColumn; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmJoinColumn; import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; import org.eclipse.jpt.db.Column; import org.eclipse.jpt.db.Table; @@ -26,9 +27,9 @@ import org.hibernate.cfg.NamingStrategy; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; import org.jboss.tools.hibernate.jpt.core.internal.context.NamingStrategyM= appingTools; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; = /** * @author Dmitry Geraskov @@ -43,8 +44,8 @@ } = @Override - protected String buildDefaultName() { - return NamingStrategyMappingTools.buildJoinColumnDefaultName(this, getOw= ner()); + protected String getOwnerDefaultColumnName() { + return NamingStrategyMappingTools.buildJoinColumnDefaultName(this); } = @Override @@ -114,6 +115,10 @@ } = public PersistentAttribute getReferencedPersistentAttribute() { + RelationshipMapping relationshipMapping =3D this.getOwner().getRelations= hipMapping(); + if (relationshipMapping =3D=3D null) { + return null; + } if (this.getOwner().joinColumnsSize() !=3D 1) { return null; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoin= ColumnJoiningStrategy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumn= JoiningStrategy.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinColumn= JoiningStrategy.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -11,9 +11,16 @@ = package org.jboss.tools.hibernate.jpt.core.internal.context.orm; = +import java.util.List; + +import org.eclipse.jpt.core.context.orm.OrmJoinColumn; import org.eclipse.jpt.core.context.orm.OrmJoinColumnEnabledRelationshipRe= ference; import org.eclipse.jpt.core.internal.context.orm.GenericOrmJoinColumnJoini= ngStrategy; +import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessag= es; +import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.core.resource.orm.XmlJoinColumnsMapping; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateJoinCo= lumn; = /** * @author Dmitry Geraskov @@ -28,7 +35,7 @@ super(parent, resource); } = - /*@Override + @Override protected void validateJoinColumnName(OrmJoinColumn joinColumn, List messages) { if ( ! joinColumn.isResolved() && joinColumn.getDbTable() !=3D null) { @@ -136,6 +143,6 @@ } } = } - }*/ + } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoin= TableImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinTableI= mpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmJoinTableI= mpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -13,11 +13,12 @@ = import java.util.List; = -import org.eclipse.jpt.core.context.PersistentAttribute; import org.eclipse.jpt.core.context.orm.OrmJoinTableJoiningStrategy; -import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmJoinTable; +import org.eclipse.jpt.core.context.orm.OrmRelationshipMapping; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmJoinTable; import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessag= es; -import org.eclipse.jpt.core.resource.orm.XmlJoinTable; +import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; +import org.eclipse.jpt.core.resource.orm.XmlJoinTableMapping; import org.eclipse.jpt.db.Schema; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -25,8 +26,8 @@ import org.hibernate.cfg.NamingStrategy; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; +import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; -import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; = /** * @author Dmitry Geraskov @@ -37,8 +38,8 @@ = = public HibernateOrmJoinTableImpl(OrmJoinTableJoiningStrategy parent, - XmlJoinTable resourceJoinTable) { - super(parent, resourceJoinTable); + XmlJoinTableMapping resourceMapping) { + super(parent, resourceMapping); } = @Override @@ -77,41 +78,43 @@ } = @Override - protected boolean validateAgainstDatabase(List messages, + protected void validateAgainstDatabase(List messages, IReporter reporter) { - PersistentAttribute persistentAttribute =3D this.getPersistentAttribute(= ); + OrmRelationshipMapping mapping =3D this.getRelationshipMapping(); + if ( ! this.hasResolvedCatalog()) { - if (persistentAttribute.isVirtual()) { + if (mapping.getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - getVirtualAttributeUnresolvedCatalogMessageId(), - new String[] {persistentAttribute.getName(), this.getCatalog(), this= .getDBTableName()}, = + JpaValidationMessages.VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_CATALO= G, + new String[] {mapping.getName(), this.getCatalog(), this.getDBTableN= ame()}, = this, this.getCatalogTextRange() ) ); + = } else { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - getUnresolvedCatalogMessageId(), + JpaValidationMessages.JOIN_TABLE_UNRESOLVED_CATALOG, new String[] {this.getCatalog(), this.getDBTableName()}, = this, this.getCatalogTextRange() ) ); } - return false; + return; } - + = if ( ! this.hasResolvedSchema()) { - if (persistentAttribute.isVirtual()) { + if (mapping.getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - getVirtualAttributeUnresolvedSchemaMessageId(), - new String[] {persistentAttribute.getName(), this.getSchema(), this.= getDBTableName()}, = + JpaValidationMessages.VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_SCHEMA, + new String[] {mapping.getName(), this.getSchema(), this.getDBTableNa= me()}, = this, this.getSchemaTextRange() ) @@ -120,23 +123,23 @@ messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - getUnresolvedSchemaMessageId(), + JpaValidationMessages.JOIN_TABLE_UNRESOLVED_SCHEMA, new String[] {this.getSchema(), this.getDBTableName()}, = this, this.getSchemaTextRange() ) ); } - return false; + return; } if ( ! this.isResolved()) { - if (getDBTableName() !=3D null) { //if name is null, the validation wil= l be handled elsewhere, such as the target entity is not defined - if (persistentAttribute.isVirtual()) { + if (getName() !=3D null) { //if name is null, the validation will be ha= ndled elsewhere, such as the target entity is not defined + if (mapping.getPersistentAttribute().isVirtual()) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - getVirtualAttributeUnresolvedNameMessageId(), - new String[] {persistentAttribute.getName(), this.getDBTableName()}= , = + JpaValidationMessages.VIRTUAL_ATTRIBUTE_JOIN_TABLE_UNRESOLVED_NAME, + new String[] {mapping.getName(), this.getDBTableName()}, = this, this.getNameTextRange() ) @@ -146,16 +149,18 @@ messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, - getUnresolvedNameMessageId(), - new String[] {this.getDBTableName()}, = + JpaValidationMessages.JOIN_TABLE_UNRESOLVED_NAME, + new String[] {this.getName()}, = this, = this.getNameTextRange()) - ); + ); = } } - return false; + return; } - return true; + + this.validateJoinColumns(this.joinColumns(), messages, reporter); + this.validateJoinColumns(this.inverseJoinColumns(), messages, reporter); } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmMany= ToManyMapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmManyToMany= Mapping.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmManyToMany= Mapping.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -12,7 +12,7 @@ package org.jboss.tools.hibernate.jpt.core.internal.context.orm; = import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.core.internal.context.orm.AbstractOrmManyToManyMapp= ing; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmManyToManyMappi= ng; import org.eclipse.jpt.core.resource.orm.XmlManyToMany; import org.jboss.tools.hibernate.jpt.core.internal.context.NamingStrategyM= appingTools; = @@ -21,16 +21,16 @@ * */ public class HibernateOrmManyToManyMapping extends - AbstractOrmManyToManyMapping { + GenericOrmManyToManyMapping { = public HibernateOrmManyToManyMapping(OrmPersistentAttribute parent, T resourceMapping) { super(parent, resourceMapping); } = - /*@Override + @Override public String getJoinTableDefaultName() { return NamingStrategyMappingTools.buildJoinTableDefaultName(this); - }*/ + } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmMany= ToOneMapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmManyToOneM= apping.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmManyToOneM= apping.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -13,7 +13,7 @@ = import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.core.context.orm.OrmRelationshipReference; -import org.eclipse.jpt.core.internal.context.orm.AbstractOrmManyToOneMappi= ng; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmManyToOneMappin= g; import org.eclipse.jpt.core.resource.orm.XmlManyToOne; import org.jboss.tools.hibernate.jpt.core.internal.context.NamingStrategyM= appingTools; = @@ -22,17 +22,17 @@ * */ public class HibernateOrmManyToOneMapping -extends AbstractOrmManyToOneMapping { +extends GenericOrmManyToOneMapping { = public HibernateOrmManyToOneMapping(OrmPersistentAttribute parent, T resourceMapping) { super(parent, resourceMapping); } = - /*@Override + @Override public String getJoinTableDefaultName() { return NamingStrategyMappingTools.buildJoinTableDefaultName(this); - }*/ + } = @Override protected OrmRelationshipReference buildRelationshipReference() { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmOneT= oManyMapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmOneToManyM= apping.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmOneToManyM= apping.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -12,24 +12,25 @@ package org.jboss.tools.hibernate.jpt.core.internal.context.orm; = import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmOneToManyM= apping; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmOneToManyMappin= g; import org.eclipse.jpt.core.resource.orm.XmlOneToMany; +import org.jboss.tools.hibernate.jpt.core.internal.context.NamingStrategyM= appingTools; = /** * @author Dmitry Geraskov * */ -public class HibernateOrmOneToManyMapping - extends GenericOrmOneToManyMapping { +public class HibernateOrmOneToManyMapping + extends GenericOrmOneToManyMapping { = public HibernateOrmOneToManyMapping(OrmPersistentAttribute parent, - XmlOneToMany resourceMapping) { + T resourceMapping) { super(parent, resourceMapping); } = - /*@Override + @Override public String getJoinTableDefaultName() { return NamingStrategyMappingTools.buildJoinTableDefaultName(this); - }*/ + } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmOneT= oOneMapping.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmOneToOneMa= pping.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmOneToOneMa= pping.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -13,7 +13,7 @@ = import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; import org.eclipse.jpt.core.context.orm.OrmRelationshipReference; -import org.eclipse.jpt.core.internal.context.orm.AbstractOrmOneToOneMappin= g; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmOneToOneMapping; import org.eclipse.jpt.core.resource.orm.XmlOneToOne; import org.jboss.tools.hibernate.jpt.core.internal.context.NamingStrategyM= appingTools; = @@ -22,17 +22,17 @@ * */ public class HibernateOrmOneToOneMapping extends -AbstractOrmOneToOneMapping { + GenericOrmOneToOneMapping { = public HibernateOrmOneToOneMapping(OrmPersistentAttribute parent, T resourceMapping) { super(parent, resourceMapping); } = - /*@Override + @Override public String getJoinTableDefaultName() { return NamingStrategyMappingTools.buildJoinTableDefaultName(this); - }*/ + } = @Override protected OrmRelationshipReference buildRelationshipReference() { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmTabl= eImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmTableImpl.= java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmTableImpl.= java 2010-05-26 13:13:34 UTC (rev 22326) @@ -16,7 +16,7 @@ = import org.eclipse.jpt.core.context.Table; import org.eclipse.jpt.core.context.orm.OrmEntity; -import org.eclipse.jpt.core.internal.jpa1.context.orm.GenericOrmTable; +import org.eclipse.jpt.core.internal.context.orm.GenericOrmTable; import org.eclipse.jpt.core.internal.validation.DefaultJpaValidationMessag= es; import org.eclipse.jpt.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.core.resource.orm.XmlEntity; @@ -27,9 +27,9 @@ import org.hibernate.cfg.NamingStrategy; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateTable; import org.jboss.tools.hibernate.jpt.core.internal.context.Messages; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit.LocalMessage; = /** * @author Dmitry Geraskov Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/sr= c/org/jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmXmlCo= ntextNodeFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmXmlContext= NodeFactory.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/context/orm/HibernateOrmXmlContext= NodeFactory.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,67 +0,0 @@ -package org.jboss.tools.hibernate.jpt.core.internal.context.orm; - -import org.eclipse.jpt.core.context.XmlContextNode; -import org.eclipse.jpt.core.context.orm.OrmBasicMapping; -import org.eclipse.jpt.core.context.orm.OrmColumn; -import org.eclipse.jpt.core.context.orm.OrmEntity; -import org.eclipse.jpt.core.context.orm.OrmIdMapping; -import org.eclipse.jpt.core.context.orm.OrmJoinColumn; -import org.eclipse.jpt.core.context.orm.OrmJoinTable; -import org.eclipse.jpt.core.context.orm.OrmJoinTableJoiningStrategy; -import org.eclipse.jpt.core.context.orm.OrmPersistentAttribute; -import org.eclipse.jpt.core.context.orm.OrmPersistentType; -import org.eclipse.jpt.core.context.orm.OrmTable; -import org.eclipse.jpt.core.internal.context.orm.AbstractOrmXmlContextNode= Factory; -import org.eclipse.jpt.core.resource.orm.XmlBasic; -import org.eclipse.jpt.core.resource.orm.XmlEntity; -import org.eclipse.jpt.core.resource.orm.XmlId; -import org.eclipse.jpt.core.resource.orm.XmlJoinColumn; -import org.eclipse.jpt.core.resource.orm.XmlJoinTable; -import org.eclipse.jpt.core.resource.orm.XmlJoinTableMapping; - -public class HibernateOrmXmlContextNodeFactory extends - AbstractOrmXmlContextNodeFactory { - - @Override - public OrmBasicMapping buildOrmBasicMapping(OrmPersistentAttribute parent, - XmlBasic resourceMapping) { - return new HibernateOrmBasicMapping(parent, resourceMapping); - } - - @Override - public OrmIdMapping buildOrmIdMapping(OrmPersistentAttribute parent, - XmlId resourceMapping) { - return new HibernateOrmIdMappingImpl(parent, resourceMapping); - } - - @Override - public OrmEntity buildOrmEntity(OrmPersistentType parent, - XmlEntity resourceMapping) { - return new HibernateOrmEntityImpl(parent, resourceMapping); - } - - @Override - public OrmTable buildOrmTable(OrmEntity parent) { - return new HibernateOrmTableImpl(parent); - } - = - @Override - public OrmJoinTable buildOrmJoinTable(OrmJoinTableJoiningStrategy parent, - XmlJoinTable resourceJoinTable) { - return new HibernateOrmJoinTableImpl(parent, resourceJoinTable); - } - - @Override - public OrmColumn buildOrmColumn(XmlContextNode parent, - org.eclipse.jpt.core.context.orm.OrmColumn.Owner owner) { - return new HibernateOrmColumnImpl(parent, owner); - } - - @Override - public OrmJoinColumn buildOrmJoinColumn(XmlContextNode parent, - org.eclipse.jpt.core.context.orm.OrmJoinColumn.Owner owner, - XmlJoinColumn resourceJoinColumn) { - return new HibernateOrmJoinColumnImpl(parent, owner, resourceJoinColumn); - } - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/resource/java/DiscriminatorF= ormulaAnnotationImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/DiscriminatorFormula= AnnotationImpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/DiscriminatorFormula= AnnotationImpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -49,8 +49,8 @@ this.value =3D this.buildValue(astRoot); = } = - public void synchronizeWith(CompilationUnit astRoot) { - this.syncValue(this.buildValue(astRoot)); = + public void update(CompilationUnit astRoot) { + this.setValue(this.buildValue(astRoot)); = } = // ***** value = @@ -59,15 +59,12 @@ } = public void setValue(String value) { - if (this.attributeValueHasChanged(this.value, value)) { - this.value =3D value; - this.valueAdapter.setValue(value); + if (this.attributeValueHasNotChanged(this.value, value)) { + return; } - } - = - private void syncValue(String value) { String old =3D this.value; this.value =3D value; + this.valueAdapter.setValue(value); this.firePropertyChanged(VALUE_PROPERTY, old, value); } = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/resource/java/ForeignKeyAnno= tationImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/ForeignKeyAnnotation= Impl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/ForeignKeyAnnotation= Impl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -61,62 +61,46 @@ this.inverseName =3D this.buildInverseName(astRoot); } = - public void synchronizeWith(CompilationUnit astRoot) { - this.syncName(this.buildName(astRoot)); - this.syncInverseName(this.buildInverseName(astRoot)); + public void update(CompilationUnit astRoot) { + this.setName(this.buildName(astRoot)); + this.setInverseName(this.buildInverseName(astRoot)); } = - // ***** name - public String getName() { - return this.name; + public String getInverseName() { + return inverseName; } = - public void setName(String name) { - if (this.attributeValueHasChanged(this.name, name)) { - this.name =3D name; - this.nameAdapter.setValue(name); - } + public String getName() { + return name; } - - private void syncName(String astName) { + = + public void setName(String newName) { + if (this.attributeValueHasNotChanged(this.name, newName)) { + return; + } String old =3D this.name; - this.name =3D astName; - this.firePropertyChanged(NAME_PROPERTY, old, astName); + this.name =3D newName; + this.nameAdapter.setValue(newName); + this.firePropertyChanged(NAME_PROPERTY, old, newName); } - - private String buildName(CompilationUnit astRoot) { - return this.nameAdapter.getValue(astRoot); - } - - public TextRange getNameTextRange(CompilationUnit astRoot) { - return this.getElementTextRange(NAME_ADAPTER, astRoot); - } - - // ***** inverse name - public String getInverseName() { - return this.inverseName; - } - - public void setInverseName(String inverseName) { - if (this.attributeValueHasChanged(this.inverseName, inverseName)) { - this.inverseName =3D inverseName; - this.inverseNameAdapter.setValue(inverseName); + = + public void setInverseName(String newInverseName) { + if (this.attributeValueHasNotChanged(this.inverseName, newInverseName)) { + return; } - } - - private void syncInverseName(String astInverseName) { String old =3D this.inverseName; - this.inverseName =3D astInverseName; - this.firePropertyChanged(INVERSE_NAME_PROPERTY, old, astInverseName); + this.inverseName =3D newInverseName; + this.inverseNameAdapter.setValue(newInverseName); + this.firePropertyChanged(INVERSE_NAME_PROPERTY, old, newInverseName); } - + = + private String buildName(CompilationUnit astRoot) { + return this.nameAdapter.getValue(astRoot); + } + = private String buildInverseName(CompilationUnit astRoot) { return this.inverseNameAdapter.getValue(astRoot); } - - public TextRange getInverseNameTextRange(CompilationUnit astRoot) { - return this.getElementTextRange(INVERSE_NAME_ADAPTER, astRoot); - } = = private static DeclarationAnnotationElementAdapter buildDeclarati= onAnnotationAdapter(String property) { return ConversionDeclarationAnnotationElementAdapter.forStrings(DECLARAT= ION_ANNOTATION_ADAPTER, property, true); @@ -126,7 +110,14 @@ return new ShortCircuitAnnotationElementAdapter(this.member, dae= a); } = + public TextRange getNameTextRange(CompilationUnit astRoot) { + return this.getElementTextRange(NAME_ADAPTER, astRoot); + } = + public TextRange getInverseNameTextRange(CompilationUnit astRoot) { + return this.getElementTextRange(INVERSE_NAME_ADAPTER, astRoot); + } + = public static class ForeignKeyAnnotationDefinition implements AnnotationD= efinition { // singleton Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/resource/java/GeneratedAnnot= ationImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/GeneratedAnnotationI= mpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/GeneratedAnnotationI= mpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -51,8 +51,8 @@ this.value =3D this.buildValue(astRoot); = } = - public void synchronizeWith(CompilationUnit astRoot) { - this.syncValue(this.buildValue(astRoot)); = + public void update(CompilationUnit astRoot) { + this.setValue(this.buildValue(astRoot)); = } = // ***** value = @@ -61,15 +61,12 @@ } = public void setValue(GenerationTime value) { - if (this.attributeValueHasChanged(this.value, value)) { - this.value =3D value; - this.valueAdapter.setValue(GenerationTime.toJavaAnnotationValue(value)); + if (this.attributeValueHasNotChanged(this.value, value)) { + return; } - } - = - private void syncValue(GenerationTime value) { GenerationTime old =3D this.value; this.value =3D value; + this.valueAdapter.setValue(GenerationTime.toJavaAnnotationValue(value)); this.firePropertyChanged(VALUE_PROPERTY, old, value); } = @@ -130,6 +127,5 @@ } = } - - + = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/resource/java/GenericGenerat= orAnnotationImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/GenericGeneratorAnno= tationImpl.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/GenericGeneratorAnno= tationImpl.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -76,15 +76,15 @@ } = public void initialize(CompilationUnit astRoot) { - this.name =3D this.buildName(astRoot); - this.strategy =3D this.buildStrategy(astRoot); = + this.name =3D this.name(astRoot); + this.strategy =3D this.strategy(astRoot); = AnnotationContainerTools.initialize(this.parametersContainer, astRoot); } = - public void synchronizeWith(CompilationUnit astRoot) { - this.syncName(this.buildName(astRoot)); - this.syncStrategy(this.buildStrategy(astRoot)); = - AnnotationContainerTools.synchronize(this.parametersContainer, astRoot); + public void update(CompilationUnit astRoot) { + this.setStrategy(this.strategy(astRoot)); + this.setName(this.name(astRoot)); + AnnotationContainerTools.update(this.parametersContainer, astRoot); } = public String getAnnotationName() { @@ -96,35 +96,29 @@ } = public void setStrategy(String newStrategy) { - if (attributeValueHasChanged(this.strategy, newStrategy)) { - this.strategy =3D newStrategy; - this.strategyAdapter.setValue(newStrategy); + if (attributeValueHasNotChanged(this.strategy, newStrategy)) { + return; } + String oldStrategy =3D this.strategy; + this.strategy =3D newStrategy; + this.strategyAdapter.setValue(newStrategy); + firePropertyChanged(STRATEGY_PROPERTY, oldStrategy, newStrategy); } = - private void syncStrategy(String strategy) { - String old =3D this.strategy; - this.strategy =3D strategy; - this.firePropertyChanged(STRATEGY_PROPERTY, old, strategy); - } - = public String getName() { return this.name; } = - public void setName(String name) { - if (this.attributeValueHasChanged(this.name, name)) { - this.name =3D name; - this.nameAdapter.setValue(name); + public void setName(String newName) { + if (attributeValueHasNotChanged(this.name, newName)) { + return; } + String oldName =3D this.name; + this.name =3D newName; + this.nameAdapter.setValue(newName); + firePropertyChanged(NAME_PROPERTY, oldName, newName); } = - private void syncName(String astName) { - String old =3D this.name; - this.name =3D astName; - this.firePropertyChanged(NAME_PROPERTY, old, astName); - } - = public TextRange getNameTextRange(CompilationUnit astRoot) { return this.getElementTextRange(nameDeclarationAdapter, astRoot); } @@ -158,11 +152,13 @@ } = // ********** java annotations -> persistence model ********** - protected String buildStrategy(CompilationUnit astRoot) { + protected String strategy(CompilationUnit astRoot) { + //TODO: get Generator instead of String + //use buildJavaGenericGenerator method before this will be done return this.strategyAdapter.getValue(astRoot); } = - protected String buildName(CompilationUnit astRoot) { + protected String name(CompilationUnit astRoot) { return this.nameAdapter.getValue(astRoot); } = = @@ -173,7 +169,7 @@ return (NestableParameterAnnotation) AnnotationContainerTools.addNestedA= nnotation(index, this.parametersContainer); } = - NestableParameterAnnotation addParameter_() { + NestableParameterAnnotation addParameterInternal() { NestableParameterAnnotation parameter =3D this.buildParameter(this.param= eters.size()); this.parameters.add(parameter); return parameter; @@ -183,17 +179,15 @@ return SourceParameterAnnotation.createGenericGeneratorParameter(this, t= his.member, this.daa, index); } = - Iterable nestableParameters() { - return this.parameters; + ListIterator nestableParameters() { + return new CloneListIterator(this.parameter= s); } = - void syncAddParameterAnnotation(org.eclipse.jdt.core.dom.Annotation neste= dAnnotation) { - NestableParameterAnnotation parameter =3D this.addParameter_(); - parameter.initialize((CompilationUnit) nestedAnnotation.getRoot()); - this.fireItemAdded(PARAMETERS_LIST, parametersSize() - 1, parameter); + void parameterAdded(int index, NestableParameterAnnotation parameter) { + this.fireItemAdded(PARAMETERS_LIST, index, parameter); } = - NestableParameterAnnotation moveParameter_(int targetIndex, int sourceInd= ex) { + NestableParameterAnnotation moveParameterInternal(int targetIndex, int so= urceIndex) { return CollectionTools.move(this.parameters, targetIndex, sourceIndex).g= et(targetIndex); } = @@ -225,12 +219,12 @@ AnnotationContainerTools.removeNestedAnnotation(index, this.parametersCo= ntainer); = } = - NestableParameterAnnotation removeParameter_(int index) { + NestableParameterAnnotation removeParameterInternal(int index) { return this.parameters.remove(index); } = - void parameterRemoved(int index) { - this.removeItemsFromList(index, this.parameters, PARAMETERS_LIST); + void parameterRemoved(int index, NestableParameterAnnotation parameter) { + this.fireItemRemoved(PARAMETERS_LIST, index, parameter); } = // ********** NestableAnnotation implementation ********** @@ -283,51 +277,54 @@ return GenericGeneratorAnnotationImpl.this.getAnnotationName(); } = - public org.eclipse.jdt.core.dom.Annotation getAstAnnotation(CompilationU= nit astRoot) { - return GenericGeneratorAnnotationImpl.this.getAstAnnotation(astRoot); + public org.eclipse.jdt.core.dom.Annotation getContainerJdtAnnotation(Com= pilationUnit astRoot) { + return GenericGeneratorAnnotationImpl.this.getJdtAnnotation(astRoot); } = public String getElementName() { return Hibernate.GENERIC_GENERATOR__PARAMETERS; } = - public String getNestedAnnotationName() { + public String getNestableAnnotationName() { return ParameterAnnotation.ANNOTATION_NAME; } = - public Iterable getNestedAnnotations() { + public ListIterator nestedAnnotations() { return GenericGeneratorAnnotationImpl.this.nestableParameters(); } = - public int getNestedAnnotationsSize() { + public int nestedAnnotationsSize() { return GenericGeneratorAnnotationImpl.this.parametersSize(); } = - public NestableParameterAnnotation addNestedAnnotation() { - return GenericGeneratorAnnotationImpl.this.addParameter_(); + public NestableParameterAnnotation addNestedAnnotationInternal() { + return GenericGeneratorAnnotationImpl.this.addParameterInternal(); } = - public void syncAddNestedAnnotation(org.eclipse.jdt.core.dom.Annotation = nestedAnnotation) { - GenericGeneratorAnnotationImpl.this.syncAddParameterAnnotation(nestedAn= notation); + public void nestedAnnotationAdded(int index, NestableParameterAnnotation= nestedAnnotation) { + GenericGeneratorAnnotationImpl.this.parameterAdded(index, nestedAnnotat= ion); } = - public NestableParameterAnnotation moveNestedAnnotation(int targetIndex,= int sourceIndex) { - return GenericGeneratorAnnotationImpl.this.moveParameter_(targetIndex, = sourceIndex); + public NestableParameterAnnotation moveNestedAnnotationInternal(int targ= etIndex, int sourceIndex) { + return GenericGeneratorAnnotationImpl.this.moveParameterInternal(target= Index, sourceIndex); } = - public NestableParameterAnnotation removeNestedAnnotation(int index) { - return GenericGeneratorAnnotationImpl.this.removeParameter_(index); + public void nestedAnnotationMoved(int targetIndex, int sourceIndex) { + GenericGeneratorAnnotationImpl.this.parameterMoved(targetIndex, sourceI= ndex); } = - public void syncRemoveNestedAnnotations(int index) { - GenericGeneratorAnnotationImpl.this.parameterRemoved(index); + public NestableParameterAnnotation removeNestedAnnotationInternal(int in= dex) { + return GenericGeneratorAnnotationImpl.this.removeParameterInternal(inde= x); } = + public void nestedAnnotationRemoved(int index, NestableParameterAnnotati= on nestedAnnotation) { + GenericGeneratorAnnotationImpl.this.parameterRemoved(index, nestedAnnot= ation); + } + @Override public String toString() { return StringTools.buildToStringFor(this); } - } = public static GenericGeneratorAnnotation createNestedGenericGenerator( @@ -384,5 +381,4 @@ } } = - } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateNamed= QueryAnnotation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateNamedQueryA= nnotation.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateNamedQueryA= nnotation.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -10,7 +10,7 @@ *************************************************************************= *****/ package org.jboss.tools.hibernate.jpt.core.internal.resource.java; = -import org.eclipse.jpt.core.resource.java.NamedQueryAnnotation; +import org.eclipse.jpt.core.resource.java.NestableNamedQueryAnnotation; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; = /** @@ -19,7 +19,7 @@ * Corresponds to the Hibernate annotation * org.hibernate.annotations.NamedQuery */ -public interface HibernateNamedQueryAnnotation extends NamedQueryAnnotatio= n, +public interface HibernateNamedQueryAnnotation extends NestableNamedQueryA= nnotation, HibernateQueryAnnotation { = //replace with Hibernate annotation String ANNOTATION_NAME =3D Hibernate.NAMED_QUERY; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourc= eNamedNativeQueriesAnnotation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamed= NativeQueriesAnnotation.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamed= NativeQueriesAnnotation.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -10,9 +10,9 @@ *************************************************************************= *****/ package org.jboss.tools.hibernate.jpt.core.internal.resource.java; = +import java.util.ListIterator; import java.util.Vector; = -import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.internal.resource.java.source.AnnotationContai= nerTools; import org.eclipse.jpt.core.internal.resource.java.source.SourceAnnotation; @@ -21,6 +21,7 @@ import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.utility.jdt.Member; import org.eclipse.jpt.utility.internal.CollectionTools; +import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; = /** @@ -47,8 +48,8 @@ AnnotationContainerTools.initialize(this, astRoot); } = - public void synchronizeWith(CompilationUnit astRoot) { - AnnotationContainerTools.synchronize(this, astRoot); + public void update(CompilationUnit astRoot) { + AnnotationContainerTools.update(this, astRoot); } = @Override @@ -57,61 +58,60 @@ } = // ********** AnnotationContainer implementation ********** + + public String getContainerAnnotationName() { + return this.getAnnotationName(); + } + + public org.eclipse.jdt.core.dom.Annotation getContainerJdtAnnotation(Comp= ilationUnit astRoot) { + return this.getJdtAnnotation(astRoot); + } + public String getElementName() { return Hibernate.NAMED_NATIVE_QUERIES__VALUE; } - = - public String getNestedAnnotationName() { + + public String getNestableAnnotationName() { return HibernateNamedNativeQueryAnnotation.ANNOTATION_NAME; - } = + } = - public String getContainerAnnotationName() { - return this.getAnnotationName(); + public ListIterator nestedAnnotation= s() { + return new CloneListIterator(this.h= ibernateNamedNativeQueries); } - = - public Iterable getNestedAnnotations= () { - return this.hibernateNamedNativeQueries; - } - = - public int getNestedAnnotationsSize() { + + public int nestedAnnotationsSize() { return this.hibernateNamedNativeQueries.size(); } - = - public HibernateNamedNativeQueryAnnotation addNestedAnnotation() { - return this.addNestedAnnotation(this.hibernateNamedNativeQueries.size()); + + public HibernateNamedNativeQueryAnnotation addNestedAnnotationInternal() { + HibernateNamedNativeQueryAnnotation namedQuery =3D this.buildHibernateNa= medNativeQuery(this.hibernateNamedNativeQueries.size()); + this.hibernateNamedNativeQueries.add(namedQuery); + return namedQuery; } - = - private HibernateNamedNativeQueryAnnotation addNestedAnnotation(int index= ) { - HibernateNamedNativeQueryAnnotation namedNativeQuery =3D this.buildHiber= nateNamedNativeQuery(index); - this.hibernateNamedNativeQueries.add(namedNativeQuery); - return namedNativeQuery; - } - = - public void syncAddNestedAnnotation(Annotation astAnnotation) { - int index =3D this.hibernateNamedNativeQueries.size(); - HibernateNamedNativeQueryAnnotation namedNativeQuery =3D this.addNestedA= nnotation(index); - namedNativeQuery.initialize((CompilationUnit) astAnnotation.getRoot()); - this.fireItemAdded(HIBERNATE_NAMED_NATIVE_QUERIES_LIST, index, namedNati= veQuery); - } - = + private HibernateNamedNativeQueryAnnotation buildHibernateNamedNativeQuer= y(int index) { return HibernateSourceNamedNativeQueryAnnotation.createNestedHibernateNa= medNativeQuery(this, member, index, this.daa); } - - public org.eclipse.jdt.core.dom.Annotation getContainerJdtAnnotation(Comp= ilationUnit astRoot) { - return this.getAstAnnotation(astRoot); + = + public void nestedAnnotationAdded(int index, HibernateNamedNativeQueryAnn= otation nestedAnnotation) { + this.fireItemAdded(HIBERNATE_NAMED_NATIVE_QUERIES_LIST, index, nestedAnn= otation); } = - public HibernateNamedNativeQueryAnnotation moveNestedAnnotation(int targe= tIndex, int sourceIndex) { + public HibernateNamedNativeQueryAnnotation moveNestedAnnotationInternal(i= nt targetIndex, int sourceIndex) { return CollectionTools.move(this.hibernateNamedNativeQueries, targetInde= x, sourceIndex).get(targetIndex); } = - public HibernateNamedNativeQueryAnnotation removeNestedAnnotation(int ind= ex) { + public void nestedAnnotationMoved(int targetIndex, int sourceIndex) { + this.fireItemMoved(HIBERNATE_NAMED_NATIVE_QUERIES_LIST, targetIndex, sou= rceIndex); + } + + public HibernateNamedNativeQueryAnnotation removeNestedAnnotationInternal= (int index) { return this.hibernateNamedNativeQueries.remove(index); } = - public void syncRemoveNestedAnnotations(int index) { - this.removeItemsFromList(index, this.hibernateNamedNativeQueries, HIBERN= ATE_NAMED_NATIVE_QUERIES_LIST); + public void nestedAnnotationRemoved(int index, HibernateNamedNativeQueryA= nnotation nestedAnnotation) { + this.fireItemRemoved(HIBERNATE_NAMED_NATIVE_QUERIES_LIST, index, nestedA= nnotation); } = + } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourc= eNamedNativeQueryAnnotation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamed= NativeQueryAnnotation.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamed= NativeQueryAnnotation.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -14,9 +14,9 @@ = import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.internal.resource.java.source.SourceAnnotation; -import org.eclipse.jpt.core.internal.utility.jdt.ASTTools; import org.eclipse.jpt.core.internal.utility.jdt.ConversionDeclarationAnno= tationElementAdapter; import org.eclipse.jpt.core.internal.utility.jdt.EnumDeclarationAnnotation= ElementAdapter; +import org.eclipse.jpt.core.internal.utility.jdt.JDTTools; import org.eclipse.jpt.core.internal.utility.jdt.MemberAnnotationAdapter; import org.eclipse.jpt.core.internal.utility.jdt.MemberIndexedAnnotationAd= apter; import org.eclipse.jpt.core.internal.utility.jdt.NestedIndexedDeclarationA= nnotationAdapter; @@ -133,10 +133,6 @@ this.resultSetMappingDeclarationAdapter =3D this.buildResultSetMappingAd= apter(daa); this.resultSetMappingAdapter =3D this.buildAdapter(this.resultSetMapping= DeclarationAdapter); } - = - public String getAnnotationName() { - return ANNOTATION_NAME; - } = public void initialize(CompilationUnit astRoot) { this.name =3D this.buildName(astRoot); @@ -155,25 +151,27 @@ this.resultSetMapping =3D this.buildResultSetMapping(astRoot); = } = - public void synchronizeWith(CompilationUnit astRoot) { - this.syncName(this.buildName(astRoot)); - this.syncQuery(this.buildQuery(astRoot)); - this.syncFlushMode(this.buildFlushMode(astRoot)); - this.syncCacheMode(this.buildCacheMode(astRoot)); - this.syncCacheable(this.buildCacheable(astRoot)); - this.syncCacheRegion(this.buildCacheRegion(astRoot)); - this.syncFetchSize(this.buildFetchSize(astRoot)); - this.syncTimeout(this.buildTimeout(astRoot)); - this.syncComment(this.buildComment(astRoot)); - this.syncReadOnly(this.buildReadOnly(astRoot)); - this.syncCallable(this.buildCallable(astRoot)); - this.syncResultClass(this.buildResultClass(astRoot)); - this.syncFullyQualifiedResultClassName(this.buildFullyQualifiedResultCla= ssName(astRoot)); - this.syncResultSetMapping(this.buildResultSetMapping(astRoot)); + public void update(CompilationUnit astRoot) { + this.setName(this.buildName(astRoot)); + this.setQuery(this.buildQuery(astRoot)); + this.setFlushMode(this.buildFlushMode(astRoot)); + this.setCacheMode(this.buildCacheMode(astRoot)); + this.setCacheable(this.buildCacheable(astRoot)); + this.setCacheRegion(this.buildCacheRegion(astRoot)); + this.setFetchSize(this.buildFetchSize(astRoot)); + this.setTimeout(this.buildTimeout(astRoot)); + this.setComment(this.buildComment(astRoot)); + this.setReadOnly(this.buildReadOnly(astRoot)); + this.setCallable(this.buildCallable(astRoot)); + this.setResultClass(this.buildResultClass(astRoot)); + this.setFullyQualifiedResultClassName(this.buildFullyQualifiedResultClas= sName(astRoot)); + this.setResultSetMapping(this.buildResultSetMapping(astRoot)); = } = + public String getAnnotationName() { + return ANNOTATION_NAME; + } = - /** * convenience method */ @@ -189,16 +187,13 @@ } = public void setName(String name) { - if (this.attributeValueHasChanged(this.name, name)) { - this.name =3D name; - this.nameAdapter.setValue(name); + if (this.attributeValueHasNotChanged(this.name, name)) { + return; } - } - = - private void syncName(String astName) { String old =3D this.name; - this.name =3D astName; - this.firePropertyChanged(NAME_PROPERTY, old, astName); + this.name =3D name; + this.nameAdapter.setValue(name); + this.firePropertyChanged(NAME_PROPERTY, old, name); } = private String buildName(CompilationUnit astRoot) { @@ -215,16 +210,13 @@ } = public void setQuery(String query) { - if (this.attributeValueHasChanged(this.query, query)) { - this.query =3D query; - this.queryAdapter.setValue(query); + if (this.attributeValueHasNotChanged(this.query, query)) { + return; } - } - - private void syncQuery(String annotationQuery) { String old =3D this.query; - this.query =3D annotationQuery; - this.firePropertyChanged(QUERY_PROPERTY, old, annotationQuery); + this.query =3D query; + this.queryAdapter.setValue(query); + this.firePropertyChanged(QUERY_PROPERTY, old, query); } = private String buildQuery(CompilationUnit astRoot) { @@ -234,6 +226,10 @@ public TextRange getQueryTextRange(CompilationUnit astRoot) { return this.getElementTextRange(this.queryDeclarationAdapter, astRoot); } + + String getQueryElementName() { + return Hibernate.NAMED_NATIVE_QUERY__QUERY; + } = // ***** hints public ListIterator hints() { @@ -274,17 +270,14 @@ public FlushModeType getFlushMode() { return flushMode; } - = + public void setFlushMode(FlushModeType flushMode) { - if (this.attributeValueHasChanged(this.flushMode, flushMode)) { - this.flushMode =3D flushMode; - this.flushModeAdapter.setValue(FlushModeType.toJavaAnnotationValue(flus= hMode)); + if (this.attributeValueHasNotChanged(this.flushMode, flushMode)) { + return; } - } - = - private void syncFlushMode(FlushModeType flushMode) { FlushModeType old =3D this.flushMode; this.flushMode =3D flushMode; + this.flushModeAdapter.setValue(FlushModeType.toJavaAnnotationValue(flush= Mode)); this.firePropertyChanged(FLUSH_MODE_PROPERTY, old, flushMode); } = @@ -299,19 +292,16 @@ // ***** caheMode = public CacheModeType getCacheMode() { - return this.cacheMode; + return cacheMode; } = public void setCacheMode(CacheModeType cacheMode) { - if (this.attributeValueHasChanged(this.cacheMode, cacheMode)) { - this.cacheMode =3D cacheMode; - this.cacheModeAdapter.setValue(CacheModeType.toJavaAnnotationValue(cach= eMode)); + if (this.attributeValueHasNotChanged(this.cacheMode, cacheMode)) { + return; } - } - = - private void syncCacheMode(CacheModeType cacheMode) { CacheModeType old =3D this.cacheMode; this.cacheMode =3D cacheMode; + this.cacheModeAdapter.setValue(CacheModeType.toJavaAnnotationValue(cache= Mode)); this.firePropertyChanged(CACHE_MODE_PROPERTY, old, cacheMode); } = @@ -329,15 +319,12 @@ } = public void setCacheable(Boolean cacheable){ - if (this.attributeValueHasChanged(this.cacheable, cacheable)) { - this.cacheable =3D cacheable; - this.cacheableAdapter.setValue(cacheable); + if (this.attributeValueHasNotChanged(this.cacheable, cacheable)) { + return; } - } - = - private void syncCacheable(Boolean cacheable) { Boolean old =3D this.cacheable; this.cacheable =3D cacheable; + this.cacheableAdapter.setValue(cacheable); this.firePropertyChanged(CACHEABLE_PROPERTY, old, cacheable); } = @@ -351,15 +338,12 @@ } = public void setCacheRegion(String cacheRegion){ - if (this.attributeValueHasChanged(this.cacheRegion, cacheRegion)) { - this.cacheRegion =3D cacheRegion; - this.cacheRegionAdapter.setValue(cacheRegion); + if (this.attributeValueHasNotChanged(this.cacheRegion, cacheRegion)) { + return; } - } - = - private void syncCacheRegion(String cacheRegion) { String old =3D this.cacheRegion; this.cacheRegion =3D cacheRegion; + this.cacheRegionAdapter.setValue(cacheRegion); this.firePropertyChanged(CACHE_REGION_PROPERTY, old, cacheRegion); } = @@ -372,15 +356,12 @@ } = public void setFetchSize(Integer fetchSize){ - if (this.attributeValueHasChanged(this.fetchSize, fetchSize)) { - this.fetchSize =3D fetchSize; - this.fetchSizeAdapter.setValue(fetchSize); + if (this.attributeValueHasNotChanged(this.fetchSize, fetchSize)) { + return; } - } - = - private void syncFetchSize(Integer fetchSize) { Integer old =3D this.fetchSize; this.fetchSize =3D fetchSize; + this.fetchSizeAdapter.setValue(fetchSize); this.firePropertyChanged(FETCH_SIZE_PROPERTY, old, fetchSize); } = @@ -392,15 +373,12 @@ return this.timeout; = } public void setTimeout(Integer timeout){ - if (this.attributeValueHasChanged(this.timeout, timeout)) { - this.timeout =3D timeout; - this.timeoutAdapter.setValue(timeout); + if (this.attributeValueHasNotChanged(this.timeout, timeout)) { + return; } - } - = - private void syncTimeout(Integer timeout) { Integer old =3D this.timeout; this.timeout =3D timeout; + this.timeoutAdapter.setValue(timeout); this.firePropertyChanged(TIMEOUT_PROPERTY, old, timeout); } = @@ -413,15 +391,12 @@ } = public void setComment(String comment){ - if (this.attributeValueHasChanged(this.comment, comment)) { - this.comment =3D comment; - this.commentAdapter.setValue(comment); + if (this.attributeValueHasNotChanged(this.comment, comment)) { + return; } - } - = - private void syncComment(String comment) { String old =3D this.comment; this.comment =3D comment; + this.commentAdapter.setValue(comment); this.firePropertyChanged(COMMENT_PROPERTY, old, comment); } = @@ -434,16 +409,13 @@ } = public void setReadOnly(Boolean readOnly){ - if (this.attributeValueHasChanged(this.readOnly, readOnly)) { - this.readOnly =3D readOnly; - this.readOnlyAdapter.setValue(readOnly); - } = - } - = - private void syncReadOnly(Boolean readOnly) { + if (this.attributeValueHasNotChanged(this.readOnly, readOnly)) { + return; + } Boolean old =3D this.readOnly; this.readOnly =3D readOnly; - this.firePropertyChanged(READ_ONLY_PROPERTY, old, readOnly); + this.readOnlyAdapter.setValue(readOnly); + this.firePropertyChanged(READ_ONLY_PROPERTY, old, readOnly); = } = private Boolean buildReadOnly(CompilationUnit astRoot) { @@ -455,16 +427,13 @@ } = public void setCallable(Boolean callable){ - if (this.attributeValueHasChanged(this.callable, callable)) { - this.callable =3D callable; - this.callableAdapter.setValue(callable); + if (this.attributeValueHasNotChanged(this.callable, callable)) { + return; } - } - = - private void syncCallable(Boolean callable) { Boolean old =3D this.callable; this.callable =3D callable; - this.firePropertyChanged(CALLABLE_PROPERTY, old, callable); + this.callableAdapter.setValue(callable); + this.firePropertyChanged(CALLABLE_PROPERTY, old, callable); = } = private Boolean buildCallable(CompilationUnit astRoot) { @@ -476,15 +445,12 @@ } = public void setResultClass(String resultClass) { - if (this.attributeValueHasChanged(this.resultClass, resultClass)) { - this.resultClass =3D resultClass; - this.resultClassAdapter.setValue(resultClass); + if (this.attributeValueHasNotChanged(this.resultClass, resultClass)) { + return; } - } - = - private void syncResultClass(String resultClass) { String old =3D this.resultClass; this.resultClass =3D resultClass; + this.resultClassAdapter.setValue(resultClass); this.firePropertyChanged(RESULT_CLASS_PROPERTY, old, resultClass); } = @@ -501,14 +467,14 @@ return this.fullyQualifiedResultClassName; } = - private void syncFullyQualifiedResultClassName(String name) { + private void setFullyQualifiedResultClassName(String name) { String old =3D this.fullyQualifiedResultClassName; this.fullyQualifiedResultClassName =3D name; - this.firePropertyChanged(FULLY_QUALIFIED_RESULT_CLASS_NAME_PROPERTY, old= , fullyQualifiedResultClassName); + this.firePropertyChanged(FULLY_QUALIFIED_RESULT_CLASS_NAME_PROPERTY, old= , name); } = private String buildFullyQualifiedResultClassName(CompilationUnit astRoot= ) { - return (this.resultClass =3D=3D null) ? null : ASTTools.resolveFullyQual= ifiedName(this.resultClassAdapter.getExpression(astRoot)); + return (this.resultClass =3D=3D null) ? null : JDTTools.resolveFullyQual= ifiedName(this.resultClassAdapter.getExpression(astRoot)); } = // ***** result set mapping @@ -517,15 +483,12 @@ } = public void setResultSetMapping(String resultSetMapping) { - if (this.attributeValueHasChanged(this.resultSetMapping, resultSetMappin= g)) { - this.resultSetMapping =3D resultSetMapping; - this.resultSetMappingAdapter.setValue(resultSetMapping); + if (this.attributeValueHasNotChanged(this.resultSetMapping, resultSetMap= ping)) { + return; } - } - = - private void syncResultSetMapping(String resultSetMapping) { String old =3D this.resultSetMapping; this.resultSetMapping =3D resultSetMapping; + this.resultSetMappingAdapter.setValue(resultSetMapping); this.firePropertyChanged(RESULT_SET_MAPPING_PROPERTY, old, resultSetMapp= ing); } = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourc= eNamedQueriesAnnotation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamed= QueriesAnnotation.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamed= QueriesAnnotation.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -10,9 +10,9 @@ *************************************************************************= *****/ package org.jboss.tools.hibernate.jpt.core.internal.resource.java; = +import java.util.ListIterator; import java.util.Vector; = -import org.eclipse.jdt.core.dom.Annotation; import org.eclipse.jdt.core.dom.CompilationUnit; import org.eclipse.jpt.core.internal.resource.java.source.AnnotationContai= nerTools; import org.eclipse.jpt.core.internal.resource.java.source.SourceAnnotation; @@ -21,14 +21,15 @@ import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.utility.jdt.Member; import org.eclipse.jpt.utility.internal.CollectionTools; +import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; = /** * @author Dmitry Geraskov * */ -public class HibernateSourceNamedQueriesAnnotation extends SourceAnnotatio= n implements - HibernateNamedQueriesAnnotation { +public class HibernateSourceNamedQueriesAnnotation extends SourceAnnotatio= n = +implements HibernateNamedQueriesAnnotation { = public static final DeclarationAnnotationAdapter DECLARATION_ANNOTATION_A= DAPTER =3D new SimpleDeclarationAnnotationAdapter(ANNOTATION_NAME); = @@ -47,8 +48,8 @@ AnnotationContainerTools.initialize(this, astRoot); } = - public void synchronizeWith(CompilationUnit astRoot) { - AnnotationContainerTools.synchronize(this, astRoot); + public void update(CompilationUnit astRoot) { + AnnotationContainerTools.update(this, astRoot); } = @Override @@ -57,61 +58,59 @@ } = // ********** AnnotationContainer implementation ********** + + public String getContainerAnnotationName() { + return this.getAnnotationName(); + } + + public org.eclipse.jdt.core.dom.Annotation getContainerJdtAnnotation(Comp= ilationUnit astRoot) { + return this.getJdtAnnotation(astRoot); + } + public String getElementName() { return Hibernate.NAMED_QUERIES__VALUE; } - = - public String getNestedAnnotationName() { + + public String getNestableAnnotationName() { return HibernateNamedQueryAnnotation.ANNOTATION_NAME; - } = + } = - public String getContainerAnnotationName() { - return this.getAnnotationName(); + public ListIterator nestedAnnotations() { + return new CloneListIterator(this.hiberna= teNamedQueries); } - = - public Iterable getNestedAnnotations() { - return this.hibernateNamedQueries; - } - = - public int getNestedAnnotationsSize() { + + public int nestedAnnotationsSize() { return this.hibernateNamedQueries.size(); } - = - public HibernateNamedQueryAnnotation addNestedAnnotation() { - return this.addNestedAnnotation(this.hibernateNamedQueries.size()); - } - = - private HibernateNamedQueryAnnotation addNestedAnnotation(int index) { - HibernateNamedQueryAnnotation namedQuery =3D this.buildHibernateNamedQue= ry(index); + + public HibernateNamedQueryAnnotation addNestedAnnotationInternal() { + HibernateNamedQueryAnnotation namedQuery =3D this.buildHibernateNamedQue= ry(this.hibernateNamedQueries.size()); this.hibernateNamedQueries.add(namedQuery); return namedQuery; } - = - public void syncAddNestedAnnotation(Annotation astAnnotation) { - int index =3D this.hibernateNamedQueries.size(); - HibernateNamedQueryAnnotation namedQuery =3D this.addNestedAnnotation(in= dex); - namedQuery.initialize((CompilationUnit) astAnnotation.getRoot()); - this.fireItemAdded(HIBERNATE_NAMED_QUERIES_LIST, index, namedQuery); - } - = + private HibernateNamedQueryAnnotation buildHibernateNamedQuery(int index)= { return HibernateSourceNamedQueryAnnotation.createNestedHibernateNamedQue= ry(this, member, index, this.daa); } - - public org.eclipse.jdt.core.dom.Annotation getContainerJdtAnnotation(Comp= ilationUnit astRoot) { - return this.getAstAnnotation(astRoot); + = + public void nestedAnnotationAdded(int index, HibernateNamedQueryAnnotatio= n nestedAnnotation) { + this.fireItemAdded(HIBERNATE_NAMED_QUERIES_LIST, index, nestedAnnotation= ); } = - public HibernateNamedQueryAnnotation moveNestedAnnotation(int targetIndex= , int sourceIndex) { + public HibernateNamedQueryAnnotation moveNestedAnnotationInternal(int tar= getIndex, int sourceIndex) { return CollectionTools.move(this.hibernateNamedQueries, targetIndex, sou= rceIndex).get(targetIndex); } = - public HibernateNamedQueryAnnotation removeNestedAnnotation(int index) { + public void nestedAnnotationMoved(int targetIndex, int sourceIndex) { + this.fireItemMoved(HIBERNATE_NAMED_QUERIES_LIST, targetIndex, sourceInde= x); + } + + public HibernateNamedQueryAnnotation removeNestedAnnotationInternal(int i= ndex) { return this.hibernateNamedQueries.remove(index); } = - public void syncRemoveNestedAnnotations(int index) { - this.removeItemsFromList(index, this.hibernateNamedQueries, HIBERNATE_NA= MED_QUERIES_LIST); + public void nestedAnnotationRemoved(int index, HibernateNamedQueryAnnotat= ion nestedAnnotation) { + this.fireItemRemoved(HIBERNATE_NAMED_QUERIES_LIST, index, nestedAnnotati= on); } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourc= eNamedQueryAnnotation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamed= QueryAnnotation.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/HibernateSourceNamed= QueryAnnotation.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -111,10 +111,6 @@ this.readOnlyAdapter =3D new ShortCircuitAnnotationElementAdapter(member, readOnlyDeclarationAdapter); } = - public String getAnnotationName() { - return ANNOTATION_NAME; - } - = public void initialize(CompilationUnit astRoot) { this.name =3D this.buildName(astRoot); this.query =3D this.buildQuery(astRoot); @@ -128,19 +124,23 @@ this.readOnly =3D this.buildReadOnly(astRoot); } = - public void synchronizeWith(CompilationUnit astRoot) { - this.syncName(this.buildName(astRoot)); - this.syncQuery(this.buildQuery(astRoot)); - this.syncFlushMode(this.buildFlushMode(astRoot)); - this.syncCacheMode(this.buildCacheMode(astRoot)); - this.syncCacheable(this.buildCacheable(astRoot)); - this.syncCacheRegion(this.buildCacheRegion(astRoot)); - this.syncFetchSize(this.buildFetchSize(astRoot)); - this.syncTimeout(this.buildTimeout(astRoot)); - this.syncComment(this.buildComment(astRoot)); - this.syncReadOnly(this.buildReadOnly(astRoot)); + public void update(CompilationUnit astRoot) { + this.setName(this.buildName(astRoot)); + this.setQuery(this.buildQuery(astRoot)); + this.setFlushMode(this.buildFlushMode(astRoot)); + this.setCacheMode(this.buildCacheMode(astRoot)); + this.setCacheable(this.buildCacheable(astRoot)); + this.setCacheRegion(this.buildCacheRegion(astRoot)); + this.setFetchSize(this.buildFetchSize(astRoot)); + this.setTimeout(this.buildTimeout(astRoot)); + this.setComment(this.buildComment(astRoot)); + this.setReadOnly(this.buildReadOnly(astRoot)); } = + public String getAnnotationName() { + return ANNOTATION_NAME; + } + /** * convenience method */ @@ -156,16 +156,13 @@ } = public void setName(String name) { - if (this.attributeValueHasChanged(this.name, name)) { - this.name =3D name; - this.nameAdapter.setValue(name); + if (this.attributeValueHasNotChanged(this.name, name)) { + return; } - } - = - private void syncName(String astName) { String old =3D this.name; - this.name =3D astName; - this.firePropertyChanged(NAME_PROPERTY, old, astName); + this.name =3D name; + this.nameAdapter.setValue(name); + this.firePropertyChanged(NAME_PROPERTY, old, name); } = private String buildName(CompilationUnit astRoot) { @@ -182,16 +179,13 @@ } = public void setQuery(String query) { - if (this.attributeValueHasChanged(this.query, query)) { - this.query =3D query; - this.queryAdapter.setValue(query); + if (this.attributeValueHasNotChanged(this.query, query)) { + return; } - } - - private void syncQuery(String annotationQuery) { String old =3D this.query; - this.query =3D annotationQuery; - this.firePropertyChanged(QUERY_PROPERTY, old, annotationQuery); + this.query =3D query; + this.queryAdapter.setValue(query); + this.firePropertyChanged(QUERY_PROPERTY, old, query); } = private String buildQuery(CompilationUnit astRoot) { @@ -201,6 +195,10 @@ public TextRange getQueryTextRange(CompilationUnit astRoot) { return this.getElementTextRange(this.queryDeclarationAdapter, astRoot); } + + String getQueryElementName() { + return Hibernate.NAMED_QUERY__QUERY; + } = // ***** hints public ListIterator hints() { @@ -241,17 +239,14 @@ public FlushModeType getFlushMode() { return flushMode; } - = + public void setFlushMode(FlushModeType flushMode) { - if (this.attributeValueHasChanged(this.flushMode, flushMode)) { - this.flushMode =3D flushMode; - this.flushModeAdapter.setValue(FlushModeType.toJavaAnnotationValue(flus= hMode)); + if (this.attributeValueHasNotChanged(this.flushMode, flushMode)) { + return; } - } - = - private void syncFlushMode(FlushModeType flushMode) { FlushModeType old =3D this.flushMode; this.flushMode =3D flushMode; + this.flushModeAdapter.setValue(FlushModeType.toJavaAnnotationValue(flush= Mode)); this.firePropertyChanged(FLUSH_MODE_PROPERTY, old, flushMode); } = @@ -266,19 +261,16 @@ // ***** caheMode = public CacheModeType getCacheMode() { - return this.cacheMode; + return cacheMode; } = public void setCacheMode(CacheModeType cacheMode) { - if (this.attributeValueHasChanged(this.cacheMode, cacheMode)) { - this.cacheMode =3D cacheMode; - this.cacheModeAdapter.setValue(CacheModeType.toJavaAnnotationValue(cach= eMode)); + if (this.attributeValueHasNotChanged(this.cacheMode, cacheMode)) { + return; } - } - = - private void syncCacheMode(CacheModeType cacheMode) { CacheModeType old =3D this.cacheMode; this.cacheMode =3D cacheMode; + this.cacheModeAdapter.setValue(CacheModeType.toJavaAnnotationValue(cache= Mode)); this.firePropertyChanged(CACHE_MODE_PROPERTY, old, cacheMode); } = @@ -296,15 +288,12 @@ } = public void setCacheable(Boolean cacheable){ - if (this.attributeValueHasChanged(this.cacheable, cacheable)) { - this.cacheable =3D cacheable; - this.cacheableAdapter.setValue(cacheable); + if (this.attributeValueHasNotChanged(this.cacheable, cacheable)) { + return; } - } - = - private void syncCacheable(Boolean cacheable) { Boolean old =3D this.cacheable; this.cacheable =3D cacheable; + this.cacheableAdapter.setValue(cacheable); this.firePropertyChanged(CACHEABLE_PROPERTY, old, cacheable); } = @@ -318,15 +307,12 @@ } = public void setCacheRegion(String cacheRegion){ - if (this.attributeValueHasChanged(this.cacheRegion, cacheRegion)) { - this.cacheRegion =3D cacheRegion; - this.cacheRegionAdapter.setValue(cacheRegion); + if (this.attributeValueHasNotChanged(this.cacheRegion, cacheRegion)) { + return; } - } - = - private void syncCacheRegion(String cacheRegion) { String old =3D this.cacheRegion; this.cacheRegion =3D cacheRegion; + this.cacheRegionAdapter.setValue(cacheRegion); this.firePropertyChanged(CACHE_REGION_PROPERTY, old, cacheRegion); } = @@ -339,15 +325,12 @@ } = public void setFetchSize(Integer fetchSize){ - if (this.attributeValueHasChanged(this.fetchSize, fetchSize)) { - this.fetchSize =3D fetchSize; - this.fetchSizeAdapter.setValue(fetchSize); + if (this.attributeValueHasNotChanged(this.fetchSize, fetchSize)) { + return; } - } - = - private void syncFetchSize(Integer fetchSize) { Integer old =3D this.fetchSize; this.fetchSize =3D fetchSize; + this.fetchSizeAdapter.setValue(fetchSize); this.firePropertyChanged(FETCH_SIZE_PROPERTY, old, fetchSize); } = @@ -359,15 +342,12 @@ return this.timeout; = } public void setTimeout(Integer timeout){ - if (this.attributeValueHasChanged(this.timeout, timeout)) { - this.timeout =3D timeout; - this.timeoutAdapter.setValue(timeout); + if (this.attributeValueHasNotChanged(this.timeout, timeout)) { + return; } - } - = - private void syncTimeout(Integer timeout) { Integer old =3D this.timeout; this.timeout =3D timeout; + this.timeoutAdapter.setValue(timeout); this.firePropertyChanged(TIMEOUT_PROPERTY, old, timeout); } = @@ -380,15 +360,12 @@ } = public void setComment(String comment){ - if (this.attributeValueHasChanged(this.comment, comment)) { - this.comment =3D comment; - this.commentAdapter.setValue(comment); + if (this.attributeValueHasNotChanged(this.comment, comment)) { + return; } - } - = - private void syncComment(String comment) { String old =3D this.comment; this.comment =3D comment; + this.commentAdapter.setValue(comment); this.firePropertyChanged(COMMENT_PROPERTY, old, comment); } = @@ -401,16 +378,13 @@ } = public void setReadOnly(Boolean readOnly){ - if (this.attributeValueHasChanged(this.readOnly, readOnly)) { - this.readOnly =3D readOnly; - this.readOnlyAdapter.setValue(readOnly); - } = - } - = - private void syncReadOnly(Boolean readOnly) { + if (this.attributeValueHasNotChanged(this.readOnly, readOnly)) { + return; + } Boolean old =3D this.readOnly; this.readOnly =3D readOnly; - this.firePropertyChanged(READ_ONLY_PROPERTY, old, readOnly); + this.readOnlyAdapter.setValue(readOnly); + this.firePropertyChanged(READ_ONLY_PROPERTY, old, readOnly); = } = private Boolean buildReadOnly(CompilationUnit astRoot) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/resource/java/IndexAnnotatio= nImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/IndexAnnotationImpl.= java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/IndexAnnotationImpl.= java 2010-05-26 13:13:34 UTC (rev 22326) @@ -63,9 +63,9 @@ this.columnNames =3D this.buildColumnNames(astRoot); } = - public void synchronizeWith(CompilationUnit astRoot) { - this.syncName(this.buildName(astRoot)); - this.syncColumnNames(this.buildColumnNames(astRoot)); + public void update(CompilationUnit astRoot) { + this.setName(this.buildName(astRoot)); + this.setColumnNames(this.buildColumnNames(astRoot)); } = public String[] getColumnNames() { @@ -77,29 +77,23 @@ } = public void setName(String newName) { - if (this.attributeValueHasChanged(this.name, newName)) { - this.name =3D newName; - this.nameAdapter.setValue(newName); + if (this.attributeValueHasNotChanged(this.name, newName)) { + return; } - } - = - private void syncName(String astName) { String old =3D this.name; - this.name =3D astName; - this.firePropertyChanged(NAME_PROPERTY, old, astName); + this.name =3D newName; + this.nameAdapter.setValue(newName); + this.firePropertyChanged(NAME_PROPERTY, old, newName); } = public void setColumnNames(String[] newColumnNames) { - if (this.attributeValueHasChanged(this.columnNames, newColumnNames)) { - this.columnNames =3D newColumnNames; - this.columnNamesAdapter.setValue(newColumnNames); + if (this.attributeValueHasNotChanged(this.columnNames, newColumnNames)) { + return; } - } - = - private void syncColumnNames(String[] columnNames) { String[] old =3D this.columnNames; - this.columnNames =3D columnNames; - this.firePropertyChanged(COLUMN_NAMES_PROPERTY, old, columnNames); + this.columnNames =3D newColumnNames; + this.columnNamesAdapter.setValue(newColumnNames); + this.firePropertyChanged(COLUMN_NAMES_PROPERTY, old, newColumnNames); } = private String buildName(CompilationUnit astRoot) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/resource/java/SourceGenericG= eneratorsAnnotation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/SourceGenericGenerat= orsAnnotation.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/SourceGenericGenerat= orsAnnotation.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -10,6 +10,7 @@ *************************************************************************= *****/ package org.jboss.tools.hibernate.jpt.core.internal.resource.java; = +import java.util.ListIterator; import java.util.Vector; = import org.eclipse.jdt.core.IAnnotation; @@ -24,7 +25,7 @@ import org.eclipse.jpt.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.core.utility.jdt.Member; import org.eclipse.jpt.utility.internal.CollectionTools; -import org.eclipse.jpt.utility.internal.iterables.LiveCloneIterable; +import org.eclipse.jpt.utility.internal.iterators.CloneListIterator; import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; = /** @@ -51,8 +52,8 @@ AnnotationContainerTools.initialize(this, astRoot); } = - public void synchronizeWith(CompilationUnit astRoot) { - AnnotationContainerTools.synchronize(this, astRoot); + public void update(CompilationUnit astRoot) { + AnnotationContainerTools.update(this, astRoot); } = @Override @@ -66,53 +67,54 @@ return this.getAnnotationName(); } = + public org.eclipse.jdt.core.dom.Annotation getContainerJdtAnnotation(Comp= ilationUnit astRoot) { + return this.getJdtAnnotation(astRoot); + } + public String getElementName() { return Hibernate.GENERIC_GENERATORS__VALUE; } = - public String getNestedAnnotationName() { + public String getNestableAnnotationName() { return GenericGeneratorAnnotation.ANNOTATION_NAME; } = - public Iterable getNestedAnnotations() { - return new LiveCloneIterable(this.genericGen= erators); + public ListIterator nestedAnnotations() { + return new CloneListIterator(this.genericGen= erators); } = - public int getNestedAnnotationsSize() { + public int nestedAnnotationsSize() { return this.genericGenerators.size(); } - = - public GenericGeneratorAnnotation addNestedAnnotation() { - return this.addNestedAnnotation(this.genericGenerators.size()); - } - = - private GenericGeneratorAnnotation addNestedAnnotation(int index) { - GenericGeneratorAnnotation genericGenerator =3D this.buildGenericGenerat= or(index); + + public GenericGeneratorAnnotation addNestedAnnotationInternal() { + GenericGeneratorAnnotation genericGenerator =3D this.buildGenericGenerat= or(this.genericGenerators.size()); this.genericGenerators.add(genericGenerator); return genericGenerator; } - = - public void syncAddNestedAnnotation(org.eclipse.jdt.core.dom.Annotation a= stAnnotation) { - int index =3D this.genericGenerators.size(); - GenericGeneratorAnnotation genericGenerator =3D this.addNestedAnnotation= (index); - genericGenerator.initialize((CompilationUnit) astAnnotation.getRoot()); - this.fireItemAdded(GENERIC_GENERATORS_LIST, index, genericGenerator); - } = private GenericGeneratorAnnotation buildGenericGenerator(int index) { return GenericGeneratorAnnotationImpl.createNestedGenericGenerator(this,= member, index, this.daa); } = - public GenericGeneratorAnnotation moveNestedAnnotation(int targetIndex, i= nt sourceIndex) { + public void nestedAnnotationAdded(int index, GenericGeneratorAnnotation n= estedAnnotation) { + this.fireItemAdded(GENERIC_GENERATORS_LIST, index, nestedAnnotation); + } + + public GenericGeneratorAnnotation moveNestedAnnotationInternal(int target= Index, int sourceIndex) { return CollectionTools.move(this.genericGenerators, targetIndex, sourceI= ndex).get(targetIndex); } = - public GenericGeneratorAnnotation removeNestedAnnotation(int index) { + public void nestedAnnotationMoved(int targetIndex, int sourceIndex) { + this.fireItemMoved(GENERIC_GENERATORS_LIST, targetIndex, sourceIndex); + } + + public GenericGeneratorAnnotation removeNestedAnnotationInternal(int inde= x) { return this.genericGenerators.remove(index); } - = - public void syncRemoveNestedAnnotations(int index) { - this.removeItemsFromList(index, this.genericGenerators, GENERIC_GENERATO= RS_LIST); + + public void nestedAnnotationRemoved(int index, GenericGeneratorAnnotation= nestedAnnotation) { + this.fireItemRemoved(GENERIC_GENERATORS_LIST, index, nestedAnnotation); } = public static class GenericGeneratorsAnnotationDefinition implements Anno= tationDefinition { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/s= rc/org/jboss/tools/hibernate/jpt/core/internal/resource/java/SourceParamete= rAnnotation.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/SourceParameterAnnot= ation.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/src/org= /jboss/tools/hibernate/jpt/core/internal/resource/java/SourceParameterAnnot= ation.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -72,9 +72,9 @@ this.value =3D this.buildValue(astRoot); } = - public void synchronizeWith(CompilationUnit astRoot) { - this.syncName(this.buildName(astRoot)); - this.syncValue(this.buildValue(astRoot)); + public void update(CompilationUnit astRoot) { + this.setName(this.buildName(astRoot)); + this.setValue(this.buildValue(astRoot)); } = public IndexedAnnotationAdapter getIndexedAnnotationAdapter() { @@ -95,16 +95,13 @@ } = public void setName(String name) { - if (this.attributeValueHasChanged(this.name, name)) { - this.name =3D name; - this.nameAdapter.setValue(name); + if (this.attributeValueHasNotChanged(this.name, name)) { + return; } - } - = - private void syncName(String astName) { String old =3D this.name; - this.name =3D astName; - this.firePropertyChanged(NAME_PROPERTY, old, astName); + this.name =3D name; + this.nameAdapter.setValue(name); + this.firePropertyChanged(NAME_PROPERTY, old, name); } = private String buildName(CompilationUnit astRoot) { @@ -121,15 +118,12 @@ } = public void setValue(String value) { - if (this.attributeValueHasChanged(this.value, value)) { - this.value =3D value; - this.valueAdapter.setValue(value); + if (this.attributeValueHasNotChanged(this.value, value)) { + return; } - } - = - private void syncValue(String value) { String old =3D this.value; this.value =3D value; + this.valueAdapter.setValue(value); this.firePropertyChanged(VALUE_PROPERTY, old, value); } = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/MET= A-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/= MANIFEST.MF 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/META-INF/= MANIFEST.MF 2010-05-26 13:13:34 UTC (rev 22326) @@ -16,8 +16,8 @@ org.eclipse.ui.forms, org.jboss.tools.hibernate.jpt.core, org.eclipse.ui.ide, - org.eclipse.jpt.core;bundle-version=3D"[2.3.0,2.3.1)", - org.eclipse.jpt.ui;bundle-version=3D"[2.3.0,2.3.1)", + org.eclipse.jpt.core, + org.eclipse.jpt.ui, org.eclipse.jpt.utility, org.eclipse.jpt.db;bundle-version=3D"1.2.100", org.eclipse.ui.views.properties.tabbed;bundle-version=3D"3.5.0" Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntity= Composite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntityCompos= ite.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaEntityCompos= ite.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -10,23 +10,16 @@ *************************************************************************= *****/ package org.jboss.tools.hibernate.jpt.ui.internal.java.details; = -import org.eclipse.jpt.core.context.Entity; -import org.eclipse.jpt.core.context.GeneratorContainer; -import org.eclipse.jpt.core.context.QueryContainer; import org.eclipse.jpt.ui.WidgetFactory; -import org.eclipse.jpt.ui.internal.details.AbstractEntityComposite; -import org.eclipse.jpt.ui.internal.details.EntityNameComposite; -import org.eclipse.jpt.ui.internal.details.IdClassComposite; -import org.eclipse.jpt.ui.internal.details.java.JavaInheritanceComposite; -import org.eclipse.jpt.ui.internal.details.java.JavaSecondaryTablesComposi= te; -import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.ui.internal.java.details.JavaSecondaryTablesComposi= te; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.mappings.details.AbstractEntityComposit= e; +import org.eclipse.jpt.ui.internal.mappings.details.EntityNameComposite; +import org.eclipse.jpt.ui.internal.mappings.details.IdClassComposite; import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateGenera= torContainer; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateIdMapp= ing; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEntity; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaQueryContainer; -import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.Hibernate= GenerationComposite2; +import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.Hibernate= GeneratorsComposite; import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.Hibernate= QueriesComposite; import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.Hibernate= TableComposite; = @@ -46,41 +39,42 @@ super(subjectHolder, parent, widgetFactory); } = - = @Override - protected void initializeQueriesSection(Composite container, PropertyValu= eModel queryContainerHolder) { - new HibernateQueriesComposite(this, (PropertyValueModel) queryContainerHolder, container); + protected void addSecondaryTablesComposite(Composite container) { + new JavaSecondaryTablesComposite(this, container); } = - private PropertyValueModel buildGeneratorCon= tainer() { - return new PropertyAspectAdapter(getSubjectHolder()) { - @Override - protected HibernateGeneratorContainer buildValue_() { - return this.subject.getGeneratorContainer(); - } - }; + @Override + protected void initializeQueriesPane(Composite container) { + container =3D addCollapsableSection( + container, + JptUiMappingsMessages.EntityComposite_queries + ); + = + new HibernateQueriesComposite(this, container); } = @Override - protected void initializeGeneratorsSection(Composite container, PropertyV= alueModel generatorContainerHolder) { - new HibernateGenerationComposite2(this, (PropertyValueModel) generatorContainerHolder, addSubPane(container,= 10), true); + protected void initializeGeneratorsPane(Composite container) { + container =3D addCollapsableSection( + container, + JptUiMappingsMessages.IdMappingComposite_primaryKeyGenerationSection + ); + = + new HibernateGeneratorsComposite(this, container); } = - = - protected void initializeEntitySection(Composite container) { - new HibernateTableComposite(this, container); - new EntityNameComposite(this, container); - new IdClassComposite(this, buildIdClassReferenceHolder(), container); - } - = @Override - protected void initializeSecondaryTablesSection(Composite container) { - new JavaSecondaryTablesComposite(this, container); + protected void addInheritanceComposite(Composite container) { + new HibernateJavaInheritanceComposite(this, container); } + = + protected void initializeGeneralPane(Composite container) { + int groupBoxMargin =3D getGroupBoxMargin(); = - @Override - protected void initializeInheritanceSection(Composite container) { - new JavaInheritanceComposite(this, container); + new HibernateTableComposite(this, container); + new EntityNameComposite(this, addSubPane(container, 0, groupBoxMargin, 0= , groupBoxMargin)); + new IdClassComposite(this, addSubPane(container, 0, groupBoxMargin, 0, g= roupBoxMargin), false); } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaInheri= tanceComposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaInheritanceC= omposite.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/java/details/HibernateJavaInheritanceC= omposite.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -11,8 +11,8 @@ package org.jboss.tools.hibernate.jpt.ui.internal.java.details; = import org.eclipse.jpt.core.context.java.JavaEntity; -import org.eclipse.jpt.ui.internal.details.java.JavaPrimaryKeyJoinColumnsC= omposite; -import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.ui.internal.java.details.JavaPrimaryKeyJoinColumnsC= omposite; +import org.eclipse.jpt.ui.internal.widgets.FormPane; import org.eclipse.swt.widgets.Composite; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEntity; import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.Hibernate= AbstractInheritanceComposite; @@ -24,9 +24,9 @@ public class HibernateJavaInheritanceComposite extends HibernateAbstractIn= heritanceComposite { = @SuppressWarnings("unchecked") - public HibernateJavaInheritanceComposite(Pane paren= tPane, + public HibernateJavaInheritanceComposite(FormPane p= arentPane, Composite parent) { - super((Pane) parentPane, parent); + super((FormPane) parentPane, parent); } = protected void addPrimaryKeyJoinColumnsComposite(Composite container) { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GeneratedComposi= te.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/GeneratedComposite.jav= a 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/GeneratedComposite.jav= a 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -14,7 +14,7 @@ import java.util.Collection; = import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.ui.internal.widgets.FormPane; import org.eclipse.swt.widgets.Composite; import org.jboss.tools.hibernate.jpt.core.internal.context.Generated; import org.jboss.tools.hibernate.jpt.core.internal.context.GenerationTime; @@ -23,14 +23,14 @@ * @author Dmitry Geraskov * */ -public class GeneratedComposite extends Pane { +public class GeneratedComposite extends FormPane { /** * Creates a new GeneratedComposite. * * @param parentPane The parent container of this one * @param parent The parent container */ - public GeneratedComposite(Pane parentPane, + public GeneratedComposite(FormPane parentPane, Composite parent) { = super(parentPane, parent); Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/o= rg/jboss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsC= omposite.java (from rev 22306, trunk/hibernatetools/plugins/org.jboss.tools= .hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/det= ails/GenericGeneratorsComposite.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsCompo= site.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/GenericGeneratorsCompo= site.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,302 @@ +/*************************************************************************= ****** + * Copyright (c) 2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.hibernate.jpt.ui.internal.mapping.details; + +import java.util.HashSet; +import java.util.Iterator; +import java.util.ListIterator; +import java.util.Set; + +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.LabelProvider; +import org.eclipse.jface.window.Window; +import org.eclipse.jpt.core.context.Generator; +import org.eclipse.jpt.ui.internal.mappings.db.SequenceCombo; +import org.eclipse.jpt.ui.internal.util.ControlEnabler; +import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; +import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; +import org.eclipse.jpt.utility.internal.CollectionTools; +import org.eclipse.jpt.utility.internal.StringConverter; +import org.eclipse.jpt.utility.internal.model.value.ItemPropertyListValueM= odelAdapter; +import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter; +import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.utility.internal.model.value.SimpleListValueModel; +import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueMod= el; +import org.eclipse.jpt.utility.internal.model.value.TransformationProperty= ValueModel; +import org.eclipse.jpt.utility.internal.model.value.swing.ObjectListSelect= ionModel; +import org.eclipse.jpt.utility.model.value.ListValueModel; +import org.eclipse.jpt.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= r; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= rHolder; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaIdMapping; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaGeneri= cGeneratorImpl; +import org.jboss.tools.hibernate.jpt.ui.internal.widgets.EnterNameDialog; + +/** + * @author Dmitry Geraskov + * + * + * Here the layout of this pane: + * 
    + * -----------------------------------------------------------------------=
------
+ * |                     -------------------------------------------------=
---- |
+ * | Name:               | I                                              =
   | |
+ * |                     -------------------------------------------------=
---- |
+ * |                     -------------------------------------------------=
---- |
+ * | Sequence 		   : | SequenceCombo                                     |=
 |
+ * |                     -------------------------------------------------=
---- |
+ * | - Parameters  -------------------------------------------------------=
---- |
+ * | | -------------------------------------------------------------------=
-- | |
+ * | | |                                                                  =
 | | |
+ * | | | ParametersComposite                                              =
 | | |
+ * | | |                                                                  =
 | | |
+ * | | -------------------------------------------------------------------=
-- | |
+ * | ---------------------------------------------------------------------=
---- |
+ * -----------------------------------------------------------------------=
------
    + * + * @see HibernateGeneratorsComposite + * @see GenericGenerator + * @see HibernateGenerationComposite - The parent container + * @see SequenceCombo + * + * @version 2.0 + * @since 1.0 + */ +public class GenericGeneratorsComposite extends Pane { + = + private AddRemoveListPane listPane; + private WritablePropertyValueModel generatorHolder; + + public GenericGeneratorsComposite(Pane = parentPane, Composite parent) { + super(parentPane, parent, false); + } + = + private void addGenericGenerator() { + Set generatorNames =3D new HashSet(); + for (Iterator generators =3D this.getSubject().getPersistence= Unit().generators(); generators.hasNext(); ) { + generatorNames.add(generators.next().getName()); + } + EnterNameDialog dialog =3D new EnterNameDialog(getControl().getShell(), + HibernateUIMappingMessages.GenericGeneratorsComposite_addGeneratorNameD= escription, + null, + generatorNames); + if (dialog.open() !=3D Window.OK) { + return; + } + String name =3D dialog.getName(); + GenericGenerator generator =3D getSubject().addGenericGenerator(getSubje= ct().genericGeneratorsSize()); + generator.setName(name); + } + = + private ListValueModel buildDisplayableGeneratorsListHo= lder() { + return new ItemPropertyListValueModelAdapter( + buildGeneratorsListHolder(), + GenericGenerator.NAME_PROPERTY + ); + } + = + private ListValueModel buildGeneratorsListHolder() { + return new ListAspectAdapter( + getSubjectHolder(), + GenericGeneratorHolder.GENERIC_GENERATORS_LIST) + { + @Override + protected ListIterator listIterator_() { + return this.subject.genericGenerators(); + } + + @Override + protected int size_() { + return this.subject.genericGeneratorsSize(); + } + }; + } + = + private AddRemoveListPane addListPane(Composite c= ontainer) { + + return new AddRemoveListPane( + this, + container, + buildGenericGeneratorsAdapter(), + buildDisplayableGeneratorsListHolder(), + this.generatorHolder, + buildGeneratorsListLabelProvider(), + null//TODO help + ); + } + = + private Adapter buildGenericGeneratorsAdapter() { + + return new AddRemoveListPane.AbstractAdapter() { + + public void addNewItem(ObjectListSelectionModel listSelectionModel) { + addGenericGenerator(); + } + + public void removeSelectedItems(ObjectListSelectionModel listSelectionM= odel) { + for (Object item : listSelectionModel.selectedValues()) { + getSubject().removeGenericGenerator((GenericGenerator) item); + } + } + }; + } + + + private ILabelProvider buildGeneratorsListLabelProvider() { + return new LabelProvider() { + @Override + public String getText(Object element) { + GenericGenerator genericGenerator =3D (GenericGenerator) element; + String name =3D genericGenerator.getName(); + + if (name =3D=3D null) { + int index =3D CollectionTools.indexOf(getSubject().genericGenerators(= ), genericGenerator); + name =3D NLS.bind(HibernateUIMappingMessages.GenericGeneratorsComposi= te_generatorNullName, index); + } + + return name; + } + }; + } + + private WritablePropertyValueModel buildGenericGenerato= rHolder() { + return new SimplePropertyValueModel(); + } + + @Override + public void enableWidgets(boolean enabled) { + super.enableWidgets(enabled); + this.listPane.enableWidgets(enabled); + } + + @Override + protected void initialize() { + super.initialize(); + this.generatorHolder =3D buildGenericGeneratorHolder(); + } + + @Override + protected void initializeLayout(Composite container) { + + if (getSubject() instanceof HibernateJavaIdMapping){ + // Name widgets + addLabeledText( + container, + HibernateUIMappingMessages.GenericGeneratorComposite_name, + buildGeneratorNameHolder(), + null//TODO add help + ); + } else { + // List pane + this.listPane =3D addListPane(container); + } = + = + Combo c =3D addLabeledEditableCombo( + container, + HibernateUIMappingMessages.GenericGeneratorComposite_strategy, + new SimpleListValueModel(JavaGenericGeneratorImpl.generatorClas= ses), + buildStrategyHolder(), + StringConverter.Default.instance(), + null);//TODO add help + new ControlEnabler(buildControlEnabler(), c); = + = + new ParametersComposite(this, container, generatorHolder); + = + = + } + = + private PropertyValueModel buildControlEnabler() { + return new TransformationPropertyValueModel(g= eneratorHolder){ + public Boolean transform(GenericGenerator generator) { + return generator !=3D null; + } + }; + } + = + protected final WritablePropertyValueModel buildGeneratorNameHold= er() { + return new PropertyAspectAdapter(this.generato= rHolder, GenericGenerator.NAME_PROPERTY) { + @Override + protected String buildValue_() { + return subject =3D=3D null ? null : subject.getName(); + } + + @Override + public void setValue(String value) { + if (subject !=3D null) { + setValue_(value); + return; + } + = + if ("".equals(value)){ //$NON-NLS-1$ + return; + } + = + GenericGenerator generator =3D = + (getSubject().genericGeneratorsSize() =3D=3D 0) ? getSubject().addGen= ericGenerator(0) + : getSubject().genericGenerators().next(); + + generator.setName(value); + generatorHolder.setValue(generator); + } + + @Override + protected void setValue_(String value) { + if ("".equals(value)) {//$NON-NLS-1$ + value =3D null; + } + subject.setName(value); + } + }; + } + + protected WritablePropertyValueModel buildStrategyHolder() { + return new PropertyAspectAdapter(this.generato= rHolder, + GenericGenerator.GENERIC_STRATEGY_PROPERTY) { + @Override + protected String buildValue_() { + return subject =3D=3D null ? null : subject.getStrategy(); + } + = + @Override + public void setValue(String value) { + if (subject !=3D null) { + setValue_(value); + return; + } + = + if ("".equals(value)){ //$NON-NLS-1$ + return; + } + = + GenericGenerator generator =3D = + (getSubject().genericGeneratorsSize() =3D=3D 0) ? getSubject().addGen= ericGenerator(0) + : getSubject().genericGenerators().next(); + + generator.setStrategy(value); + } + + @Override + protected void setValue_(String value) { + if ("".equals(value)) {//$NON-NLS-1$ + value =3D null; + } + subject.setStrategy(value); + } + }; + } + = + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateAbstrac= tInheritanceComposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateAbstractInher= itanceComposite.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateAbstractInher= itanceComposite.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -15,24 +15,25 @@ import org.eclipse.jpt.core.context.Entity; import org.eclipse.jpt.core.context.InheritanceType; import org.eclipse.jpt.ui.internal.JpaHelpContextIds; -import org.eclipse.jpt.ui.internal.details.AbstractEntityComposite; -import org.eclipse.jpt.ui.internal.details.AbstractInheritanceComposite; -import org.eclipse.jpt.ui.internal.details.DiscriminatorColumnComposite; -import org.eclipse.jpt.ui.internal.details.JptUiDetailsMessages; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.mappings.db.ColumnCombo; +import org.eclipse.jpt.ui.internal.mappings.details.AbstractEntityComposit= e; +import org.eclipse.jpt.ui.internal.mappings.details.AbstractInheritanceCom= posite; +import org.eclipse.jpt.ui.internal.mappings.details.DiscriminatorColumnCom= posite; +import org.eclipse.jpt.ui.internal.util.ControlEnabler; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.ui.internal.widgets.FormPane; import org.eclipse.jpt.utility.internal.StringConverter; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyListValueModel= Adapter; import org.eclipse.jpt.utility.model.value.ListValueModel; import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel; import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.custom.CCombo; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateEntity; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEntity; -import org.jboss.tools.hibernate.jpt.ui.internal.mappings.db.xpl.ColumnCom= bo; = /** * Here the layout of this pane: @@ -79,7 +80,7 @@ * @since 2.0 */ @SuppressWarnings("nls") -public abstract class HibernateAbstractInheritanceComposite extends Pane { +public abstract class HibernateAbstractInheritanceComposite extends FormPane { = /** * A key used to represent the default value, this is required to convert @@ -98,7 +99,7 @@ * @param parentPane The parent container of this one * @param parent The parent container */ - public HibernateAbstractInheritanceComposite(Pane parentPane, + public HibernateAbstractInheritanceComposite(FormPane parent= Pane, Composite parent) { = super(parentPane, parent, false); @@ -117,13 +118,13 @@ // Strategy widgets addLabeledComposite( subPane, - JptUiDetailsMessages.InheritanceComposite_strategy, + JptUiMappingsMessages.InheritanceComposite_strategy, addStrategyCombo(subPane), JpaHelpContextIds.ENTITY_INHERITANCE_STRATEGY ); = // Discriminator Value widgets - Combo discriminatorValueCombo =3D addEditableCombo( + CCombo discriminatorValueCombo =3D addEditableCCombo( subPane, buildDiscriminatorValueListHolder(), buildDiscriminatorValueHolder(), @@ -131,7 +132,7 @@ ); Label discriminatorValueLabel =3D addLabel( subPane, = - JptUiDetailsMessages.InheritanceComposite_discriminatorValue + JptUiMappingsMessages.InheritanceComposite_discriminatorValue ); addLabeledComposite( subPane, @@ -141,11 +142,14 @@ JpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_VALUE ); = + new ControlEnabler(buildDiscriminatorValueEnabledHolder(), discriminator= ValueCombo, discriminatorValueLabel); + = if (getSubject() instanceof HibernateJavaEntity) { - new HibernateDiscriminatorColumnComposite((Pane) this, container); = + new HibernateDiscriminatorColumnComposite((FormPane) this, container); = } else { new DiscriminatorColumnComposite(this, container); - } = + } + = = // Primary Key Join Columns widgets addPrimaryKeyJoinColumnsComposite(addSubPane(container, 5)); @@ -212,16 +216,16 @@ = if (defaultName.length() > 0) { value =3D NLS.bind( - JptUiDetailsMessages.DefaultWithOneParam, + JptUiMappingsMessages.DefaultWithOneParam, defaultName ); } else { - value =3D JptUiDetailsMessages.ProviderDefault; + value =3D JptUiMappingsMessages.ProviderDefault; } } if (value.startsWith(NONE_KEY)) { - value =3D JptUiDetailsMessages.NoneSelected; + value =3D JptUiMappingsMessages.NoneSelected; } return value; } @@ -278,7 +282,7 @@ @Override protected String displayString(InheritanceType value) { return buildDisplayString( - JptUiDetailsMessages.class, + JptUiMappingsMessages.class, AbstractInheritanceComposite.class, value ); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateAddQuer= yDialog.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateAddQueryDialo= g.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateAddQueryDialo= g.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -14,7 +14,7 @@ import java.util.List; = import org.eclipse.jpt.core.context.Query; -import org.eclipse.jpt.ui.internal.details.JptUiDetailsMessages; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.DialogPane; import org.eclipse.jpt.ui.internal.widgets.ValidatingDialog; import org.eclipse.jpt.utility.internal.StringConverter; @@ -62,17 +62,17 @@ = @Override protected String getTitle() { - return JptUiDetailsMessages.AddQueryDialog_title; + return JptUiMappingsMessages.AddQueryDialog_title; } = @Override protected String getDescriptionTitle() { - return JptUiDetailsMessages.AddQueryDialog_descriptionTitle; + return JptUiMappingsMessages.AddQueryDialog_descriptionTitle; } = @Override protected String getDescription() { - return JptUiDetailsMessages.AddQueryDialog_description; + return JptUiMappingsMessages.AddQueryDialog_description; } = @Override @@ -119,13 +119,13 @@ protected void initializeLayout(Composite container) { this.nameText =3D addLabeledText( container, - JptUiDetailsMessages.AddQueryDialog_name, + JptUiMappingsMessages.AddQueryDialog_name, buildNameHolder() ); = addLabeledCombo( container, = - JptUiDetailsMessages.AddQueryDialog_queryType, = + JptUiMappingsMessages.AddQueryDialog_queryType, = buildQueryTypeListHolder(), = buildQueryTypeHolder(), = buildStringConverter(), @@ -145,10 +145,10 @@ return new StringConverter() { public String convertToString(String value) { if (value =3D=3D Query.NAMED_QUERY) { - return JptUiDetailsMessages.AddQueryDialog_namedQuery; + return JptUiMappingsMessages.AddQueryDialog_namedQuery; } if (value =3D=3D Query.NAMED_NATIVE_QUERY) { - return JptUiDetailsMessages.AddQueryDialog_namedNativeQuery; + return JptUiMappingsMessages.AddQueryDialog_namedNativeQuery; } if (value =3D=3D HibernateNamedQuery.HIBERNATE_NAMED_QUERY) { return HibernateUIMappingMessages.HibernateAddQueryDialog_hibernateN= amedQuery; @@ -237,13 +237,13 @@ = private void addNameProblemsTo(List currentProblems) { if (StringTools.stringIsEmpty(this.name)) { - currentProblems.add(buildProblem(JptUiDetailsMessages.QueryStateObject_= nameMustBeSpecified)); + currentProblems.add(buildProblem(JptUiMappingsMessages.QueryStateObject= _nameMustBeSpecified)); } } = private void addQueryTypeProblemsTo(List currentProblems) { if (StringTools.stringIsEmpty(this.queryType)) { - currentProblems.add(buildProblem(JptUiDetailsMessages.QueryStateObject_= typeMustBeSpecified)); + currentProblems.add(buildProblem(JptUiMappingsMessages.QueryStateObject= _typeMustBeSpecified)); } } = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateBasicMa= ppingComposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateBasicMappingC= omposite.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateBasicMappingC= omposite.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -11,18 +11,29 @@ package org.jboss.tools.hibernate.jpt.ui.internal.mapping.details; = import org.eclipse.jpt.core.context.BasicMapping; +import org.eclipse.jpt.core.context.Converter; +import org.eclipse.jpt.core.context.ConvertibleMapping; +import org.eclipse.jpt.core.context.EnumeratedConverter; +import org.eclipse.jpt.core.context.TemporalConverter; import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.details.JpaComposite; -import org.eclipse.jpt.ui.internal.details.AbstractBasicMappingComposite; -import org.eclipse.jpt.ui.internal.details.ColumnComposite; -import org.eclipse.jpt.ui.internal.details.EnumTypeComposite; -import org.eclipse.jpt.ui.internal.details.FetchTypeComposite; -import org.eclipse.jpt.ui.internal.details.OptionalComposite; -import org.eclipse.jpt.ui.internal.details.TemporalTypeComposite; -import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.ui.internal.BaseJpaUiFactory; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.mappings.details.ColumnComposite; +import org.eclipse.jpt.ui.internal.mappings.details.EnumTypeComposite; +import org.eclipse.jpt.ui.internal.mappings.details.FetchTypeComposite; +import org.eclipse.jpt.ui.internal.mappings.details.OptionalComposite; +import org.eclipse.jpt.ui.internal.mappings.details.TemporalTypeComposite; +import org.eclipse.jpt.ui.internal.widgets.FormPane; +import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.utility.internal.model.value.TransformationProperty= ValueModel; import org.eclipse.jpt.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel; +import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.hibernate.jpt.core.internal.context.Generated; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateColumn; import org.jboss.tools.hibernate.jpt.core.internal.context.IndexHolder; = @@ -74,7 +85,7 @@ * @version 2.0 * @since 1.0 */ -public class HibernateBasicMappingComposite extends AbstractBasicMappingCo= mposite +public class HibernateBasicMappingComposite extends FormPane implements JpaComposite { /** @@ -93,30 +104,194 @@ = @Override protected void initializeLayout(Composite container) { - super.initializeLayout(container); - this.initializeIndexCollapsibleSection(container); + initializeGeneralPane(container); + initializeTypePane(container); + initializeIndexPane(container); } = - protected void initializeBasicSection(Composite container) { - new HibernateColumnComposite(this, (PropertyValueModel) buildColumnHolder(), container); + @SuppressWarnings("unchecked") + private void initializeGeneralPane(Composite container) { + int groupBoxMargin =3D getGroupBoxMargin(); + + new HibernateColumnComposite(this, buildColumnHolder(), container); + + // Align the widgets under the ColumnComposite + container =3D addSubPane(container, 0, groupBoxMargin, 0, groupBoxMargin= ); + + if (getSubject() instanceof Generated) { + new GeneratedComposite((FormPane) this, container)= ; = + } + = new FetchTypeComposite(this, container); new OptionalComposite(this, addSubPane(container, 4)); + } = - protected void initializeIndexCollapsibleSection(Composite container) { + private void initializeTypePane(Composite container) { + + container =3D addCollapsableSection( + container, + JptUiMappingsMessages.TypeSection_type + ); + ((GridLayout) container.getLayout()).numColumns =3D 2; + + // No converter + Button noConverterButton =3D addRadioButton( + container, = + JptUiMappingsMessages.TypeSection_default, = + buildNoConverterHolder(), = + null); + ((GridData) noConverterButton.getLayoutData()).horizontalSpan =3D 2; + = + // Lob + Button lobButton =3D addRadioButton( + container, = + JptUiMappingsMessages.TypeSection_lob, = + buildLobConverterHolder(), = + null); + ((GridData) lobButton.getLayoutData()).horizontalSpan =3D 2; + = + PropertyValueModel specifiedConverterHolder =3D buildSpecifie= dConverterHolder(); + // Temporal + addRadioButton( + container, = + JptUiMappingsMessages.TypeSection_temporal, = + buildTemporalBooleanHolder(), = + null); + registerSubPane(new TemporalTypeComposite(buildTemporalConverterHolder(s= pecifiedConverterHolder), container, getWidgetFactory())); + = + = + // Enumerated + addRadioButton( + container, = + JptUiMappingsMessages.TypeSection_enumerated, = + buildEnumeratedBooleanHolder(), = + null); + registerSubPane(new EnumTypeComposite(buildEnumeratedConverterHolder(spe= cifiedConverterHolder), container, getWidgetFactory())); + } + = + @SuppressWarnings("unchecked") + private void initializeIndexPane(Composite container) { if (getSubject() instanceof IndexHolder) { - container =3D addCollapsibleSection( + container =3D addCollapsableSection( container, HibernateUIMappingMessages.Index_section_index ); ((GridLayout) container.getLayout()).numColumns =3D 2; - this.initializeIndexSection(container); + new IndexHolderComposite((FormPane) this, contai= ner); = } + } + + private PropertyValueModel buildColumnHolder() { + return new TransformationPropertyValueModel(getSubjectHolder()) { + @Override + protected HibernateColumn transform_(BasicMapping value) { + return (HibernateColumn) value.getColumn(); + } + }; + } + + private WritablePropertyValueModel buildNoConverterHolder() { + return new PropertyAspectAdapter(getSubjectHolder= (), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) { + @Override + protected Boolean buildValue_() { + return Boolean.valueOf(this.subject.getSpecifiedConverter() =3D=3D nul= l); + } + + @Override + protected void setValue_(Boolean value) { + if (value.booleanValue()) { + this.subject.setSpecifiedConverter(Converter.NO_CONVERTER); + } + } + }; + } = - private void initializeIndexSection(Composite container) { - new IndexHolderComposite((Pane) this, container); + private WritablePropertyValueModel buildLobConverterHolder() { + return new PropertyAspectAdapter(getSubjectHolder= (), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) { + @Override + protected Boolean buildValue_() { + Converter converter =3D this.subject.getSpecifiedConverter(); + if (converter =3D=3D null) { + return Boolean.FALSE; + } + return Boolean.valueOf(converter.getType() =3D=3D Converter.LOB_CONVER= TER); + } + + @Override + protected void setValue_(Boolean value) { + if (value.booleanValue()) { + this.subject.setSpecifiedConverter(Converter.LOB_CONVERTER); + } + } + }; } + = + private PropertyValueModel buildSpecifiedConverterHolder() { + return new PropertyAspectAdapter(getSubjectHold= er(), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) { + @Override + protected Converter buildValue_() { + return this.subject.getSpecifiedConverter(); + } + }; + } + = + private PropertyValueModel buildTemporalConverterHolde= r(PropertyValueModel converterHolder) { + return new TransformationPropertyValueModel(converterHolder) { + @Override + protected TemporalConverter transform_(Converter converter) { + return (converter !=3D null && converter.getType() =3D=3D Converter.TE= MPORAL_CONVERTER) ? (TemporalConverter) converter : null; + } + }; + } + = + private PropertyValueModel buildEnumeratedConverterH= older(PropertyValueModel converterHolder) { + return new TransformationPropertyValueModel(converterHolder) { + @Override + protected EnumeratedConverter transform_(Converter converter) { + return (converter !=3D null && converter.getType() =3D=3D Converter.EN= UMERATED_CONVERTER) ? (EnumeratedConverter) converter : null; + } + }; + } = + private WritablePropertyValueModel buildTemporalBooleanHolder() { + return new PropertyAspectAdapter(getSubjectHolder= (), BasicMapping.SPECIFIED_CONVERTER_PROPERTY) { + @Override + protected Boolean buildValue_() { + Converter converter =3D this.subject.getSpecifiedConverter(); + if (converter =3D=3D null) { + return Boolean.FALSE; + } + return Boolean.valueOf(converter.getType() =3D=3D Converter.TEMPORAL_C= ONVERTER); + } = + @Override + protected void setValue_(Boolean value) { + if (value.booleanValue()) { + this.subject.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); + } + } + }; + } + = + private WritablePropertyValueModel buildEnumeratedBooleanHolder(= ) { + return new PropertyAspectAdapter(getSubjectHolder= (), BasicMapping.SPECIFIED_CONVERTER_PROPERTY) { + @Override + protected Boolean buildValue_() { + Converter converter =3D this.subject.getSpecifiedConverter(); + if (converter =3D=3D null) { + return Boolean.FALSE; + } + return Boolean.valueOf(converter.getType() =3D=3D Converter.ENUMERATED= _CONVERTER); + } + + @Override + protected void setValue_(Boolean value) { + if (value.booleanValue()) { + this.subject.setSpecifiedConverter(Converter.ENUMERATED_CONVERTER); + } + } + }; + } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateColumnC= omposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateColumnComposi= te.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateColumnComposi= te.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -18,13 +18,14 @@ import org.eclipse.jpt.core.context.NamedColumn; import org.eclipse.jpt.db.Table; import org.eclipse.jpt.ui.internal.JpaHelpContextIds; -import org.eclipse.jpt.ui.internal.details.BasicMappingComposite; -import org.eclipse.jpt.ui.internal.details.IdMappingComposite; -import org.eclipse.jpt.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.ui.internal.details.VersionMappingComposite; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.mappings.details.BasicMappingComposite; +import org.eclipse.jpt.ui.internal.mappings.details.EmbeddedAttributeOverr= idesComposite; +import org.eclipse.jpt.ui.internal.mappings.details.IdMappingComposite; +import org.eclipse.jpt.ui.internal.mappings.details.VersionMappingComposit= e; +import org.eclipse.jpt.ui.internal.widgets.FormPane; import org.eclipse.jpt.ui.internal.widgets.IntegerCombo; import org.eclipse.jpt.ui.internal.widgets.Pane; -import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueMod= el; import org.eclipse.jpt.utility.internal.model.value.TransformationProperty= ValueModel; @@ -37,7 +38,6 @@ import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateColumn; import org.jboss.tools.hibernate.jpt.ui.internal.mappings.db.xpl.ColumnCom= bo; import org.jboss.tools.hibernate.jpt.ui.internal.mappings.db.xpl.DatabaseO= bjectCombo; -import org.jboss.tools.hibernate.jpt.ui.internal.mappings.db.xpl.TableComb= o; = /** * Here the layout of this pane: @@ -89,7 +89,7 @@ * @version 2.0 * @since 1.0 */ -public class HibernateColumnComposite extends Pane { +public class HibernateColumnComposite extends FormPane { = /** * Creates a new HibernateColumnComposite. @@ -98,7 +98,7 @@ * @param subjectHolder The holder of the subject IColumn * @param parent The parent container */ - public HibernateColumnComposite(Pane parentPane, + public HibernateColumnComposite(FormPane parentPane, PropertyValueModel subj= ectHolder, Composite parent) { = @@ -115,7 +115,7 @@ * this pane aligned with the widgets of the given parent controller; * false to not align them */ - public HibernateColumnComposite(Pane parentPane, + public HibernateColumnComposite(FormPane parentPane, PropertyValueModel subj= ectHolder, Composite parent, boolean automaticallyAlignWidgets) { @@ -133,7 +133,7 @@ * this pane aligned with the widgets of the given parent controller; * false to not align them */ - public HibernateColumnComposite(Pane parentPane, + public HibernateColumnComposite(FormPane parentPane, PropertyValueModel subj= ectHolder, Composite parent, boolean automaticallyAlignWidgets, @@ -265,16 +265,16 @@ if ((getSubject() !=3D null) && (value =3D=3D null)) { boolean defaultValue =3D getSubject().isDefaultInsertable(); = - String defaultStringValue =3D defaultValue ? JptUiDetailsMessages.Boo= lean_True : - JptUiDetailsMessages.Boolean_= False; + String defaultStringValue =3D defaultValue ? JptUiMappingsMessages.Bo= olean_True : + JptUiMappingsMessages.Boolean= _False; = return NLS.bind( - JptUiDetailsMessages.ColumnComposite_insertableWithDefault, + JptUiMappingsMessages.ColumnComposite_insertableWithDefault, defaultStringValue ); } = - return JptUiDetailsMessages.ColumnComposite_insertable; + return JptUiMappingsMessages.ColumnComposite_insertable; } }; } @@ -282,46 +282,52 @@ = private WritablePropertyValueModel buildNullableHolder() { return new PropertyAspectAdapter( - getSubjectHolder(), - BaseColumn.SPECIFIED_NULLABLE_PROPERTY) { - = + getSubjectHolder(), + BaseColumn.DEFAULT_NULLABLE_PROPERTY, + BaseColumn.SPECIFIED_NULLABLE_PROPERTY) + { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedNullable(); } - = + @Override protected void setValue_(Boolean value) { this.subject.setSpecifiedNullable(value); } - }; - } - = - private PropertyValueModel buildNullableStringHolder() { - return new TransformationPropertyValueModel(buildDefaul= tNullableHolder()) { + @Override - protected String transform(Boolean value) { - if (value !=3D null) { - String defaultStringValue =3D value.booleanValue() ? JptUiDetailsMess= ages.Boolean_True : JptUiDetailsMessages.Boolean_False; - return NLS.bind(JptUiDetailsMessages.ColumnComposite_nullableWithDefa= ult, defaultStringValue); + protected void subjectChanged() { + Object oldValue =3D this.getValue(); + super.subjectChanged(); + Object newValue =3D this.getValue(); + + // Make sure the default value is appended to the text + if (oldValue =3D=3D newValue && newValue =3D=3D null) { + this.fireAspectChange(Boolean.TRUE, newValue); } - return JptUiDetailsMessages.ColumnComposite_nullable; } }; } - = - private PropertyValueModel buildDefaultNullableHolder() { - return new PropertyAspectAdapter( - getSubjectHolder(), - BaseColumn.SPECIFIED_NULLABLE_PROPERTY, - BaseColumn.DEFAULT_NULLABLE_PROPERTY) { - = + + private PropertyValueModel buildNullableStringHolder() { + return new TransformationPropertyValueModel(buildNullab= leHolder()) { @Override - protected Boolean buildValue_() { - if (this.subject.getSpecifiedNullable() !=3D null) { - return null; + protected String transform(Boolean value) { + + if ((getSubject() !=3D null) && (value =3D=3D null)) { + boolean defaultValue =3D getSubject().isDefaultNullable(); + + String defaultStringValue =3D defaultValue ? JptUiMappingsMessages.Bo= olean_True : + JptUiMappingsMessages.Bool= ean_False; + + return NLS.bind( + JptUiMappingsMessages.ColumnComposite_nullableWithDefault, + defaultStringValue + ); } - return Boolean.valueOf(this.subject.isDefaultNullable()); + + return JptUiMappingsMessages.ColumnComposite_nullable; } }; } @@ -385,14 +391,9 @@ } = @Override - protected Iterable getValues_() { - return CollectionTools.iterable(this.values()); - } - = protected Iterator values() { - return this.getSubject().candidateTableNames(); + return this.getSubject().getOwner().getTypeMapping().associatedTableNa= mesIncludingInherited(); } - = @Override public String toString() { return "ColumnComposite.tableCombo"; //$NON-NLS-1$ @@ -402,97 +403,108 @@ = private WritablePropertyValueModel buildUniqueHolder() { return new PropertyAspectAdapter( - getSubjectHolder(), - BaseColumn.SPECIFIED_UNIQUE_PROPERTY) { - = + getSubjectHolder(), + BaseColumn.DEFAULT_UNIQUE_PROPERTY, + BaseColumn.SPECIFIED_UNIQUE_PROPERTY) + { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedUnique(); } - = + @Override protected void setValue_(Boolean value) { this.subject.setSpecifiedUnique(value); } - }; - } = - private PropertyValueModel buildUniqueStringHolder() { - = - return new TransformationPropertyValueModel(buildDefaul= tUniqueHolder()) { - = @Override - protected String transform(Boolean value) { - if (value !=3D null) { - String defaultStringValue =3D value.booleanValue() ? JptUiDetailsMess= ages.Boolean_True : JptUiDetailsMessages.Boolean_False; - return NLS.bind(JptUiDetailsMessages.ColumnComposite_uniqueWithDefaul= t, defaultStringValue); + protected void subjectChanged() { + Object oldValue =3D this.getValue(); + super.subjectChanged(); + Object newValue =3D this.getValue(); + + // Make sure the default value is appended to the text + if (oldValue =3D=3D newValue && newValue =3D=3D null) { + this.fireAspectChange(Boolean.TRUE, newValue); } - return JptUiDetailsMessages.ColumnComposite_unique; } }; } - = - private PropertyValueModel buildDefaultUniqueHolder() { - return new PropertyAspectAdapter( - getSubjectHolder(), - BaseColumn.SPECIFIED_UNIQUE_PROPERTY, - BaseColumn.DEFAULT_UNIQUE_PROPERTY) { - = + + private PropertyValueModel buildUniqueStringHolder() { + + return new TransformationPropertyValueModel(buildUnique= Holder()) { + @Override - protected Boolean buildValue_() { - if (this.subject.getSpecifiedUnique() !=3D null) { - return null; + protected String transform(Boolean value) { + + if ((getSubject() !=3D null) && (value =3D=3D null)) { + boolean defaultValue =3D getSubject().isDefaultUnique(); + + String defaultStringValue =3D defaultValue ? JptUiMappingsMessages.Bo= olean_True : + JptUiMappingsMessages.Bool= ean_False; + + return NLS.bind( + JptUiMappingsMessages.ColumnComposite_uniqueWithDefault, + defaultStringValue + ); } - return Boolean.valueOf(this.subject.isDefaultUnique()); + + return JptUiMappingsMessages.ColumnComposite_unique; } }; } - = + private WritablePropertyValueModel buildUpdatableHolder() { return new PropertyAspectAdapter( - getSubjectHolder(), - BaseColumn.DEFAULT_UPDATABLE_PROPERTY, - BaseColumn.SPECIFIED_UPDATABLE_PROPERTY) { - = + getSubjectHolder(), + BaseColumn.DEFAULT_UPDATABLE_PROPERTY, + BaseColumn.SPECIFIED_UPDATABLE_PROPERTY) + { @Override protected Boolean buildValue_() { return this.subject.getSpecifiedUpdatable(); } - = + @Override protected void setValue_(Boolean value) { this.subject.setSpecifiedUpdatable(value); } - }; - } - = - private PropertyValueModel buildUpdatableStringHolder() { - = - return new TransformationPropertyValueModel(buildDefaul= tUpdatableHolder()) { - = + @Override - protected String transform(Boolean value) { - if (value !=3D null) { - String defaultStringValue =3D value.booleanValue() ? JptUiDetailsMess= ages.Boolean_True : JptUiDetailsMessages.Boolean_False; - return NLS.bind(JptUiDetailsMessages.ColumnComposite_updatableWithDef= ault, defaultStringValue); + protected void subjectChanged() { + Object oldValue =3D this.getValue(); + super.subjectChanged(); + Object newValue =3D this.getValue(); + + // Make sure the default value is appended to the text + if (oldValue =3D=3D newValue && newValue =3D=3D null) { + this.fireAspectChange(Boolean.TRUE, newValue); } - return JptUiDetailsMessages.ColumnComposite_updatable; } }; } - = - private PropertyValueModel buildDefaultUpdatableHolder() { - return new PropertyAspectAdapter( - getSubjectHolder(), - BaseColumn.SPECIFIED_UPDATABLE_PROPERTY, - BaseColumn.DEFAULT_UPDATABLE_PROPERTY) { - = + + private PropertyValueModel buildUpdatableStringHolder() { + + return new TransformationPropertyValueModel(buildUpdata= bleHolder()) { + @Override - protected Boolean buildValue_() { - if (this.subject.getSpecifiedUpdatable() !=3D null) { - return null; + protected String transform(Boolean value) { + + if ((getSubject() !=3D null) && (value =3D=3D null)) { + boolean defaultValue =3D getSubject().isDefaultUpdatable(); + + String defaultStringValue =3D defaultValue ? JptUiMappingsMessages.Bo= olean_True : + JptUiMappingsMessages.Bool= ean_False; + + return NLS.bind( + JptUiMappingsMessages.ColumnComposite_updatableWithDefault, + defaultStringValue + ); } - return Boolean.valueOf(this.subject.isDefaultUpdatable()); + + return JptUiMappingsMessages.ColumnComposite_updatable; } }; } @@ -503,13 +515,13 @@ // Column group pane container =3D addTitledGroup( container, - JptUiDetailsMessages.ColumnComposite_columnSection + JptUiMappingsMessages.ColumnComposite_columnSection ); = // Column widgets addLabeledComposite( container, - JptUiDetailsMessages.ColumnComposite_name, + JptUiMappingsMessages.ColumnComposite_name, addColumnCombo(container), JpaHelpContextIds.MAPPING_COLUMN ); @@ -517,24 +529,24 @@ // Table widgets addLabeledComposite( container, - JptUiDetailsMessages.ColumnComposite_table, + JptUiMappingsMessages.ColumnComposite_table, addTableCombo(container), JpaHelpContextIds.MAPPING_COLUMN_TABLE ); = // Details sub-pane - container =3D addCollapsibleSubSection( + container =3D addCollapsableSubSection( container, - JptUiDetailsMessages.ColumnComposite_details, + JptUiMappingsMessages.ColumnComposite_details, new SimplePropertyValueModel(Boolean.FALSE) ); = new DetailsComposite(this, getSubjectHolder(), addSubPane(container, 0, = 16)); } = - protected class DetailsComposite extends Pane { + protected class DetailsComposite extends FormPane { = - public DetailsComposite(Pane parentPane, + public DetailsComposite(FormPane parentPane, PropertyValueModel subjectHolder, Composite parent) { = @@ -547,7 +559,7 @@ // Insertable tri-state check box addTriStateCheckBoxWithDefault( addSubPane(container, 4), - JptUiDetailsMessages.ColumnComposite_insertable, + JptUiMappingsMessages.ColumnComposite_insertable, buildInsertableHolder(), buildInsertableStringHolder(), JpaHelpContextIds.MAPPING_COLUMN_INSERTABLE @@ -556,7 +568,7 @@ // Updatable tri-state check box addTriStateCheckBoxWithDefault( container, - JptUiDetailsMessages.ColumnComposite_updatable, + JptUiMappingsMessages.ColumnComposite_updatable, buildUpdatableHolder(), buildUpdatableStringHolder(), JpaHelpContextIds.MAPPING_COLUMN_UPDATABLE @@ -565,7 +577,7 @@ // Unique tri-state check box addTriStateCheckBoxWithDefault( container, - JptUiDetailsMessages.ColumnComposite_unique, + JptUiMappingsMessages.ColumnComposite_unique, buildUniqueHolder(), buildUniqueStringHolder(), JpaHelpContextIds.MAPPING_COLUMN_UNIQUE @@ -574,7 +586,7 @@ // Nullable tri-state check box addTriStateCheckBoxWithDefault( container, - JptUiDetailsMessages.ColumnComposite_nullable, + JptUiMappingsMessages.ColumnComposite_nullable, buildNullableHolder(), buildNullableStringHolder(), JpaHelpContextIds.MAPPING_COLUMN_NULLABLE @@ -587,7 +599,7 @@ // Column Definition widgets addLabeledText( container, - JptUiDetailsMessages.ColumnComposite_columnDefinition, + JptUiMappingsMessages.ColumnComposite_columnDefinition, buildColumnDefinitionHolder() ); } @@ -597,7 +609,7 @@ = @Override protected String getLabelText() { - return JptUiDetailsMessages.ColumnComposite_length; + return JptUiMappingsMessages.ColumnComposite_length; } = @Override @@ -637,7 +649,7 @@ = @Override protected String getLabelText() { - return JptUiDetailsMessages.ColumnComposite_precision; + return JptUiMappingsMessages.ColumnComposite_precision; } = @Override @@ -677,7 +689,7 @@ = @Override protected String getLabelText() { - return JptUiDetailsMessages.ColumnComposite_scale; + return JptUiMappingsMessages.ColumnComposite_scale; } = @Override Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateDiscrim= inatorColumnComposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateDiscriminator= ColumnComposite.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateDiscriminator= ColumnComposite.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -18,18 +18,25 @@ import org.eclipse.jpt.core.context.NamedColumn; import org.eclipse.jpt.db.Table; import org.eclipse.jpt.ui.internal.JpaHelpContextIds; -import org.eclipse.jpt.ui.internal.details.AbstractEntityComposite; -import org.eclipse.jpt.ui.internal.details.DiscriminatorColumnComposite; -import org.eclipse.jpt.ui.internal.details.JptUiDetailsMessages; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.mappings.details.AbstractEntityComposit= e; +import org.eclipse.jpt.ui.internal.mappings.details.DiscriminatorColumnCom= posite; +import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater; +import org.eclipse.jpt.ui.internal.util.LabeledLabel; import org.eclipse.jpt.ui.internal.util.PaneEnabler; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; -import org.eclipse.jpt.ui.internal.widgets.IntegerCombo; -import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.ui.internal.widgets.FormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueMod= el; +import org.eclipse.jpt.utility.internal.model.value.TransformationProperty= ValueModel; import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Spinner; import org.jboss.tools.hibernate.jpt.core.internal.context.DiscriminatorFo= rmula; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEntity; import org.jboss.tools.hibernate.jpt.ui.internal.mappings.db.xpl.ColumnCom= bo; @@ -67,7 +74,7 @@ * @version 2.0 * @since 2.0 */ -public class HibernateDiscriminatorColumnComposite extends Pane { +public class HibernateDiscriminatorColumnComposite extends FormPane { = private WritablePropertyValueModel discriminatorFor= mulaHolder; = @@ -77,7 +84,7 @@ * @param parentPane The parent container of this one * @param parent The parent container */ - public HibernateDiscriminatorColumnComposite(Pane parentPane, + public HibernateDiscriminatorColumnComposite(FormPane parentPane, Composite parent) { = super(parentPane, parent, false); @@ -91,11 +98,10 @@ = @Override protected void initializeLayout(Composite container) { - = // Discriminator Column sub-pane Composite discriminatorColumnContainer =3D addTitledGroup( addSubPane(container, 10), - JptUiDetailsMessages.InheritanceComposite_discriminatorColumnGroupBox + JptUiMappingsMessages.InheritanceComposite_discriminatorColumnGroupBox ); = PropertyValueModel discriminatorColumnHolder =3D @@ -104,7 +110,7 @@ // Name widgets addLabeledComposite( discriminatorColumnContainer, - JptUiDetailsMessages.DiscriminatorColumnComposite_name, + JptUiMappingsMessages.DiscriminatorColumnComposite_name, addDiscriminatorColumnCombo(container, discriminatorColumnHolder), JpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_COLUMN ); @@ -120,19 +126,19 @@ // Discriminator Type widgets addLabeledComposite( discriminatorColumnContainer, - JptUiDetailsMessages.DiscriminatorColumnComposite_discriminatorType, + JptUiMappingsMessages.DiscriminatorColumnComposite_discriminatorType, addDiscriminatorTypeCombo(container, discriminatorColumnHolder), JpaHelpContextIds.ENTITY_INHERITANCE_DISCRIMINATOR_TYPE ); = - container =3D addCollapsibleSubSection( + container =3D addCollapsableSubSection( discriminatorColumnContainer, - JptUiDetailsMessages.InheritanceComposite_detailsGroupBox, + JptUiMappingsMessages.InheritanceComposite_detailsGroupBox, new SimplePropertyValueModel(Boolean.FALSE) ); - = + new DetailsComposite(this, discriminatorColumnHolder, addSubPane(contain= er, 0, 16)); - = + new PaneEnabler(buildDiscriminatorColumnEnabledHolder(), this); } = @@ -175,7 +181,7 @@ = @Override protected String buildNullDefaultValueEntry() { - return JptUiDetailsMessages.NoneSelected; + return JptUiMappingsMessages.NoneSelected; } }; } @@ -252,7 +258,7 @@ @Override protected String displayString(DiscriminatorType value) { return buildDisplayString( - JptUiDetailsMessages.class, + JptUiMappingsMessages.class, DiscriminatorColumnComposite.class, value ); @@ -260,7 +266,7 @@ = @Override protected String nullDisplayString() { - return JptUiDetailsMessages.NoneSelected; + return JptUiMappingsMessages.NoneSelected; } = @Override @@ -284,8 +290,8 @@ }; } = - protected class DetailsComposite extends Pane { - public DetailsComposite(Pane parentPane, + protected class DetailsComposite extends FormPane { + public DetailsComposite(FormPane parentPane, PropertyValueModel subjectHolde= r, Composite parent) { = @@ -295,56 +301,99 @@ @Override protected void initializeLayout(Composite container) { // Length widgets - addLengthCombo(container); + Spinner lengthSpinner =3D addLabeledSpinner( + container, + JptUiMappingsMessages.ColumnComposite_length, + buildLengthHolder(), + -1, + -1, + Integer.MAX_VALUE, + addDefaultLengthLabel(container), + JpaHelpContextIds.MAPPING_COLUMN_LENGTH + ); = + updateGridData(container, lengthSpinner); + // Column Definition widgets addLabeledText( container, - JptUiDetailsMessages.ColumnComposite_columnDefinition, + JptUiMappingsMessages.ColumnComposite_columnDefinition, buildColumnDefinitionHolder(getSubjectHolder()) ); } - = - private void addLengthCombo(Composite container) { - new IntegerCombo(this, container) { - = + + private WritablePropertyValueModel buildLengthHolder() { + + return new PropertyAspectAdapter(getSubje= ctHolder(), DiscriminatorColumn.SPECIFIED_LENGTH_PROPERTY) { @Override - protected String getLabelText() { - return JptUiDetailsMessages.ColumnComposite_length; + protected Integer buildValue_() { + return this.subject.getSpecifiedLength(); } - = + @Override - protected String getHelpId() { - return JpaHelpContextIds.MAPPING_COLUMN_LENGTH; + protected void setValue_(Integer value) { + if (value.intValue() =3D=3D -1) { + value =3D null; + } + this.subject.setSpecifiedLength(value); } + }; + } = + private Control addDefaultLengthLabel(Composite container) { + + Label label =3D addLabel( + container, + JptUiMappingsMessages.DefaultEmpty + ); + + new LabeledControlUpdater( + new LabeledLabel(label), + buildDefaultLengthLabelHolder() + ); + + return label; + } + + private PropertyValueModel buildDefaultLengthLabelHolder() { + + return new TransformationPropertyValueModel(buildDefau= ltLengthHolder()) { + @Override - protected PropertyValueModel buildDefaultHolder() { - return new PropertyAspectAdapter(getSub= jectHolder(), DiscriminatorColumn.DEFAULT_LENGTH_PROPERTY) { - @Override - protected Integer buildValue_() { - return Integer.valueOf(this.subject.getDefaultLength()); - } - }; + protected String transform(Integer value) { + + int defaultValue =3D (getSubject() !=3D null) ? getSubject().getDefau= ltLength() : + DiscriminatorColumn.DEFA= ULT_LENGTH; + + return NLS.bind( + JptUiMappingsMessages.DefaultWithOneParam, + Integer.valueOf(defaultValue) + ); } - = + }; + } + + private WritablePropertyValueModel buildDefaultLengthHolder() { + return new PropertyAspectAdapter(getSubje= ctHolder(), DiscriminatorColumn.DEFAULT_LENGTH_PROPERTY) { @Override - protected WritablePropertyValueModel buildSelectedItemHolder(= ) { - return new PropertyAspectAdapter(getSub= jectHolder(), DiscriminatorColumn.SPECIFIED_LENGTH_PROPERTY) { - @Override - protected Integer buildValue_() { - return this.subject.getSpecifiedLength(); - } + protected Integer buildValue_() { + return Integer.valueOf(this.subject.getDefaultLength()); + } = - @Override - protected void setValue_(Integer value) { - this.subject.setSpecifiedLength(value); - } - }; + @Override + protected synchronized void subjectChanged() { + Object oldValue =3D this.getValue(); + super.subjectChanged(); + Object newValue =3D this.getValue(); + + // Make sure the default value is appended to the text + if (oldValue =3D=3D newValue && newValue =3D=3D null) { + this.fireAspectChange(Integer.valueOf(Integer.MIN_VALUE), newValue); + } } }; } - = + private WritablePropertyValueModel buildColumnDefinitionHolder(P= ropertyValueModel discriminatorColumnHolder) { = return new PropertyAspectAdapter(discrimin= atorColumnHolder, NamedColumn.COLUMN_DEFINITION_PROPERTY) { @@ -362,5 +411,37 @@ } }; } + = + /** + * Changes the layout of the given container by changing which widget wi= ll + * grab the excess of horizontal space. By default, the center control g= rabs + * the excess space, we change it to be the right control. + * + * @param container The container containing the controls needing their + * GridData to be modified from the default values + * @param spinner The spinner that got created + */ + private void updateGridData(Composite container, Spinner spinner) { + + // It is possible the spinner's parent is not the container of the + // label, spinner and right control (a pane is sometimes required for + // painting the spinner's border) + Composite paneContainer =3D spinner.getParent(); + + while (container !=3D paneContainer.getParent()) { + paneContainer =3D paneContainer.getParent(); + } + + Control[] controls =3D paneContainer.getChildren(); + + GridData gridData =3D new GridData(); + gridData.grabExcessHorizontalSpace =3D false; + gridData.horizontalAlignment =3D GridData.BEGINNING; + controls[1].setLayoutData(gridData); + + controls[2].setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + removeAlignRight(controls[2]); + } + } } \ No newline at end of file Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/o= rg/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratio= nComposite.java (from rev 22306, trunk/hibernatetools/plugins/org.jboss.too= ls.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/d= etails/HibernateGenerationComposite.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationCom= posite.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerationCom= posite.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,295 @@ +/*************************************************************************= ****** + * Copyright (c) 2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.hibernate.jpt.ui.internal.mapping.details; + +import org.eclipse.jpt.core.context.GeneratedValue; +import org.eclipse.jpt.core.context.GeneratorHolder; +import org.eclipse.jpt.core.context.SequenceGenerator; +import org.eclipse.jpt.core.context.TableGenerator; +import org.eclipse.jpt.ui.internal.JpaHelpContextIds; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.mappings.details.GeneratedValueComposit= e; +import org.eclipse.jpt.ui.internal.mappings.details.SequenceGeneratorCompo= site; +import org.eclipse.jpt.ui.internal.mappings.details.TableGeneratorComposit= e; +import org.eclipse.jpt.ui.internal.widgets.FormPane; +import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueMod= el; +import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= r; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= rHolder; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaIdMapping; + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateGenerationComposite extends FormPane { + = + private WritablePropertyValueModel sequenceGeneratorExpansionSta= teHolder; + private WritablePropertyValueModel tableGeneratorExpansionStateH= older; + private WritablePropertyValueModel genericGeneratorExpansionStat= eHolder; + = + /** + * Creates a new GenerationComposite. + * + * @param parentPane The parent container of this one + * @param parent The parent container + */ + public HibernateGenerationComposite(FormPane parentPane, + Composite parent) + { + super(parentPane, parent, false); + } + + private WritablePropertyValueModel buildPrimaryKeyGenerationHold= er() { + return new PropertyAspectAdapter(getSub= jectHolder(), HibernateJavaIdMapping.GENERATED_VALUE_PROPERTY) { + @Override + protected Boolean buildValue_() { + return subject.getGeneratedValue() !=3D null; + } + + @Override + protected void setValue_(Boolean value) { + + if (value && (subject.getGeneratedValue() =3D=3D null)) { + subject.addGeneratedValue(); + } + else if (!value && (subject.getGeneratedValue() !=3D null)) { + subject.removeGeneratedValue(); + } + } + }; + } + + private WritablePropertyValueModel buildSequenceGeneratorBoolean= Holder() { + return new PropertyAspectAdapter(getSub= jectHolder(), GeneratorHolder.SEQUENCE_GENERATOR_PROPERTY) { + @Override + protected Boolean buildValue_() { + return subject.getSequenceGenerator() !=3D null; + } + + @Override + protected void setValue_(Boolean value) { + + if (value && (subject.getSequenceGenerator() =3D=3D null)) { + + SequenceGenerator sequenceGenerator =3D subject.addSequenceGenerator(= ); + GeneratedValue generatedValue =3D subject.getGeneratedValue(); + + if ((generatedValue !=3D null) && + (generatedValue.getGenerator() !=3D null)) + { + sequenceGenerator.setName(generatedValue.getGenerator()); + } + } + else if (!value && (subject.getSequenceGenerator() !=3D null)) { + subject.removeSequenceGenerator(); + } + } + }; + } + + private WritablePropertyValueModel buildTableGeneratorBooleanHo= lder() { + return new PropertyAspectAdapter(getSub= jectHolder(), GeneratorHolder.TABLE_GENERATOR_PROPERTY) { + @Override + protected Boolean buildValue_() { + return subject.getTableGenerator() !=3D null; + } + + @Override + protected void setValue_(Boolean value) { + + if (value && (subject.getTableGenerator() =3D=3D null)) { + + TableGenerator tableGenerator =3D subject.addTableGenerator(); + GeneratedValue generatedValue =3D subject.getGeneratedValue(); + + if ((generatedValue !=3D null) && + (generatedValue.getGenerator() !=3D null)) + { + tableGenerator.setName(generatedValue.getGenerator()); + } + } + else if (!value && (subject.getTableGenerator() !=3D null)) { + subject.removeTableGenerator(); + } + } + }; + } + = + private WritablePropertyValueModel buildGenericGeneratorBooleanH= older() { + return new PropertyAspectAdapter(getSub= jectHolder(), GenericGeneratorHolder.GENERIC_GENERATORS_LIST) { + @Override + protected Boolean buildValue_() { + return subject.genericGeneratorsSize() > 0; + } + + @Override + protected void setValue_(Boolean value) { + + if (value && (subject.genericGeneratorsSize() > 0)) { + + GenericGenerator genericGenerator =3D subject.addGenericGenerator(0); + GeneratedValue generatedValue =3D subject.getGeneratedValue(); + + if ((generatedValue !=3D null) && + (generatedValue.getGenerator() !=3D null)) + { + genericGenerator.setName(generatedValue.getGenerator()); + } + } + else if (!value && (subject.genericGeneratorsSize() > 0)) { + subject.removeGenericGenerator(0); + } + } + }; + } + + /* + * (non-Javadoc) + */ + @Override + protected void doPopulate() + { + super.doPopulate(); + + sequenceGeneratorExpansionStateHolder.setValue(getSubject() !=3D null &&= getSubject().getSequenceGenerator() !=3D null); + tableGeneratorExpansionStateHolder .setValue(getSubject() !=3D null &&= getSubject().getTableGenerator() !=3D null); + genericGeneratorExpansionStateHolder .setValue(getSubject() !=3D null &&= getSubject().genericGeneratorsSize() > 0); + } + + /* + * (non-Javadoc) + */ + @Override + protected void initialize() { + super.initialize(); + + sequenceGeneratorExpansionStateHolder =3D new SimplePropertyValueModel(false); + tableGeneratorExpansionStateHolder =3D new SimplePropertyValueModel(false); + genericGeneratorExpansionStateHolder =3D new SimplePropertyValueModel(false); + } + + /* + * (non-Javadoc) + */ + @Override + protected void initializeLayout(Composite container) { + + // Primary Key Generation section + container =3D addCollapsableSection( + container, + JptUiMappingsMessages.IdMappingComposite_primaryKeyGenerationSection, + new SimplePropertyValueModel(Boolean.TRUE) + ); + + // Primary Key Generation check box + Button primaryKeyGenerationCheckBox =3D addCheckBox( + container, + JptUiMappingsMessages.IdMappingComposite_primaryKeyGenerationCheckBox, + buildPrimaryKeyGenerationHolder(), + JpaHelpContextIds.MAPPING_PRIMARY_KEY_GENERATION + ); + + // Generated Value widgets + GeneratedValueComposite generatedValueComposite =3D new GeneratedValueCo= mposite( + this, + container + ); + + GridData gridData =3D new GridData(); + gridData.horizontalAlignment =3D GridData.FILL; + gridData.grabExcessHorizontalSpace =3D true; + gridData.horizontalIndent =3D primaryKeyGenerationCheckBox.getB= orderWidth() + 16; + + generatedValueComposite.getControl().setLayoutData(gridData); + + // Table Generator pane + initializeTableGeneratorPane(addSubPane(container, 10)); + + // Sequence Generator pane + initializeSequenceGeneratorPane(addSubPane(container, 10)); + = + // Generic Generator pane + initializeGenericGeneratorPane(addSubPane(container, 10)); + } + + private void initializeSequenceGeneratorPane(Composite container) { + + // Sequence Generator sub-section + container =3D addCollapsableSubSection( + container, + JptUiMappingsMessages.IdMappingComposite_sequenceGeneratorSection, + sequenceGeneratorExpansionStateHolder + ); + + // Sequence Generator check box + Button sequenceGeneratorCheckBox =3D addCheckBox( + container, + JptUiMappingsMessages.IdMappingComposite_sequenceGeneratorCheckBox, + buildSequenceGeneratorBooleanHolder(), + JpaHelpContextIds.MAPPING_SEQUENCE_GENERATOR + ); + + // Sequence Generator pane + new SequenceGeneratorComposite( + this, + addSubPane(container, 0, sequenceGeneratorCheckBox.getBorderWidth() + 1= 6) + ); + } + + private void initializeTableGeneratorPane(Composite container) { + + // Table Generator sub-section + container =3D addCollapsableSubSection( + container, + JptUiMappingsMessages.IdMappingComposite_tableGeneratorSection, + tableGeneratorExpansionStateHolder + ); + + Button tableGeneratorCheckBox =3D addCheckBox( + container, + JptUiMappingsMessages.IdMappingComposite_tableGeneratorCheckBox, + buildTableGeneratorBooleanHolder(), + JpaHelpContextIds.MAPPING_TABLE_GENERATOR + ); + + new TableGeneratorComposite( + this, + addSubPane(container, 0, tableGeneratorCheckBox.getBorderWidth() + 16) + ); + } + = + private void initializeGenericGeneratorPane(Composite container) { + + // Table Generator sub-section + container =3D addCollapsableSubSection( + container, + HibernateUIMappingMessages.HibernateIdMappingComposite_genericGenerator= Section, + genericGeneratorExpansionStateHolder + ); + + Button genericGeneratorCheckBox =3D addCheckBox( + container, + HibernateUIMappingMessages.HibernateIdMappingComposite_genericGenerator= CheckBox, + buildGenericGeneratorBooleanHolder(), + null//TODO help + ); + + new GenericGeneratorsComposite( + this, + addSubPane(container, 0, genericGeneratorCheckBox.getBorderWidth() + 16) + ); + } +} Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/o= rg/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGenerator= sComposite.java (from rev 22306, trunk/hibernatetools/plugins/org.jboss.too= ls.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/d= etails/HibernateGeneratorsComposite.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsCom= posite.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateGeneratorsCom= posite.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,101 @@ +/*************************************************************************= ****** + * Copyright (c) 2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.hibernate.jpt.ui.internal.mapping.details; + +import org.eclipse.jpt.core.context.GeneratorHolder; +import org.eclipse.jpt.ui.internal.mappings.details.GeneratorsComposite; +import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.utility.internal.model.value.SimplePropertyValueMod= el; +import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= r; +import org.jboss.tools.hibernate.jpt.core.internal.context.GenericGenerato= rHolder; + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateGeneratorsComposite extends GeneratorsComposite { + + public HibernateGeneratorsComposite(Pane paren= tPane, Composite parent) { + super(parentPane, parent); + } + + private WritablePropertyValueModel genericGeneratorExpansionStat= eHolder; + = + = + @Override + protected void initialize() { + super.initialize(); + genericGeneratorExpansionStateHolder =3D new SimplePropertyValueModel(false); + } + = + @Override + protected void initializeLayout(Composite container) { + super.initializeLayout(container); + initializeGenericGeneratorPane(container); + } + = + @SuppressWarnings("unchecked") + protected void initializeGenericGeneratorPane(Composite container) { + + // Sequence Generator sub-section + container =3D addCollapsableSubSection( + addSubPane(container, 10), + HibernateUIMappingMessages.HibernateGeneratorsComposite_SectionLabel, + genericGeneratorExpansionStateHolder + ); + + // Sequence Generator check box + Button genericGeneratorCheckBox =3D addCheckBox( + addSubPane(container, 5), + HibernateUIMappingMessages.HibernateGeneratorsComposite_CheckBoxLabel, + buildGenericGeneratorBooleanHolder(), + null//TODO add help + ); + + // Generic Generator pane + new GenericGeneratorsComposite( + (Pane) this, + addSubPane(container, 0, genericGeneratorCheckBox.getBorderWidth() + 16= )); + = + } + = + protected GenericGenerator getGenerator(GeneratorHolder subject) { + return (((GenericGeneratorHolder)subject).genericGeneratorsSize() =3D=3D= 0) ? null + : ((GenericGeneratorHolder)subject).genericGenerators().next(); + } + + private WritablePropertyValueModel buildGenericGeneratorBooleanH= older() { + return new PropertyAspectAdapter(getSubjectHol= der(), GenericGeneratorHolder.GENERIC_GENERATORS_LIST) { + = + @Override + protected Boolean buildValue_() { + return getGenerator(subject) !=3D null; + } + + @Override + protected void setValue_(Boolean value) { + if (value && (getGenerator(subject) =3D=3D null)) { + ((GenericGeneratorHolder)subject).addGenericGenerator(0); + } + else if (!value && (getGenerator(subject) !=3D null)) { + ((GenericGeneratorHolder)subject).removeGenericGenerator(0); + } + } + }; + } + = + = + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateIdMappi= ngComposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateIdMappingComp= osite.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateIdMappingComp= osite.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -10,26 +10,34 @@ *************************************************************************= *****/ package org.jboss.tools.hibernate.jpt.ui.internal.mapping.details; = -import org.eclipse.jpt.core.context.Entity; +import org.eclipse.jpt.core.context.Converter; +import org.eclipse.jpt.core.context.ConvertibleMapping; +import org.eclipse.jpt.core.context.IdMapping; +import org.eclipse.jpt.core.context.TemporalConverter; import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.details.JpaComposite; -import org.eclipse.jpt.ui.internal.details.AbstractIdMappingComposite; -import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.mappings.details.GenerationComposite; +import org.eclipse.jpt.ui.internal.mappings.details.TemporalTypeComposite; +import org.eclipse.jpt.ui.internal.widgets.FormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; +import org.eclipse.jpt.utility.internal.model.value.TransformationProperty= ValueModel; import org.eclipse.jpt.utility.model.value.PropertyValueModel; +import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel; +import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateColumn; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateGenera= torContainer; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateIdMapp= ing; import org.jboss.tools.hibernate.jpt.core.internal.context.IndexHolder; +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate= IdMapping; import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaIdMapping; = /** * @author Dmitry Geraskov * */ -public class HibernateIdMappingComposite extends AbstractIdMappingComposit= e +public class HibernateIdMappingComposite extends FormPane implements JpaComposite{ /** * Creates a new HibernateIdMappingComposite. @@ -44,52 +52,123 @@ = super(subjectHolder, parent, widgetFactory); } - = - @Override - protected void initializeLayout(Composite container) { - super.initializeLayout(container); - this.initializeIndexCollapsibleSection(container); - } - = - @Override - protected void initializeIdSection(Composite container) { - new HibernateColumnComposite(this, (PropertyValueModel) buildColumnHolder(), container); - } - = - private PropertyValueModel buildGeneratorCon= tainer() { - return new PropertyAspectAdapter(getSubjectHolder()) { + + private PropertyValueModel buildColumnHolder()= { + return new TransformationPropertyValueModel(= getSubjectHolder()) { @Override - protected HibernateGeneratorContainer buildValue_() { - return (HibernateGeneratorContainer) this.subject.getGeneratorContaine= r(); + protected HibernateColumn transform_(IdMapping value) { + return (HibernateColumn)value.getColumn(); } }; } - = + + @SuppressWarnings("unchecked") @Override - protected void initializeGenerationCollapsibleSection(Composite container= ) { + protected void initializeLayout(Composite container) { + = + // Column widgets + new HibernateColumnComposite(this, buildColumnHolder(), container); + + initializeTypePane(container); + if (getSubject() instanceof HibernateJavaIdMapping) { // Generic Generator required only for Java. - new HibernateGenerationComposite2(this, buildGeneratorContainer(), addS= ubPane(container, 10), false); + new HibernateGenerationComposite((FormPane) this, addSubPane(container, 10)); = } else { - super.initializeGenerationCollapsibleSection(container); + new GenerationComposite(this, addSubPane(container, 10)); } - } - = - protected void initializeIndexCollapsibleSection(Composite container) { + = if (getSubject() instanceof IndexHolder) { - container =3D addCollapsibleSection( + container =3D addCollapsableSection( container, HibernateUIMappingMessages.Index_section_index ); ((GridLayout) container.getLayout()).numColumns =3D 2; - this.initializeIndexSection(container); = + new IndexHolderComposite((FormPane) this, contai= ner); = } = } + = + = + private void initializeTypePane(Composite container) { = - protected void initializeIndexSection(Composite container) { - new IndexHolderComposite((Pane) this, container); = + container =3D addCollapsableSection( + container, + JptUiMappingsMessages.TypeSection_type + ); + ((GridLayout) container.getLayout()).numColumns =3D 2; + + // No converter + Button noConverterButton =3D addRadioButton( + container, = + JptUiMappingsMessages.TypeSection_default, = + buildNoConverterHolder(), = + null); + ((GridData) noConverterButton.getLayoutData()).horizontalSpan =3D 2; + = + PropertyValueModel specifiedConverterHolder =3D buildSpecifie= dConverterHolder(); + // Temporal + addRadioButton( + container, = + JptUiMappingsMessages.TypeSection_temporal, = + buildTemporalBooleanHolder(), = + null); + registerSubPane(new TemporalTypeComposite(buildTemporalConverterHolder(s= pecifiedConverterHolder), container, getWidgetFactory())); } + = = + private WritablePropertyValueModel buildNoConverterHolder() { + return new PropertyAspectAdapter(getSubjectHolder(),= ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) { + @Override + protected Boolean buildValue_() { + return Boolean.valueOf(this.subject.getSpecifiedConverter() =3D=3D nul= l); + } = + @Override + protected void setValue_(Boolean value) { + if (value.booleanValue()) { + this.subject.setSpecifiedConverter(Converter.NO_CONVERTER); + } + } + }; + } + + + private WritablePropertyValueModel buildTemporalBooleanHolder() { + return new PropertyAspectAdapter(getSubjectHolder(),= ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) { + @Override + protected Boolean buildValue_() { + Converter converter =3D this.subject.getSpecifiedConverter(); + if (converter =3D=3D null) { + return Boolean.FALSE; + } + return Boolean.valueOf(converter.getType() =3D=3D Converter.TEMPORAL_C= ONVERTER); + } + + @Override + protected void setValue_(Boolean value) { + if (value.booleanValue()) { + this.subject.setSpecifiedConverter(Converter.TEMPORAL_CONVERTER); + } + } + }; + } + + private PropertyValueModel buildSpecifiedConverterHolder() { + return new PropertyAspectAdapter(getSubjectHolder(= ), ConvertibleMapping.SPECIFIED_CONVERTER_PROPERTY) { + @Override + protected Converter buildValue_() { + return this.subject.getSpecifiedConverter(); + } + }; + } + = + private PropertyValueModel buildTemporalConverterHolde= r(PropertyValueModel converterHolder) { + return new TransformationPropertyValueModel(converterHolder) { + @Override + protected TemporalConverter transform_(Converter converter) { + return (converter !=3D null && converter.getType() =3D=3D Converter.TE= MPORAL_CONVERTER) ? (TemporalConverter) converter : null; + } + }; + } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateNamedNa= tiveQueryPropertyComposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateNamedNativeQu= eryPropertyComposite.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateNamedNativeQu= eryPropertyComposite.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -11,7 +11,7 @@ package org.jboss.tools.hibernate.jpt.ui.internal.mapping.details; = import org.eclipse.jpt.core.JpaProject; -import org.eclipse.jpt.ui.internal.details.JptUiDetailsMessages; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.widgets.ClassChooserPane; import org.eclipse.jpt.ui.internal.widgets.Pane; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; @@ -69,7 +69,7 @@ = @Override protected String getLabelText() { - return JptUiDetailsMessages.NamedNativeQueryPropertyComposite_resultCl= ass; + return JptUiMappingsMessages.NamedNativeQueryPropertyComposite_resultC= lass; } = @Override Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueries= Composite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueriesCompos= ite.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueriesCompos= ite.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -22,13 +22,13 @@ import org.eclipse.jpt.core.context.Query; import org.eclipse.jpt.core.context.QueryContainer; import org.eclipse.jpt.ui.internal.JpaHelpContextIds; -import org.eclipse.jpt.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.ui.internal.details.NamedNativeQueryPropertyComposi= te; -import org.eclipse.jpt.ui.internal.details.NamedQueryPropertyComposite; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.mappings.details.NamedNativeQueryProper= tyComposite; +import org.eclipse.jpt.ui.internal.mappings.details.NamedQueryPropertyComp= osite; import org.eclipse.jpt.ui.internal.util.ControlSwitcher; import org.eclipse.jpt.ui.internal.widgets.AddRemoveListPane; -import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.utility.internal.CollectionTools; import org.eclipse.jpt.utility.internal.Transformer; import org.eclipse.jpt.utility.internal.model.value.CompositeListValueMode= l; @@ -48,17 +48,17 @@ import org.eclipse.ui.part.PageBook; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedN= ativeQuery; import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateNamedQ= uery; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaQueryContainer; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernateQueryC= ontainer; = /** * @author Dmitry Geraskov * */ -public class HibernateQueriesComposite extends Pane { +public class HibernateQueriesComposite extends Pane { = private AddRemoveListPane listPane; private NamedNativeQueryPropertyComposite namedNativeQueryPane; - private NamedQueryPropertyComposite namedQueryPane; + private NamedQueryPropertyComposite namedQueryPane; private HibernateNamedQueryPropertyComposite hibernateNamedQueryPane; private HibernateNamedNativeQueryPropertyComposite hibernateNamedNativeQu= eryPane; private WritablePropertyValueModel queryHolder; @@ -69,11 +69,10 @@ * @param parentPane The parent controller of this one * @param parent The parent container */ - public HibernateQueriesComposite(Pane parentPane, = - PropertyValueModel subjectHolder, - Composite parent) { + public HibernateQueriesComposite(Pane = parentPane, + Composite parent) { = - super(parentPane, subjectHolder, parent, false); + super(parentPane, parent, false); } = private void addQuery() { @@ -106,7 +105,7 @@ throw new IllegalArgumentException(); } query.setName(hibernateAddQueryDialog.getName()); - this.getQueryHolder().setValue(query);//so that it gets selected in the = List for the user to edit + this.queryHolder.setValue(query);//so that it gets selected in the List = for the user to edit } = private ListValueModel buildDisplayableQueriesListHolder() { @@ -158,16 +157,16 @@ private ListValueModel buildHibernateNamedQueriesLis= tHolder() { return new ListAspectAdapter( getSubjectHolder(), - HibernateJavaQueryContainer.HIBERNATE_NAMED_QUERIES_LIST) + HibernateQueryContainer.HIBERNATE_NAMED_QUERIES_LIST) { @Override protected ListIterator listIterator_() { - return ((HibernateJavaQueryContainer)this.subject).hibernateNamedQueri= es(); + return ((HibernateQueryContainer)this.subject).hibernateNamedQueries(); } = @Override protected int size_() { - return ((HibernateJavaQueryContainer)this.subject).hibernateNamedQueri= esSize(); + return ((HibernateQueryContainer)this.subject).hibernateNamedQueriesSi= ze(); } }; } @@ -175,16 +174,16 @@ private ListValueModel buildHibernateNamedNati= veQueriesListHolder() { return new ListAspectAdapter( getSubjectHolder(), - HibernateJavaQueryContainer.HIBERNATE_NAMED_NATIVE_QUERIES_LIST) + HibernateQueryContainer.HIBERNATE_NAMED_NATIVE_QUERIES_LIST) { @Override protected ListIterator listIterator_() { - return ((HibernateJavaQueryContainer)this.subject).hibernateNamedNativ= eQueries(); + return ((HibernateQueryContainer)this.subject).hibernateNamedNativeQue= ries(); } = @Override protected int size_() { - return ((HibernateJavaQueryContainer)this.subject).hibernateNamedNativ= eQueriesSize(); + return ((HibernateQueryContainer)this.subject).hibernateNamedNativeQue= riesSize(); } }; } @@ -311,7 +310,7 @@ index =3D CollectionTools.indexOf(getSubject().namedNativeQueries(),= query); } = - name =3D NLS.bind(JptUiDetailsMessages.QueriesComposite_displayString= , index); + name =3D NLS.bind(JptUiMappingsMessages.QueriesComposite_displayStrin= g, index); } = return name; @@ -379,9 +378,5 @@ private void installPaneSwitcher(PageBook pageBook) { new ControlSwitcher(this.queryHolder, buildPaneTransformer(), pageBook); } - = - protected WritablePropertyValueModel getQueryHolder() { - return queryHolder; - } = } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueryPr= opertyComposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueryProperty= Composite.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateQueryProperty= Composite.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -13,7 +13,7 @@ import java.util.Collection; = import org.eclipse.jpt.ui.internal.JpaHelpContextIds; -import org.eclipse.jpt.ui.internal.details.JptUiDetailsMessages; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.util.LabeledControlUpdater; import org.eclipse.jpt.ui.internal.util.LabeledLabel; import org.eclipse.jpt.ui.internal.widgets.EnumFormComboViewer; @@ -51,13 +51,13 @@ = addLabeledText( container, = - JptUiDetailsMessages.NamedQueryComposite_nameTextLabel, = + JptUiMappingsMessages.NamedQueryComposite_nameTextLabel, = buildNameTextHolder()); = // Query text area addLabeledMultiLineText( container, - JptUiDetailsMessages.NamedQueryPropertyComposite_query, + JptUiMappingsMessages.NamedQueryPropertyComposite_query, buildQueryHolder(), 4, null @@ -136,7 +136,7 @@ = Label label =3D addLabel( container, - JptUiDetailsMessages.DefaultEmpty + JptUiMappingsMessages.DefaultEmpty ); = new LabeledControlUpdater( @@ -158,7 +158,7 @@ HibernateNamedQuery.DEFAULT_FETCH_SIZE; = return NLS.bind( - JptUiDetailsMessages.DefaultWithOneParam, + JptUiMappingsMessages.DefaultWithOneParam, Integer.valueOf(defaultValue) ); } @@ -171,6 +171,18 @@ protected Integer buildValue_() { return Integer.valueOf(this.subject.getDefaultFetchSize()); } + + @Override + protected synchronized void subjectChanged() { + Object oldValue =3D this.getValue(); + super.subjectChanged(); + Object newValue =3D this.getValue(); + + // Make sure the default value is appended to the text + if (oldValue =3D=3D newValue && newValue =3D=3D null) { + this.fireAspectChange(Integer.MIN_VALUE, newValue); + } + } }; } = @@ -221,6 +233,18 @@ protected void setValue_(Boolean value) { this.subject.setSpecifiedCacheable(value); } + + @Override + protected synchronized void subjectChanged() { + Object oldValue =3D this.getValue(); + super.subjectChanged(); + Object newValue =3D this.getValue(); + + // Make sure the default value is appended to the text + if (oldValue =3D=3D newValue && newValue =3D=3D null) { + this.fireAspectChange(Boolean.TRUE, newValue); + } + } }; } = @@ -234,8 +258,8 @@ if ((getSubject() !=3D null) && (value =3D=3D null)) { boolean defaultValue =3D getSubject().isDefaultCacheable(); = - String defaultStringValue =3D defaultValue ? JptUiDetailsMessages.Boo= lean_True : - JptUiDetailsMessages.Boole= an_False; + String defaultStringValue =3D defaultValue ? JptUiMappingsMessages.Bo= olean_True : + JptUiMappingsMessages.Bool= ean_False; = return NLS.bind( HibernateUIMappingMessages.NamedQueryPropertyComposite_cacheableWith= Default, @@ -264,6 +288,17 @@ this.subject.setSpecifiedReadOnly(value); } = + @Override + protected synchronized void subjectChanged() { + Object oldValue =3D this.getValue(); + super.subjectChanged(); + Object newValue =3D this.getValue(); + + // Make sure the default value is appended to the text + if (oldValue =3D=3D newValue && newValue =3D=3D null) { + this.fireAspectChange(Boolean.TRUE, newValue); + } + } }; } = @@ -277,8 +312,8 @@ if ((getSubject() !=3D null) && (value =3D=3D null)) { boolean defaultValue =3D getSubject().isDefaultReadOnly(); = - String defaultStringValue =3D defaultValue ? JptUiDetailsMessages.Boo= lean_True : - JptUiDetailsMessages.Boole= an_False; + String defaultStringValue =3D defaultValue ? JptUiMappingsMessages.Bo= olean_True : + JptUiMappingsMessages.Bool= ean_False; = return NLS.bind( HibernateUIMappingMessages.NamedQueryPropertyComposite_readOnlyWithD= efault, Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateTableCo= mposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateTableComposit= e.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateTableComposit= e.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -15,11 +15,11 @@ import org.eclipse.jpt.db.Schema; import org.eclipse.jpt.db.SchemaContainer; import org.eclipse.jpt.ui.internal.JpaHelpContextIds; -import org.eclipse.jpt.ui.internal.details.JptUiDetailsMessages; -import org.eclipse.jpt.ui.internal.details.db.CatalogCombo; -import org.eclipse.jpt.ui.internal.details.db.SchemaCombo; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.mappings.db.CatalogCombo; +import org.eclipse.jpt.ui.internal.mappings.db.SchemaCombo; import org.eclipse.jpt.ui.internal.util.PaneEnabler; -import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.ui.internal.widgets.FormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel; @@ -62,7 +62,7 @@ * @version 2.0 * @since 1.0 */ -public class HibernateTableComposite extends Pane +public class HibernateTableComposite extends FormPane { /** * Creates a new HibernateTableComposite. @@ -71,7 +71,7 @@ * @param subjectHolder The holder of the subject * @param parent The parent container */ - public HibernateTableComposite(Pane parentPane, + public HibernateTableComposite(FormPane parent= Pane, Composite parent) { = super(parentPane, parent, false); @@ -83,23 +83,24 @@ // Table group pane Group tableGroupPane =3D addTitledGroup( container, - JptUiDetailsMessages.TableComposite_tableSection + JptUiMappingsMessages.TableComposite_tableSection ); = PropertyValueModel subjectHolder =3D buildTableHolder(); + TableCombo tc =3D addTableCombo(subjectHolder, tableGrou= pPane); = // Table widgets addLabeledComposite( - tableGroupPane, - JptUiDetailsMessages.TableChooser_label, - addTableCombo(subjectHolder, tableGroupPane), - JpaHelpContextIds.ENTITY_TABLE - ); - = + tableGroupPane, + JptUiMappingsMessages.TableChooser_label, + tc, + JpaHelpContextIds.ENTITY_TABLE + ); + // Catalog widgets addLabeledComposite( tableGroupPane, - JptUiDetailsMessages.CatalogChooser_label, + JptUiMappingsMessages.CatalogChooser_label, addCatalogCombo(subjectHolder, tableGroupPane), JpaHelpContextIds.ENTITY_CATALOG ); @@ -107,7 +108,7 @@ // Schema widgets addLabeledComposite( tableGroupPane, - JptUiDetailsMessages.SchemaChooser_label, + JptUiMappingsMessages.SchemaChooser_label, addSchemaCombo(subjectHolder, tableGroupPane), JpaHelpContextIds.ENTITY_SCHEMA ); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappi= ngMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMess= ages.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateUIMappingMess= ages.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2008-2010 Red Hat, Inc. + * Copyright (c) 2008-2009 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, @@ -47,8 +47,6 @@ public static String BasicGeneralSection_generated; public static String IndexHolderComposite_name; public static String Index_section_index; - public static String ParametersComposite_nameColumn; - public static String ParametersComposite_valueColumn; = private HibernateUIMappingMessages() {} = Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/IndexHolderCompo= site.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/IndexHolderComposite.j= ava 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/IndexHolderComposite.j= ava 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -11,22 +11,22 @@ = package org.jboss.tools.hibernate.jpt.ui.internal.mapping.details; = -import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.ui.internal.widgets.FormPane; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.model.value.WritablePropertyValueModel; import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.hibernate.jpt.core.internal.context.Index; import org.jboss.tools.hibernate.jpt.core.internal.context.IndexHolder; -import org.jboss.tools.hibernate.jpt.core.internal.context.java.JavaIndex; = /** * @author Dmitry Geraskov * */ -public class IndexHolderComposite extends Pane { +public class IndexHolderComposite extends FormPane { = - private WritablePropertyValueModel indexHolder; + private WritablePropertyValueModel indexHolder; = - protected IndexHolderComposite(Pane parentPane, + protected IndexHolderComposite(FormPane parentPane, Composite parent) { super(parentPane, parent); } @@ -50,7 +50,7 @@ = = protected final WritablePropertyValueModel buildIndexNameHolder()= { - return new PropertyAspectAdapter(this.indexHolder, Ja= vaIndex.INDEX_NAME) { + return new PropertyAspectAdapter(this.indexHolder, Index.= INDEX_NAME) { @Override protected String buildValue_() { return subject =3D=3D null ? null : subject.getName(); @@ -67,7 +67,7 @@ return; } = - JavaIndex index =3D = + Index index =3D = (getSubject().getIndex() =3D=3D null) ? getSubject().addIndex() : getSubject().getIndex(); index.setName(value); @@ -83,10 +83,10 @@ }; } = - private WritablePropertyValueModel buildIndexHolder() { - return new PropertyAspectAdapter(getSubjectHolde= r(), IndexHolder.INDEX_PROPERTY) { + private WritablePropertyValueModel buildIndexHolder() { + return new PropertyAspectAdapter(getSubjectHolder(),= IndexHolder.INDEX_PROPERTY) { @Override - protected JavaIndex buildValue_() { + protected Index buildValue_() { return this.subject.getIndex(); } }; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/ParametersCompos= ite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/ParametersComposite.ja= va 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/ParametersComposite.ja= va 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -19,11 +19,12 @@ import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.TextCellEditor; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; import org.eclipse.jpt.ui.internal.swt.ColumnAdapter; import org.eclipse.jpt.ui.internal.util.PaneEnabler; -import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.ui.internal.widgets.AddRemoveTablePane; import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.ui.internal.widgets.AddRemovePane.Adapter; import org.eclipse.jpt.utility.internal.iterators.EmptyListIterator; import org.eclipse.jpt.utility.internal.model.value.ListAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; @@ -57,7 +58,7 @@ * @param parent The parent container */ public ParametersComposite(Pane parentPane, - Composite container, PropertyValueModel generator= Holder) { + Composite container, WritablePropertyValueModel g= eneratorHolder) { = super(parentPane, generatorHolder, container, false); } @@ -181,11 +182,11 @@ = switch (columnIndex) { case ParameterColumnAdapter.NAME_COLUMN_INDEX: { - return HibernateUIMappingMessages.ParametersComposite_nameColumn; + return JptUiMappingsMessages.QueryHintsComposite_nameColumn; } = case ParameterColumnAdapter.VALUE_COLUMN_INDEX: { - return HibernateUIMappingMessages.ParametersComposite_valueColumn; + return JptUiMappingsMessages.QueryHintsComposite_valueColumn; } = default: { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/messages.propert= ies =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties 20= 10-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mapping/details/messages.properties 20= 10-05-26 13:13:34 UTC (rev 22326) @@ -24,6 +24,4 @@ HibernateDiscriminatorColumnComposite_formula=3DFormula: BasicGeneralSection_generated =3D Generation Time: IndexHolderComposite_name=3DName: -Index_section_index=3DIndex -ParametersComposite_nameColumn=3DName -ParametersComposite_valueColumn=3DValue \ No newline at end of file +Index_section_index=3DIndex \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCombo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCombo.java 2010-= 05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCombo.java 2010-= 05-26 13:13:34 UTC (rev 22326) @@ -9,11 +9,12 @@ *************************************************************************= *****/ package org.jboss.tools.hibernate.jpt.ui.internal.mappings.db.xpl; = +import java.util.Iterator; import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.db.Table; import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.Pane; -import org.eclipse.jpt.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; = @@ -23,45 +24,41 @@ public abstract class ColumnCombo extends DatabaseObjectCombo { - public ColumnCombo( - Pane parentPane, = - Composite parent) { - = + public ColumnCombo(Pane parentPane, Composite parent) { super(parentPane, parent); } - = + public ColumnCombo( - Pane parentPane, - PropertyValueModel subjectHolder, - Composite parent) { - = + Pane parentPane, + PropertyValueModel subjectHolder, + Composite parent + ) { super(parentPane, subjectHolder, parent); } - = + public ColumnCombo( - PropertyValueModel subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - = + PropertyValueModel subjectHolder, + Composite parent, + WidgetFactory widgetFactory + ) { super(subjectHolder, parent, widgetFactory); } - = - = + @Override - protected Iterable getValues_() { + protected Iterator values() { Table dbTable =3D this.getDbTable(); - return (dbTable !=3D null) ? dbTable.getSortedColumnIdentifiers() : Empt= yIterable.instance(); + return (dbTable =3D=3D null) ? EmptyIterator.instance() : dbTabl= e.sortedColumnIdentifiers(); } - = + protected Table getDbTable() { return (this.getSubject() =3D=3D null) ? null : this.getDbTable_(); } - = + /** * Assume the subject is not null. */ protected abstract Table getDbTable_(); - = + @Override protected void tableChanged_(Table table) { super.tableChanged_(table); @@ -69,4 +66,5 @@ this.doPopulate(); } } + } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseObjectCo= mbo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseObjectCombo.ja= va 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseObjectCombo.ja= va 2010-05-26 13:13:34 UTC (rev 22326) @@ -11,6 +11,8 @@ *************************************************************************= *****/ package org.jboss.tools.hibernate.jpt.ui.internal.mappings.db.xpl; = +import java.util.Iterator; + import org.eclipse.jpt.core.JpaDataSource; import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.core.JpaProject; @@ -27,12 +29,17 @@ import org.eclipse.jpt.ui.internal.Tracing; import org.eclipse.jpt.ui.internal.listeners.SWTConnectionListenerWrapper; import org.eclipse.jpt.ui.internal.listeners.SWTPropertyChangeListenerWrap= per; -import org.eclipse.jpt.ui.internal.widgets.ComboPane; +import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages; +import org.eclipse.jpt.ui.internal.util.SWTUtil; import org.eclipse.jpt.ui.internal.widgets.Pane; -import org.eclipse.jpt.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.utility.internal.StringTools; import org.eclipse.jpt.utility.model.event.PropertyChangeEvent; import org.eclipse.jpt.utility.model.listener.PropertyChangeListener; import org.eclipse.jpt.utility.model.value.PropertyValueModel; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.custom.CCombo; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.widgets.Composite; = /** @@ -47,56 +54,61 @@ */ @SuppressWarnings("nls") public abstract class DatabaseObjectCombo - extends ComboPane + extends Pane { + /** + * The main (only) widget of this pane. + */ + protected CCombo comboBox; + + /** * The listener added to the ConnectionProfile. * It keeps the combo in sync with the database metadata. */ private ConnectionListener connectionListener; - = + private PropertyChangeListener connectionProfileListener; = - = // ********** constructors ********** - = + protected DatabaseObjectCombo( - Pane parentPane, = - Composite parent) { - = + Pane parentPane, + Composite parent + ) { super(parentPane, parent); } - = + protected DatabaseObjectCombo( - Pane parentPane, - PropertyValueModel subjectHolder, - Composite parent) { - = + Pane parentPane, + PropertyValueModel subjectHolder, + Composite parent + ) { super(parentPane, subjectHolder, parent); } - = + protected DatabaseObjectCombo( - PropertyValueModel subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - = + PropertyValueModel subjectHolder, + Composite parent, + WidgetFactory widgetFactory + ) { super(subjectHolder, parent, widgetFactory); } - = - = + + // ********** initialization ********** - = + @Override protected void initialize() { super.initialize(); this.connectionListener =3D this.buildConnectionListener(); this.connectionProfileListener =3D this.buildConnectionProfileListener(); } - = + protected ConnectionListener buildConnectionListener() { return new SWTConnectionListenerWrapper(this.buildConnectionListener_()); } - = + protected ConnectionListener buildConnectionListener_() { return new LocalConnectionListener(); } @@ -104,7 +116,7 @@ protected PropertyChangeListener buildConnectionProfileListener() { return new SWTPropertyChangeListenerWrapper(this.buildConnectionProfileL= istener_()); } - = + protected PropertyChangeListener buildConnectionProfileListener_() { return new PropertyChangeListener(){ = @@ -113,7 +125,7 @@ } }; } - = + protected void connectionProfileChanged(PropertyChangeEvent event) { if (event.getOldValue() !=3D null) { ((ConnectionProfile) event.getOldValue()).removeConnectionListener(this= .connectionListener); @@ -124,9 +136,50 @@ this.repopulateComboBox(); } = - = + @Override + protected void initializeLayout(Composite container) { + this.comboBox =3D this.addEditableCCombo(container); + this.comboBox.addModifyListener(this.buildModifyListener()); + SWTUtil.attachDefaultValueHandler(this.comboBox); + } + + protected ModifyListener buildModifyListener() { + return new ModifyListener() { + public void modifyText(ModifyEvent e) { + DatabaseObjectCombo.this.comboBoxModified(); + } + }; + } + + + // ********** abstract methods ********** + + /** + * Return the possible values to be added to the combo during + * population. + */ + protected abstract Iterator values(); + + /** + * Return the default value, or null if no default is + * specified. This method is only called when the subject is non-null. + */ + protected abstract String getDefaultValue(); + + /** + * Return the current value from the subject. + * This method is only called when the subject is non-null. + */ + protected abstract String getValue(); + + /** + * Set the specified value as the new value on the subject. + */ + protected abstract void setValue(String value); + + // ********** overrides ********** - = + @Override protected void engageListeners_(T subject) { super.engageListeners_(subject); @@ -137,7 +190,7 @@ cp.addConnectionListener(this.connectionListener); } } - = + @Override protected void disengageListeners_(T subject) { ConnectionProfile cp =3D subject.getJpaProject().getConnectionProfile(); @@ -148,20 +201,188 @@ = super.disengageListeners_(subject); } - = + @Override - protected final Iterable getValues() { - return this.connectionProfileIsActive() ? this.getValues_() : EmptyItera= ble.instance(); + public void enableWidgets(boolean enabled) { + super.enableWidgets(enabled); + + if ( ! this.comboBox.isDisposed()) { + this.comboBox.setEnabled(enabled); + } } - = + + @Override + protected void propertyChanged(String propertyName) { + super.propertyChanged(propertyName); + this.updateSelectedItem(); + } + + @Override + protected void doPopulate() { + super.doPopulate(); + this.populateComboBox(); + } + + + // ********** populating ********** + /** - * Called only when connection profile is active + * Populate the combo-box list by clearing it, then adding first the defa= ult + * value, if available, and then the possible choices. */ - protected abstract Iterable getValues_(); - = - = + protected void populateComboBox() { + this.comboBox.removeAll(); + + this.comboBox.add(this.buildDefaultValueEntry()); + + if (this.connectionProfileIsActive()) { + for (Iterator stream =3D this.values(); stream.hasNext(); ) { + this.comboBox.add(stream.next()); + } + } + + this.updateSelectedItem_(); + } + + protected String buildDefaultValueEntry() { + if (getSubject() =3D=3D null) { + return JptUiMappingsMessages.NoneSelected; + } + String defaultValue =3D this.getDefaultValue(); + return (defaultValue =3D=3D null) ? this.buildNullDefaultValueEntry() : = this.buildNonNullDefaultValueEntry(defaultValue); + } + + protected String buildNullDefaultValueEntry() { + return JptUiMappingsMessages.DefaultEmpty; + } + + protected String buildNonNullDefaultValueEntry(String defaultValue) { + return NLS.bind( + JptUiMappingsMessages.DefaultWithOneParam, + defaultValue + ); + } + + protected void updateSelectedItem() { + // make sure the default value is up to date (??? ~bjv) + String defaultValueEntry =3D this.buildDefaultValueEntry(); + if ( ! this.comboBox.getItem(0).equals(defaultValueEntry)) { + this.comboBox.remove(0); + this.comboBox.add(defaultValueEntry, 0); + } + + this.updateSelectedItem_(); + } + + /** + * Updates the selected item by selecting the current value, if not + * null, or select the default value if one is available, + * otherwise remove the selection. + */ + protected void updateSelectedItem_() { + String value =3D (this.getSubject() =3D=3D null) ? null : this.getValue(= ); + if (value =3D=3D null) { + // select the default value + this.comboBox.select(0); + } else { + // select the new value + if ( ! value.equals(this.comboBox.getText())) { + // This prevents the cursor from being set back to the beginning of th= e line (bug 234418). + // The reason we are hitting this method at all is because the + // context model is updating from the resource model in a way + // that causes change notifications to be fired (the annotation + // is added to the resource model, change notification occurs + // on the update thread, and then the name is set, these 2 + // threads can get in the wrong order). + // The #valueChanged() method sets the populating flag to true, + // but in this case it is already set back to false when we + // receive notification back from the model because it has + // moved to the update thread and then jumps back on the UI thread. + this.comboBox.setText(value); + } + } + } + + + // ********** combo-box listener callback ********** + + protected void comboBoxModified() { + if ( ! this.isPopulating()) { + this.valueChanged(this.comboBox.getText()); + } + } + + /** + * The combo-box selection has changed, update the model if necessary. + * If the value has changed and the subject is null, we can build a subje= ct + * before setting the value. + */ + protected void valueChanged(String newValue) { + JpaNode subject =3D this.getSubject(); + String oldValue; + if (subject =3D=3D null) { + if (this.nullSubjectIsNotAllowed()) { + return; // no subject to set the value on + } + oldValue =3D null; + } else { + oldValue =3D this.getValue(); + } + + // convert empty string or default to null + if (StringTools.stringIsEmpty(newValue) || this.valueIsDefault(newValue)= ) { + newValue =3D null; + } + + // set the new value if it is different from the old value + if (this.valuesAreDifferent(oldValue, newValue)) { + this.setPopulating(true); + + try { + this.setValue(newValue); + } finally { + this.setPopulating(false); + } + } + } + + /** + * Return whether we can set the value when the subject is null + * (i.e. #setValue(String) will construct the subject if necessary). + */ + protected boolean nullSubjectIsAllowed() { + return false; + } + + protected final boolean nullSubjectIsNotAllowed() { + return ! this.nullSubjectIsAllowed(); + } + + /** + * pre-condition: value is not null + */ + protected boolean valueIsDefault(String value) { + return (this.comboBox.getItemCount() > 0) + && value.equals(this.comboBox.getItem(0)); + } + + protected boolean valuesAreEqual(String value1, String value2) { + if ((value1 =3D=3D null) && (value2 =3D=3D null)) { + return true; // both are null + } + if ((value1 =3D=3D null) || (value2 =3D=3D null)) { + return false; // one is null but the other is not + } + return value1.equals(value2); + } + + protected boolean valuesAreDifferent(String value1, String value2) { + return ! this.valuesAreEqual(value1, value2); + } + + // ********** convenience methods ********** - = + /** * Return the subject's JPA project. * Allow subclasses to override this method, so we can still get the JPA @@ -171,7 +392,7 @@ T subject =3D this.getSubject(); return (subject =3D=3D null) ? null : subject.getJpaProject(); } - = + /** * Return the subject's connection profile. */ @@ -179,7 +400,7 @@ JpaProject jpaProject =3D this.getJpaProject(); return (jpaProject =3D=3D null) ? null : jpaProject.getConnectionProfile= (); } - = + /** * Return whether the subject's connection profile is active. */ @@ -187,7 +408,7 @@ ConnectionProfile cp =3D this.getConnectionProfile(); return (cp !=3D null) && cp.isActive(); } - = + /** * Returns the subject's database. */ @@ -195,80 +416,86 @@ ConnectionProfile cp =3D this.getConnectionProfile(); return (cp =3D=3D null) ? null : cp.getDatabase(); } - = - = + + // ********** connection listener callbacks ********** - = + + protected void repopulateComboBox() { + if ( ! this.comboBox.isDisposed()) { + this.repopulate(); + } + } + protected final void databaseChanged(Database database) { if ( ! this.comboBox.isDisposed()) { this.databaseChanged_(database); } } - = - protected void databaseChanged_(@SuppressWarnings("unused") Database data= base) { + + protected void databaseChanged_(Database database) { // do nothing by default } - = + protected final void catalogChanged(Catalog catalog) { if ( ! this.comboBox.isDisposed()) { this.catalogChanged_(catalog); } } - = - protected void catalogChanged_(@SuppressWarnings("unused") Catalog catalo= g) { + + protected void catalogChanged_(Catalog catalog) { // do nothing by default } - = + protected final void schemaChanged(Schema schema) { if ( ! this.comboBox.isDisposed()) { this.schemaChanged_(schema); } } - = - protected void schemaChanged_(@SuppressWarnings("unused") Schema schema) { + + protected void schemaChanged_(Schema schema) { // do nothing by default } - = + protected final void sequenceChanged(Sequence sequence) { if ( ! this.comboBox.isDisposed()) { this.sequenceChanged_(sequence); } } - = - protected void sequenceChanged_(@SuppressWarnings("unused") Sequence sequ= ence) { + + protected void sequenceChanged_(Sequence sequence) { // do nothing by default } - = + protected final void tableChanged(Table table) { if ( ! this.comboBox.isDisposed()) { this.tableChanged_(table); } } - = - protected void tableChanged_(@SuppressWarnings("unused") Table table) { + + protected void tableChanged_(Table table) { // do nothing by default } - = + protected final void columnChanged(Column column) { if ( ! this.comboBox.isDisposed()) { this.columnChanged_(column); } } - = - protected void columnChanged_(@SuppressWarnings("unused") Column column) { + + protected void columnChanged_(Column column) { // do nothing by default } - = + protected final void foreignKeyChanged(ForeignKey foreignKey) { if ( ! this.comboBox.isDisposed()) { this.foreignKeyChanged_(foreignKey); } } - = - protected void foreignKeyChanged_(@SuppressWarnings("unused") ForeignKey = foreignKey) { + + protected void foreignKeyChanged_(ForeignKey foreignKey) { // do nothing by default } - = + @Override protected void log(String flag, String message) { if (flag.equals(Tracing.UI_DB) && Tracing.booleanDebugOption(Tracing.UI_= DB)) { @@ -278,84 +505,78 @@ } } = - // broaden accessibility a bit - @Override - protected void repopulateComboBox() { - super.repopulateComboBox(); - } - = - = + // ********** connection listener ********** - = - protected class LocalConnectionListener = - implements ConnectionListener = - { + + protected class LocalConnectionListener implements ConnectionListener { + protected LocalConnectionListener() { super(); } - = + public void opened(ConnectionProfile profile) { this.log("opened: " + profile.getName()); DatabaseObjectCombo.this.repopulateComboBox(); } - = + public void modified(ConnectionProfile profile) { this.log("modified: " + profile.getName()); DatabaseObjectCombo.this.repopulateComboBox(); } - = + public boolean okToClose(ConnectionProfile profile) { this.log("OK to close: " + profile.getName()); return true; } - = + public void aboutToClose(ConnectionProfile profile) { this.log("about to close: " + profile.getName()); } - = + public void closed(ConnectionProfile profile) { this.log("closed: " + profile.getName()); DatabaseObjectCombo.this.repopulateComboBox(); } - = + public void databaseChanged(ConnectionProfile profile, Database database= ) { this.log("database changed: " + database.getName()); DatabaseObjectCombo.this.databaseChanged(database); } - = + public void catalogChanged(ConnectionProfile profile, Catalog catalog) { this.log("catalog changed: " + catalog.getName()); DatabaseObjectCombo.this.catalogChanged(catalog); } - = + public void schemaChanged(ConnectionProfile profile, Schema schema) { this.log("schema changed: " + schema.getName()); DatabaseObjectCombo.this.schemaChanged(schema); } - = + public void sequenceChanged(ConnectionProfile profile, Sequence sequence= ) { this.log("sequence changed: " + sequence.getName()); DatabaseObjectCombo.this.sequenceChanged(sequence); } - = + public void tableChanged(ConnectionProfile profile, Table table) { this.log("table changed: " + table.getName()); DatabaseObjectCombo.this.tableChanged(table); } - = + public void columnChanged(ConnectionProfile profile, Column column) { this.log("column changed: " + column.getName()); DatabaseObjectCombo.this.columnChanged(column); } - = + public void foreignKeyChanged(ConnectionProfile profile, ForeignKey fore= ignKey) { this.log("foreign key changed: " + foreignKey.getName()); DatabaseObjectCombo.this.foreignKeyChanged(foreignKey); } - = + protected void log(String message) { DatabaseObjectCombo.this.log(Tracing.UI_DB, message); } - } = + + } + = } - Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCombo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCombo.java 2010-0= 5-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCombo.java 2010-0= 5-26 13:13:34 UTC (rev 22326) @@ -9,11 +9,13 @@ *************************************************************************= *****/ package org.jboss.tools.hibernate.jpt.ui.internal.mappings.db.xpl; = +import java.util.Iterator; + import org.eclipse.jpt.core.JpaNode; import org.eclipse.jpt.db.Schema; import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.internal.widgets.Pane; -import org.eclipse.jpt.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.utility.internal.iterators.EmptyIterator; import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; = @@ -23,36 +25,32 @@ public abstract class TableCombo extends DatabaseObjectCombo { - public TableCombo( - Pane parentPane, - Composite parent) { - = + public TableCombo(Pane parentPane, Composite parent) { super(parentPane, parent); } - = + public TableCombo( - Pane parentPane, - PropertyValueModel subjectHolder, - Composite parent) { - = + Pane parentPane, + PropertyValueModel subjectHolder, + Composite parent + ) { super(parentPane, subjectHolder, parent); } - = + public TableCombo( - PropertyValueModel subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - = + PropertyValueModel subjectHolder, + Composite parent, + WidgetFactory widgetFactory + ) { super(subjectHolder, parent, widgetFactory); } - = - = + @Override - protected Iterable getValues_() { + protected Iterator values() { Schema dbSchema =3D this.getDbSchema(); - return (dbSchema !=3D null) ? dbSchema.getSortedTableIdentifiers() : Emp= tyIterable.instance(); + return (dbSchema =3D=3D null) ? EmptyIterator.instance() : dbSch= ema.sortedTableIdentifiers(); } - = + protected Schema getDbSchema() { return (this.getSubject() =3D=3D null) ? null : this.getDbSchema_(); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/orm/details/HibernateOrmEntityCo= mposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/orm/details/HibernateOrmEntityComposit= e.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/orm/details/HibernateOrmEntityComposit= e.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2009-2010 Red Hat, Inc. + * Copyright (c) 2009 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, @@ -14,14 +14,14 @@ import org.eclipse.jpt.core.context.AccessHolder; import org.eclipse.jpt.core.context.orm.OrmEntity; import org.eclipse.jpt.ui.WidgetFactory; -import org.eclipse.jpt.ui.internal.details.AbstractEntityComposite; import org.eclipse.jpt.ui.internal.details.AccessTypeComposite; -import org.eclipse.jpt.ui.internal.details.EntityNameComposite; -import org.eclipse.jpt.ui.internal.details.IdClassComposite; -import org.eclipse.jpt.ui.internal.details.orm.MetadataCompleteComposite; -import org.eclipse.jpt.ui.internal.details.orm.OrmInheritanceComposite; -import org.eclipse.jpt.ui.internal.details.orm.OrmJavaClassChooser; -import org.eclipse.jpt.ui.internal.details.orm.OrmSecondaryTablesComposite; +import org.eclipse.jpt.ui.internal.mappings.details.AbstractEntityComposit= e; +import org.eclipse.jpt.ui.internal.mappings.details.EntityNameComposite; +import org.eclipse.jpt.ui.internal.mappings.details.IdClassComposite; +import org.eclipse.jpt.ui.internal.orm.details.MetadataCompleteComposite; +import org.eclipse.jpt.ui.internal.orm.details.OrmInheritanceComposite; +import org.eclipse.jpt.ui.internal.orm.details.OrmJavaClassChooser; +import org.eclipse.jpt.ui.internal.orm.details.OrmSecondaryTablesComposite; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.model.value.PropertyValueModel; import org.eclipse.swt.widgets.Composite; @@ -45,13 +45,25 @@ } = @Override - protected void initializeEntitySection(Composite container) { - new OrmJavaClassChooser(this, getSubjectHolder(), container, false); + protected void initializeLayout(Composite container) { + initializeGeneralPane(container); + initializeQueriesPane(container); + initializeInheritancePane(container); + initializeAttributeOverridesPane(container); + initializeGeneratorsPane(container); + initializeSecondaryTablesPane(container); + } + = + @Override + protected void initializeGeneralPane(Composite container) { + int groupBoxMargin =3D getGroupBoxMargin(); + = + new OrmJavaClassChooser(this, getSubjectHolder(), addSubPane(container, = 0, groupBoxMargin, 0, groupBoxMargin), false); new HibernateTableComposite(this, container); - new EntityNameComposite(this, container); - new AccessTypeComposite(this, buildAccessHolder(), container); - new IdClassComposite(this, buildIdClassReferenceHolder(), container); - new MetadataCompleteComposite(this, getSubjectHolder(), container); + new EntityNameComposite(this, addSubPane(container, 0, groupBoxMargin, 0= , groupBoxMargin)); + new AccessTypeComposite(this, buildAccessHolder(), addSubPane(container,= 0, groupBoxMargin, 0, groupBoxMargin)); + new IdClassComposite(this, addSubPane(container, 0, groupBoxMargin, 0, g= roupBoxMargin), false); + new MetadataCompleteComposite(this, getSubjectHolder(), addSubPane(conta= iner, 0, groupBoxMargin, 0, groupBoxMargin)); } = protected PropertyValueModel buildAccessHolder() { @@ -64,13 +76,14 @@ } }; } + = @Override - protected void initializeSecondaryTablesSection(Composite container) { + protected void addSecondaryTablesComposite(Composite container) { new OrmSecondaryTablesComposite(this, container); } - + = @Override - protected void initializeInheritanceSection(Composite container) { + protected void addInheritanceComposite(Composite container) { new OrmInheritanceComposite(this, container); } } \ No newline at end of file Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/= org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePers= istenceXmlUiDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersisten= ceXmlUiDefinition.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersisten= ceXmlUiDefinition.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,59 +0,0 @@ -/*************************************************************************= ****** - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ************************************************************************= ******/ -package org.jboss.tools.hibernate.jpt.ui.internal.persistence.details; - -import org.eclipse.jpt.core.JpaResourceType; -import org.eclipse.jpt.core.JptCorePlugin; -import org.eclipse.jpt.ui.ResourceUiDefinition; -import org.eclipse.jpt.ui.internal.persistence.details.AbstractPersistence= XmlResourceUiDefinition; -import org.eclipse.jpt.ui.internal.persistence.details.PersistenceXmlUiFac= tory; -import org.eclipse.jpt.ui.internal.structure.PersistenceResourceModelStruc= tureProvider; -import org.eclipse.jpt.ui.structure.JpaStructureProvider; - -/** - * @author Dmitry Geraskov - * - */ -public class HibernatePersistenceXmlUiDefinition extends - AbstractPersistenceXmlResourceUiDefinition { - // singleton - private static final ResourceUiDefinition INSTANCE =3D new HibernatePersi= stenceXmlUiDefinition(); - = - = - /** - * Return the singleton - */ - public static ResourceUiDefinition instance() { - return INSTANCE; - } - = - = - /** - * Enforce singleton usage - */ - private HibernatePersistenceXmlUiDefinition() { - super(); - } - = - = - @Override - protected PersistenceXmlUiFactory buildPersistenceXmlUiFactory() { - return new HibernatePersistenceXmlUiFactory(); - } - = - public boolean providesUi(JpaResourceType resourceType) { - return resourceType.equals(JptCorePlugin.PERSISTENCE_XML_1_0_RESOURCE_TY= PE); - } - = - public JpaStructureProvider getStructureProvider() { - return PersistenceResourceModelStructureProvider.instance(); - } -} Deleted: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/= org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePers= istenceXmlUiFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersisten= ceXmlUiFactory.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePersisten= ceXmlUiFactory.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -1,64 +0,0 @@ -/*************************************************************************= ****** - * 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ************************************************************************= ******/ -package org.jboss.tools.hibernate.jpt.ui.internal.persistence.details; - -import java.util.ArrayList; -import java.util.List; -import java.util.ListIterator; - -import org.eclipse.jpt.core.context.persistence.PersistenceUnit; -import org.eclipse.jpt.ui.WidgetFactory; -import org.eclipse.jpt.ui.details.JpaPageComposite; -import org.eclipse.jpt.ui.internal.persistence.details.GenericPersistenceU= nitGeneralComposite; -import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitConn= ectionComposite; -import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitProp= ertiesComposite; -import org.eclipse.jpt.ui.internal.persistence.details.PersistenceXmlUiFac= tory; -import org.eclipse.jpt.utility.internal.model.value.TransformationProperty= ValueModel; -import org.eclipse.jpt.utility.model.value.PropertyValueModel; -import org.eclipse.swt.widgets.Composite; -import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit; -import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibe= rnateProperties; - -/** - * @author Dmitry Geraskov - * - */ -public class HibernatePersistenceXmlUiFactory implements - PersistenceXmlUiFactory { - - @Override - public ListIterator createPersistenceUnitComposites( - PropertyValueModel subjectHolder, - Composite parent, WidgetFactory widgetFactory) { - List pages =3D new ArrayList(1); - - pages.add(new GenericPersistenceUnitGeneralComposite(subjectHolder, pare= nt, widgetFactory)); - pages.add(new PersistenceUnitConnectionComposite(subjectHolder, parent, = widgetFactory)); - pages.add(new PersistenceUnitPropertiesComposite(subjectHolder, parent, = widgetFactory)); - = - // ************Hibernate pages*************** - PropertyValueModel basicHolder =3D this.buildB= asicHolder(subjectHolder); - pages.add(new HibernatePropertiesComposite(basicHolder, parent, widgetFa= ctory)); - - return pages.listIterator(); - } - = - private PropertyValueModel buildBasicHolder( - PropertyValueModel subjectHolder) { - return new TransformationPropertyValueModel(subjectHolder) { - @Override - protected BasicHibernateProperties transform_(PersistenceUnit value) { - return ((HibernatePersistenceUnit)value).getHibernatePersistenceUnitPr= operties(); - } - }; - } - -} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePro= pertiesComposite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertie= sComposite.java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/persistence/details/HibernatePropertie= sComposite.java 2010-05-26 13:13:34 UTC (rev 22326) @@ -17,7 +17,6 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.IWizardPage; @@ -25,7 +24,7 @@ import org.eclipse.jpt.ui.WidgetFactory; import org.eclipse.jpt.ui.details.JpaPageComposite; import org.eclipse.jpt.ui.internal.listeners.SWTPropertyChangeListenerWrap= per; -import org.eclipse.jpt.ui.internal.widgets.Pane; +import org.eclipse.jpt.ui.internal.widgets.FormPane; import org.eclipse.jpt.utility.internal.StringConverter; import org.eclipse.jpt.utility.internal.model.value.PropertyAspectAdapter; import org.eclipse.jpt.utility.internal.model.value.SimpleListValueModel; @@ -53,7 +52,7 @@ * @author Dmitry Geraskov * = */ -public class HibernatePropertiesComposite extends Pane implements +public class HibernatePropertiesComposite extends FormPane implements JpaPageComposite { = private Text cfgFile; @@ -130,7 +129,7 @@ StringConverter.Default.instance(), null); = - dialectHolder.addPropertyChangeListener(PropertyValueModel.VALUE, new SW= TPropertyChangeListenerWrapper( + dialectHolder.addPropertyChangeListener(new SWTPropertyChangeListenerWra= pper( new PropertyChangeListener() { public void propertyChanged(PropertyChangeEvent event) { String dialectClass =3D helper.getDialectClass((String) event.getNew= Value()); @@ -144,7 +143,7 @@ ) ); = - driverHolder.addPropertyChangeListener( PropertyValueModel.VALUE, new SW= TPropertyChangeListenerWrapper( + driverHolder.addPropertyChangeListener( new SWTPropertyChangeListenerWra= pper( new PropertyChangeListener() { public void propertyChanged(PropertyChangeEvent event) { String driverClass =3D (String) event.getNewValue(); @@ -218,6 +217,7 @@ } = private void handleConfigurationFileCreate() { + StructuredSelection selection =3D null; NewConfigurationWizard wizard =3D new NewConfigurationWizard(); wizard.init(PlatformUI.getWorkbench(), StructuredSelection.EMPTY ); IWorkbenchWindow win =3D PlatformUI.getWorkbench().getActiveWorkbenchW= indow(); @@ -386,10 +386,4 @@ public String getPageText() { return Messages.HibernatePropertiesComposite_hibernate; } - - @Override - public ImageDescriptor getPageImageDescriptor() { - // TODO hibernate tab in persistence.xml image - return null; - } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUi.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUi.java 2= 010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUi.java 2= 010-05-26 13:13:34 UTC (rev 22326) @@ -22,8 +22,10 @@ import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.jpt.core.JpaProject; import org.eclipse.jpt.ui.JpaPlatformUiProvider; +import org.eclipse.jpt.ui.JpaUiFactory; import org.eclipse.jpt.ui.internal.platform.generic.GenericJpaPlatformUi; import org.eclipse.jpt.ui.navigator.JpaNavigatorProvider; +import org.eclipse.jpt.ui.structure.JpaStructureProvider; import org.hibernate.eclipse.launch.HibernateLaunchConstants; import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaProject; import org.jboss.tools.hibernate.jpt.ui.HibernateJptUIPlugin; @@ -42,10 +44,13 @@ public static final String full_exporter_id =3D HibernateLaunchConstants.= ATTR_EXPORTERS + '.' + "hbmexporter"; //$NON-NLS-1$ = public HibernateJpaPlatformUi( + JpaUiFactory jpaUiFactory, JpaNavigatorProvider navigatorProvider, = - JpaPlatformUiProvider platformUiProvider) = + JpaStructureProvider persistenceStructureProvider, = + JpaStructureProvider javaStructureProvider, + JpaPlatformUiProvider... platformUiProviders) = { - super(navigatorProvider, platformUiProvider); + super(jpaUiFactory, navigatorProvider, persistenceStructureProvider, jav= aStructureProvider, platformUiProviders); } = @Override Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src= /org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUiF= actory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUiFactory= .java 2010-05-26 10:57:00 UTC (rev 22325) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaPlatformUiFactory= .java 2010-05-26 13:13:34 UTC (rev 22326) @@ -12,8 +12,10 @@ = import org.eclipse.jpt.ui.JpaPlatformUi; import org.eclipse.jpt.ui.JpaPlatformUiFactory; +import org.eclipse.jpt.ui.internal.GenericJpaPlatformUiProvider; import org.eclipse.jpt.ui.internal.platform.generic.GenericNavigatorProvid= er; -import org.jboss.tools.hibernate.jpt.ui.internal.HibernateJpaPlatformUiPro= vider; +import org.eclipse.jpt.ui.internal.structure.JavaResourceModelStructurePro= vider; +import org.eclipse.jpt.ui.internal.structure.PersistenceResourceModelStruc= tureProvider; = /** * @author Dmitry Geraskov @@ -27,8 +29,11 @@ = public JpaPlatformUi buildJpaPlatformUi() { return new HibernateJpaPlatformUi( + new HibernateJpaUiFactory(), new GenericNavigatorProvider(), - HibernateJpaPlatformUiProvider.instance() + JavaResourceModelStructureProvider.instance(), = + PersistenceResourceModelStructureProvider.instance(), + GenericJpaPlatformUiProvider.instance() ); } = Copied: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/o= rg/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.jav= a (from rev 22306, trunk/hibernatetools/plugins/org.jboss.tools.hibernate.j= pt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUi= Factory.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java = (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/j= boss/tools/hibernate/jpt/ui/internal/platform/HibernateJpaUiFactory.java 20= 10-05-26 13:13:34 UTC (rev 22326) @@ -0,0 +1,140 @@ +/*************************************************************************= ****** + * Copyright (c) 2008-2009 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.hibernate.jpt.ui.internal.platform; + +import java.util.ArrayList; +import java.util.List; +import java.util.ListIterator; + +import org.eclipse.jpt.core.context.java.JavaBasicMapping; +import org.eclipse.jpt.core.context.java.JavaEntity; +import org.eclipse.jpt.core.context.java.JavaIdMapping; +import org.eclipse.jpt.core.context.orm.OrmBasicMapping; +import org.eclipse.jpt.core.context.orm.OrmEntity; +import org.eclipse.jpt.core.context.orm.OrmIdMapping; +import org.eclipse.jpt.core.context.persistence.PersistenceUnit; +import org.eclipse.jpt.ui.WidgetFactory; +import org.eclipse.jpt.ui.details.JpaComposite; +import org.eclipse.jpt.ui.details.JpaPageComposite; +import org.eclipse.jpt.ui.internal.BaseJpaUiFactory; +import org.eclipse.jpt.ui.internal.persistence.details.GenericPersistenceU= nitGeneralComposite; +import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitConn= ectionComposite; +import org.eclipse.jpt.ui.internal.persistence.details.PersistenceUnitProp= ertiesComposite; +import org.eclipse.jpt.utility.internal.model.value.TransformationProperty= ValueModel; +import org.eclipse.jpt.utility.model.value.PropertyValueModel; +import org.eclipse.swt.widgets.Composite; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit; +import org.jboss.tools.hibernate.jpt.core.internal.context.basic.BasicHibe= rnateProperties; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEntity; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaIdMapping; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mEntity; +import org.jboss.tools.hibernate.jpt.core.internal.context.orm.HibernateOr= mIdMapping; +import org.jboss.tools.hibernate.jpt.ui.internal.java.details.HibernateJav= aEntityComposite; +import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.Hibernate= BasicMappingComposite; +import org.jboss.tools.hibernate.jpt.ui.internal.mapping.details.Hibernate= IdMappingComposite; +import org.jboss.tools.hibernate.jpt.ui.internal.orm.details.HibernateOrmE= ntityComposite; +import org.jboss.tools.hibernate.jpt.ui.internal.persistence.details.Hiber= natePropertiesComposite; + +/** + * @author Dmitry Geraskov + * = + */ +public class HibernateJpaUiFactory extends BaseJpaUiFactory { + + @SuppressWarnings("unchecked") + public ListIterator createPersistenceUnitComposites( + PropertyValueModel subjectHolder, Composite parent, Wi= dgetFactory widgetFactory) { + + List pages =3D new ArrayList(1); + + pages.add(new GenericPersistenceUnitGeneralComposite(subjectHolder, pare= nt, widgetFactory)); + pages.add(new PersistenceUnitConnectionComposite(subjectHolder, parent, = widgetFactory)); + pages.add(new PersistenceUnitPropertiesComposite(subjectHolder, parent, = widgetFactory)); + = + // ************Hibernate pages*************** + PropertyValueModel hibernatePersistenceUnitHol= der =3D this + .buildHibernatePersistenceUnitHolder(subjectHolder); + + PropertyValueModel basicHolder =3D this.buildB= asicHolder(hibernatePersistenceUnitHolder); + pages.add(new HibernatePropertiesComposite(basicHolder, parent, widgetFa= ctory)); + + return pages.listIterator(); + } + = + @SuppressWarnings("unchecked") + @Override + public JpaComposite createJavaIdMappingComposite( + PropertyValueModel subjectHolder, + Composite parent, + WidgetFactory widgetFactory) { + return new HibernateIdMappingComposite((PropertyValueModel) subjectHolder, parent, widgetFactory); + } + = + @SuppressWarnings("unchecked") + @Override + public JpaComposite createJavaEntityComposite(PropertyValueModel subjectHolder, + Composite parent, WidgetFactory widgetFactory) { + return new HibernateJavaEntityComposite((PropertyValueModel) subjectHolder, parent, widgetFactory); + } + = + @SuppressWarnings("unchecked") + @Override + public JpaComposite createOrmEntityComposite( + PropertyValueModel subjectHolder, Composite parent, + WidgetFactory widgetFactory) { + return new HibernateOrmEntityComposite((PropertyValueModel) subjectHolder, parent, widgetFactory); + } + + private PropertyValueModel buildBasicHolder( + PropertyValueModel subjectHolder) { + return new TransformationPropertyValueModel(subjectHolder) { + @Override + protected BasicHibernateProperties transform_(HibernatePersistenceUnit = value) { + return value.getBasicProperties(); + } + }; + } + + private PropertyValueModel buildHibernatePersis= tenceUnitHolder( + PropertyValueModel subjectHolder) { + return new TransformationPropertyValueModel(subjectHolder) { + @Override + protected HibernatePersistenceUnit transform_(PersistenceUnit value) { + return (HibernatePersistenceUnit) value; + } + }; + } + = + public JpaComposite createJavaBasicMappingComposite( + PropertyValueModel subjectHolder, + Composite parent, + WidgetFactory widgetFactory) { + return new HibernateBasicMappingComposite(subjectHolder, parent, widgetF= actory); + } + = + @Override + public JpaComposite createOrmBasicMappingComposite( + PropertyValueModel subjectHolder, + Composite parent, WidgetFactory widgetFactory) { + return new HibernateBasicMappingComposite(subjectHolder, parent, + widgetFactory); + } + = + @SuppressWarnings("unchecked") + @Override + public JpaComposite createOrmIdMappingComposite( + PropertyValueModel subjectHolder, + Composite parent, + WidgetFactory widgetFactory) { + return new HibernateIdMappingComposite((PropertyValueModel) subjectHolder, parent, widgetFactory); + } + +} \ No newline at end of file --===============3771360735520667228==-- From jbosstools-commits at lists.jboss.org Wed May 26 11:02:29 2010 Content-Type: multipart/mixed; boundary="===============1734923316086280836==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22328 - trunk/build. Date: Wed, 26 May 2010 11:02:29 -0400 Message-ID: <201005261502.o4QF2Td4001529@svn01.web.mwc.hst.phx2.redhat.com> --===============1734923316086280836== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-26 11:02:29 -0400 (Wed, 26 May 2010) New Revision: 22328 Modified: trunk/build/publish.sh Log: add duplicate update site zips called "SNAPSHOT" for reuse by other builds Modified: trunk/build/publish.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/publish.sh 2010-05-26 14:23:14 UTC (rev 22327) +++ trunk/build/publish.sh 2010-05-26 15:02:29 UTC (rev 22328) @@ -1,14 +1,20 @@ #!/bin/bash # Hudson script used to publish Tycho-built p2 update sites = -# define target zip filename +# define target zip filename date and hudson build id marked for clarity a= nd publication ZIPNAME=3D${JOB_NAME}-Update-H${BUILD_NUMBER}-${BUILD_ID}.zip = +# define target zip filename for inclusion in uberbuilder's bucky aggregat= or +SNAPNAME=3D${JOB_NAME}-Update-SNAPSHOT.zip + # copy into workspace for archiving rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME} rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME= }/${ZIPNAME} = +# copy into workspace for access by bucky aggregator +rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME} + # publish to download.jboss.org if [[ $DESTINATION =3D=3D "" ]]; then DESTINATION=3D"tools(a)filemgmt.jbos= s.org:/downloads_htdocs/tools"; fi rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/builds/nig= htly/3.2.helios/ - +rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/builds/nig= htly/3.2.helios/ --===============1734923316086280836==-- From jbosstools-commits at lists.jboss.org Wed May 26 11:26:08 2010 Content-Type: multipart/mixed; boundary="===============1719295429415749347==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22329 - in trunk/download.jboss.org/jbosstools/requirements: helios and 1 other directory. Date: Wed, 26 May 2010 11:26:08 -0400 Message-ID: <201005261526.o4QFQ8rI010480@svn01.web.mwc.hst.phx2.redhat.com> --===============1719295429415749347== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-26 11:26:08 -0400 (Wed, 26 May 2010) New Revision: 22329 Added: trunk/download.jboss.org/jbosstools/requirements/index.html Modified: trunk/download.jboss.org/jbosstools/requirements/helios/index.html Log: update index.html files Modified: trunk/download.jboss.org/jbosstools/requirements/helios/index.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/download.jboss.org/jbosstools/requirements/helios/index.html 2010= -05-26 15:02:29 UTC (rev 22328) +++ trunk/download.jboss.org/jbosstools/requirements/helios/index.html 2010= -05-26 15:26:08 UTC (rev 22329) @@ -2,7 +2,7 @@ JBoss Tools Build Requirements - Helios (Eclipse 3.6 / Web Tools 3.= 2) Added: trunk/download.jboss.org/jbosstools/requirements/index.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/download.jboss.org/jbosstools/requirements/index.html = (rev 0) +++ trunk/download.jboss.org/jbosstools/requirements/index.html 2010-05-26 = 15:26:08 UTC (rev 22329) @@ -0,0 +1,94 @@ + + +JBoss Tools Build Requirements - Helios (Eclipse 3.6 / Web Tools 3.= 2) + + + + + + + + + + + + + + +
      
       +

    JBoss Tools Build Requirements - Helios (Eclipse 3.6= / Web Tools 3.2)

    + + + + + + + + + + + +
    + + + +
    + +
    +
    +

    Looking to download JBoss Tools? See JBoss Tools + Downloads. See also Installation + methods.

    +
    +
    + --===============1719295429415749347==-- From jbosstools-commits at lists.jboss.org Wed May 26 11:56:48 2010 Content-Type: multipart/mixed; boundary="===============7928233601881570948==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22330 - in trunk/jbpm/docs/reference/en-US: images/the_views and 1 other directory. Date: Wed, 26 May 2010 11:56:48 -0400 Message-ID: <201005261556.o4QFumkG014171@svn01.web.mwc.hst.phx2.redhat.com> --===============7928233601881570948== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-26 11:56:47 -0400 (Wed, 26 May 2010) New Revision: 22330 Added: trunk/jbpm/docs/reference/en-US/images/the_views/jbpm_1.png trunk/jbpm/docs/reference/en-US/images/the_views/jbpm_2.png trunk/jbpm/docs/reference/en-US/images/the_views/jbpm_3.png trunk/jbpm/docs/reference/en-US/tasks.xml Modified: trunk/jbpm/docs/reference/en-US/master.xml trunk/jbpm/docs/reference/en-US/the_views.xml Log:

    https://jira.jboss.org/browse/TOOLSDOC-23 - Restructured jbpm guide.Adde= d reference chapter with wizards description to the guide.

    Added: trunk/jbpm/docs/reference/en-US/images/the_views/jbpm_1.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jbpm/docs/reference/en-US/images/the_views/jbpm_= 1.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/reference/en-US/images/the_views/jbpm_2.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jbpm/docs/reference/en-US/images/the_views/jbpm_= 2.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/jbpm/docs/reference/en-US/images/the_views/jbpm_3.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jbpm/docs/reference/en-US/images/the_views/jbpm_= 3.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/jbpm/docs/reference/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/master.xml 2010-05-26 15:26:08 UTC (rev= 22329) +++ trunk/jbpm/docs/reference/en-US/master.xml 2010-05-26 15:56:47 UTC (rev= 22330) @@ -10,7 +10,7 @@ - + @@ -81,11 +81,15 @@ = &introduction; = - &jboss_jbpm_runtime_installation; = - &guided_tour_jboss_jbpmgpd; - &the_views; &Test_Drive_Proc; + = + + &tasks; + &the_views; = + = + = Added: trunk/jbpm/docs/reference/en-US/tasks.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/tasks.xml (rev = 0) +++ trunk/jbpm/docs/reference/en-US/tasks.xml 2010-05-26 15:56:47 UTC (rev = 22330) @@ -0,0 +1,671 @@ + + + + + + jBPM + designer + process + JBoss Developer Studio + jBPM runtime + JBoss + Process + Definition + + + + Tasks +
    + + JBoss jBPM Runtime Installation + The main purpose of this chapter is to let you know how to launc= h the JBoss + jBPM (business process management). + The jBPM plugin (jBPM Designer) is already included in the JBoss Tools. + To make it work, you should only download the jBPM runtime (jbpm-jpdl-3.2.3 currently) and specify the directory = where you extracted the runtime + either when you create a jBPM project or by using the jBPM prefere= nce pages. + = + + Note: + Try to avoid using spaces in the names of installation folde= rs. It can provoke problems in + some situations with Sun-based VMs. + + = + Navigate to + Window > Preferences > JBoss jBPM > Runtime Loc= ations. + Here you can add, edit and remove JBoss jBPM installation = locations. Click + Add + button. In the dialog that appeared enter a name for a new= ly added jBPM runtime and + point to the correct location of this package on your harddrive. C= lick + OK + then click + OK + again. + = +
    + Adding jBPM Location + + + + + +
    + Now, when you have a runtime installed, we are going to demonstr= ate some powerful features of + the jBPM. +
    +
    + + + A Guided Tour of JBoss jBPM GPD + In this chapter we suggest a step-by-step walk-through of cr= eating and configuring your + own simple process. Let's try to organize a new jBPM project.<= /para> + A wizard for creating a jBPM project is included in the GPD = plugin. We have opted to + create a project based on a template already containing a numb= er of advanced artifacts that + we will ignore for this section. In the future we will elabora= te this wizard and offer the + possibility to create an empty jBPM project as well as project= s based on templates taken + from the jBPM tutorial. +
    + + Creating a jBPM Project + This section will show you how to use the Creation wizar= d for creating a new jBPM + project with already included source folders. + At first you should select + File >New Project... + and then + JBoss jBPM > Process Project + in the New Project dialog: +
    + New Project Dialog + + + + + +
    + Clicking + Next + brings us to the wizard page where it's neces= sary to specify the + name and location for the project. We choose, for example,= + HellojBPM + as the name and accept the default location. <= /para> +
    + Process Name and Location + + + + + +
    + Thus, our project will be created in the workspace root = directory by default. If you + want to change the directory for your future project, dese= lect + Use default location + and click + Browse... + button to set needed location or simply type i= t. + On the next screen you'll be prompted to select the= core jBPM location that + we have defined in the previous chapter. +
    + Core jBPM Location Specifying + + + + + +
    + Clicking on + Finish + results in the project being generated. The wizard= creates four source + folders: one for the processes ( + src/main/jpdl + ), one for the java sources ( + src/main/java + ), one for the unit tests ( + src/test/java + ) and one for the resources such as the jbpm.pr= operties and the + hibernate.properties files ( + src/main/config + ). In addition a classpath container with all t= he core jBPM libraries is + added to the project +
    + Layout of the Process Project + + + + + +
    + Looking inside the different source folders will reveal = a number of other artifacts + that were generated, but we will leave these untouched for= the moment. Instead, we will + look at another wizard that enables us to create an empty = process definition. +
    +
    + + Creating an Empty Process Definition + Now when the project is set up, we can use a Creation wi= zard to create an empty + process definition. Bring up the + New + wizard by clicking the + File > New > Other... + menu item. The wizard opens on the + Select Wizard + page. +
    + The Select Wizard Page + + + + + +
    + Selecting the + JBoss jBPM + category, then the + Process Definition + item and clicking on the + Next + button brings us to the + Create Process Definition + page. +
    + The Create New Process Defining Page + + + + + +
    + We choose + hello + as the name of the process archive file. Click on = the + Finish + button to end the wizard and open the process defi= nition editor. +
    + The Process Definition Editor + + + + + +
    + = + = + You can see in the Package Explorer that creating a proc= ess definition involves + creating a folder with the name of the process definition = and populating this folder + with two .xml files : + gpd.xml + , + processdefinition.xml = and a .jpg file: + processimage.jpg.<= /para> + The + gpd.xml + contains the graphical information used by the pro= cess definition editor. + The + processdefinition.xml + file contains the actual process definition in= fo. + The graphical view of the process is automatically saved i= n + processimage.jpg = + file. + At present, the GPD assumes that these three files are sib= lings. More + sophisticated configuration will be supported later. + = +
    + + A Minimal Process Definition + Now we are ready to create a very simple process def= inition consisting of a begin + state, an intermediate state and an end state. + To make the configuration of actions much easier it&= apos;s better to use the + >"jBPM jPDL 3" perspective. It provides the tabbed Properties Editor which allows to co= nfigure + all the relevant properties of the current selected it= em. + = +
    + + Adding the Nodes + At first select respectively + Start, + + State + and + End + on the tools palette and click on the = canvas to add these nodes to + the process definition. The result should look sim= ilar to this: +
    + A Simple Process With Three Nodes + + + + + +
    +
    +
    + + Adding Transitions + Then, we will connect the nodes with transitions= . To do that select the + Transition + tool in the tools palette and click on the= + Start + node, then move to the + State + node and click again to see the transition= being drawn. Perform the + same steps to create a transition from the + State + node to the + End + node. The result will look like: +
    + A Simple Process With Transitions + + + + + +
    + Now, when you've got background knowledge o= f simple project creation, + let's move to more advanced tools. +
    +
    +
    +
    +
    + + + Actions : The JBoss jBPM Integration Mechanism + = + In this chapter we will show how to do software integration= with JBoss + jBPM. The standard mechanism to implement this is t= o wrap the functionality you + want to integrate in a class that implements the + ActionHandler + interface. In order to demonstrate it let's specif= y Hello World action for our + process. + = +
    + Creating a Hello World Action + = + Each Hello World process should integrate one or more He= llo World actions, so this is + what we will be doing. We can integrate custom code at dif= ferent points in the process + definition. To do this we have to specify an action handle= r, represented by an + implementation of the + ActionHandler + interface, and attach this piece of code to a = particular event. These events + are amongst others, going over a transition, leaving or en= tering nodes, after and before + signalling. + = + To make things a little bit more concrete, let's c= reate a new class called + HelloActionHandler. + For that firstly we'll create a new package <= emphasis> + com.jbay.action + in the + src/java/main + folder of our project. Then, we should call New Cl= ass Creation wizard as + usual by right-clicking and navigating + New > Class. + + = +
    + Creating HelloActionHendler Class + = + + + + + +
    + = + Notice that two first gaps have been filled automaticall= y. Here, instead of + Package + option + Enclose type + option can be selected where a type in which to en= close a new class should + be specified. + = + In our case, we leave everything as it is, just type + HelloActionHandler + as a name of new class and add + org.jbpm.graph.ActionHendler + interface as it's shown in the picture above.= + = + Thus, our + HelloActionHandler + implements the + ActionHandler + interface including the + execute + method as shown in the next figure. Here, we add a= variable named + greeting + to the collection of process variables and put = a message in it : + "Hello from ActionHandler".= + = +
    + A Simple Hello Action + = + + + + + +
    + = + Now, as we have + HelloActionHandler + class defined, let's explore how we can handl= e it. +
    + = +
    + Integrating the Hello World Action + = + The main purpose of this chapter is to provide you with = the steps associating our + Hello World action with a particular event and test the co= rrectness of our actions as + well. + = + As good Testcity citizens we will first create a Unit T= est that proves the behaviour + we want to achieve by adding the + ActionHandler + to the process. So we implement another test.<= /para> + = + At first, let's return to the + code we already saw in the pr= evious chapter and add new test method + testActionHendler to i= t. + = +
    + Create the Hello Action Test + = + + + + + +
    + = + We assert + that no variable called + greeting + exist. Then we give the process a signal to mo= ve it to the auction state. We + want to associate the execution of the action with the eve= nt of going over the + transition from the start state to the auction state. So a= fter the signal, the process + should be in the auction state as in the previous scenario= . But moreover, the + greeting + variable should exist and contain the string <= emphasis>"Hello from + ActionHandler". That's what we as= sert in the last lines of the test + method. + = + = + = + Running the tests now results in a failure. The point i= s that we did not associate + the action with any particular event in the process defini= tion, so the process variable + did not get set. + = +
    + Test Results Before Integration + = + + + + + +
    + = + Let's do something about it and add an action to t= he first transition of our + sample process. To do this you can use the Actions tab in = the Properties Editor that is + under the graphical canvas. Bring up the popup menu of the= action element container and + chose New Action as it's shown on the figure below. The ot= her way to add an action + to the transition is simply to use the dropdown menu that = is available under the action + icon in the right upper corner of the Properties View. + = +
    + Adding an Action to a Transition + = + + + + + +
    + = + After adding the action a tabbed view with three pages w= ill appear. + = +
    + Configuration Dialog for an Action + = + + + + + +
    + = + The first of these three pages allows you to give the Ac= tion a name. The last page + contains some advanced attributes such as whether the Acti= on is asynchronous. The + Details page is the most important. It allows to choose an= d configure the actual action + handler implementation. + = +
    + The Details page of an Action Configuration Dialog<= /title> + = + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/The_JBoss_jBPM_Int_Me= ch/jboss_jbpm_int_mech_7.png" scale=3D"80"/> + </imageobject> + </mediaobject> + </figure> + = + = + <para>Clicking on the <emphasis> + <property>Search...</property> + </emphasis> button brings us to a Choose Class dialog.</para> + = + = + <figure> + <title>The Choose Action Handler Dialog + = + + + + + +
    + = + = + We choose our previously created 'HelloActionHandl= er' class and + push the OK button. After the selecti= on of the action handler for + the action, we can run the test and observe it gives us a = green light. + = +
    + Test Results + = + + + + + +
    + = + There we are. The above objective has been achieved. +
    + = +
    + Integration Points + = + The different integration points in a process definitio= n are thoroughly documented in + the JBoss= jBPM User Guide. Instance nodes can contain many action + elements. Each of these will appear in the Action element = list of the Actions tab. But + each Action also has a properties view of itself. You can = navigate to this view by + selecting the added Action in the outline view. + = +
    +
    +
    + + = + Quick Howto Guide + = + This chapter contains additional information related to the = JBoss + jBPM. + = +
    + Change the Default Core jBPM Installation + = + You can change the default jBPM in= stallation by means of the + Eclipse preference mechanism. Open the Preferences dialog = by selecting + Window > Preferences + and select the + JBoss jBPM > Runtime Location + category. Using this page you can add multiple= jBPM + installation locations and change the default one. The def= ault installation is used for + the classpath settings when creating a new Process Project= . Changing the preferences has + no influence on already created projects. Getting rid of a= jBPM + installation that's being referenced by a project how= ever will cause the + classpath to contain errors. + = + = +
    + The jBPM Preferences Page + = + + + + + +
    +
    + = +
    + Configuring Task Nodes + = + Here, we'll examine how you can configure the Task = nodes in jBPM jPDL GPD. + = + You can add Tasks to Task nodes and then configure them= in a similar manner as the + Action configuration mechanism. Let's consider the pr= ocess definition similar + to the previous one that contains three nodes: Start state= , Task node and End state. The + Properties view for selected Task nod= e includes several tabs. + = +
    + The Properties View of the selected Task Node</titl= e> + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/Quick_Howto_Guide/qui= ck_howto_guide_2.png" + scale=3D"75"/> + </imageobject> + </mediaobject> + </figure> + = + <para>We should choose the Task tab and then bring up the cont= ext menu or click the button + in the top right corner of the view to add a Task to our T= ask node.</para> + = + <figure> + <title>Adding a Task to the Task Node + + + + + +
    + = + Every added Task has its own configuration possibilities= . You can access them through + the Properties view as well. + = +
    + The Task properties + + + + + +
    + = + The General page is a place where y= ou can specify the name of a + Task and its description. For instance, let it be + approve oder + with appropriate description that you can see = in the figure below. + = +
    + The Task General Page + + + + + +
    + = + Now, look at Details page. First, y= ou should specify the due date + that is a mandatory property for the Task. The due date is= the date on which the task + should be accomplished. Here you can also set a Task prior= ity as well as signalling, + notifying or blocking. The + Blocking + attribute indicates that the process will not = be able to continue if this + task is still unaccomplished. The + Generate Form... + button is for creating a simple task form that= can be rendered by the jBPM + console. + = +
    + The Task Details Page + + + + + +
    + = + For our example, we specify the due date as 2 business d= ays, choose the high priority + and also check the + Signalling + and + Notify + attributes. It means that the Task should be a= ccomplished in 2 business days + and the assignee will be notified by email when the task i= s assigned. To specify how the + Task should be assigned switch on to the Assignm= ent page. + = +
    + The Task Assignment Page + + + + + +
    + = + On the Reminder page you can specif= y whether the assignee will be reminded of the task + that awaits him. + = +
    + The Task Reminder Page + + + + + +
    + = + In our case, the assignee will be reminded by email afte= r two business hours and + continue to get reminding every business hour after that.<= /para> + In the next figure you can see our configuring generated= into XML. +
    + The Task Reminder Page + + + + + +
    + We hope, our guide will help you to get started with the= jPDL process language and jBPM + workflow on the whole. Besides, for additional information= you are welcome on JBoss forum. +
    +
    + = +     \ No newline at end of file Modified: trunk/jbpm/docs/reference/en-US/the_views.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/the_views.xml 2010-05-26 15:26:08 UTC (= rev 22329) +++ trunk/jbpm/docs/reference/en-US/the_views.xml 2010-05-26 15:56:47 UTC (= rev 22330) @@ -1,14 +1,151 @@ - - + jBPM + Reference +
    + Wizards +
    + Process Project Wizard + This wizard helps to create new jBPM project.It is availa= ble with clicking + File->New->Other->jBPM 3 Project in th= e menu bar. +
    + New Process Project Wizard + + + + + +
    + It consists of several pages: + + On the first page you can adjust the name o= f the project and the directory where it will be created. + If "Use default" option is c= hecked the output directory will be the workspace, + othervise the user should specify it by himself usi= ng Browse button. +
    + New Process Project Wizard + + + + + +
    +     + On the second page you should point the loc= ation of your jbpm runtime. + The last page is only available for unablin= g/disabling = + Generate simple process definition,action han= dling and Unit test. +     + = +
    +
    + New JBPM Action Wizard + This wizard is available by clicking = + File->New->Other->jBPM 3 Action Handler. + = +
    + New JBPM Action Wizard + + + + + +
    + It includes the next options to adjust: + = + + New JBPM Action Wizard. Options. = + + + + + = + + + Option = + Description + Default + + + + = + + Source folder + The path to the source folder relative = to the selected project + The source folder of the project select= ed in the Project field + = + = + + Package + Enter a package to contain an Action Ha= ndler. + Either type a valid package name or click = + Browse + to select a package via the dialog box. + <blank> + = + = + + Enclosing type + Select the enclosing type of your jBPM = action using + Browse + button. + <blank> + + + Modifiers + Select the modifiers that will be added= to the generated class. + Public + = + + Name + Type a name for a new Action Handler + <blank> + = + = + + Superclass + Type or click Brows= e + to select a superclass for an Action Handl= er + org.jbpm.graph.def.ActionHandler + = + = + + Interface + Type or click Add + to select an interface/interfaces for an A= ction Handler + org.jbpm.graph.def.ActionHandler + = = + + Which method stubs you would like to cr= eate? + Select the stubs that you would like to= be created automatically. + + Constructors from supercla= ss + Inherited abstract methods= + + + = + = + + Do you want to add comments? + Select Generate comments check box if you want comment mask = + to be generated before the class definiti= on. + + <blank> + = + + +
    +
    + = + = +
    + = +
    + The views - Here, it will be explained how to work with views and editors pr= ovided by JBDS. The views are used for representation and navigation the resourc= es you are working on at the moment. One of the advantages of all the views is that all mod= ifications made in the @@ -238,4 +375,5 @@ perspective, let's pass on to the project testi= ng.
+
\ No newline at end of file --===============7928233601881570948==-- From jbosstools-commits at lists.jboss.org Wed May 26 12:59:08 2010 Content-Type: multipart/mixed; boundary="===============8742364219618529721==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22331 - trunk/download.jboss.org/jbosstools/requirements/helios. Date: Wed, 26 May 2010 12:59:08 -0400 Message-ID: <201005261659.o4QGx8Jh027773@svn01.web.mwc.hst.phx2.redhat.com> --===============8742364219618529721== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-26 12:59:07 -0400 (Wed, 26 May 2010) New Revision: 22331 Modified: trunk/download.jboss.org/jbosstools/requirements/helios/README.txt Log: add bucky to list Modified: trunk/download.jboss.org/jbosstools/requirements/helios/README.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/download.jboss.org/jbosstools/requirements/helios/README.txt 2010= -05-26 15:56:47 UTC (rev 22330) +++ trunk/download.jboss.org/jbosstools/requirements/helios/README.txt 2010= -05-26 16:59:07 UTC (rev 22331) @@ -1,4 +1,4 @@ -Total of 20 req'd tgzs/zips/jars. +Total of 21 req'd tgzs/zips/jars. = BIRT 2.6 -> http://www.eclipse.org/downloads/download.php?file=3D/birt/dow= nloads/build_list.php = -> @@ -43,17 +43,16 @@ = SWTBot 2.0 e36 -> http://www.eclipse.org/swtbot/downloads.php -> -wget "http://www.eclipse.org/downloads/download.php?r=3D1&file=3D/technolo= gy/swtbot/helios/dev-build/org.eclipse.swtbot.eclipse-2.0.0.568-dev-e36.zip= &r=3D1" \ - "http://www.eclipse.org/downloads/download.php?r=3D1&file=3D/technology/s= wtbot/helios/dev-build/org.eclipse.swtbot.eclipse.test.junit4-2.0.0.568-dev= -e36.zip&r=3D1" \ -"http://www.eclipse.org/downloads/download.php?r=3D1&file=3D/technology/sw= tbot/helios/dev-build/org.eclipse.swtbot.eclipse.gef-2.0.0.568-dev-e36.zip&= r=3D1" +wget "http://www.eclipse.org/downloads/download.php?r=3D1&file=3D/technolo= gy/swtbot/helios/dev-build/org.eclipse.swtbot.eclipse-2.0.0.568-dev-e36.zip= " \ + "http://www.eclipse.org/downloads/download.php?r=3D1&file=3D/technology/s= wtbot/helios/dev-build/org.eclipse.swtbot.eclipse.test.junit4-2.0.0.568-dev= -e36.zip" \ +"http://www.eclipse.org/downloads/download.php?r=3D1&file=3D/technology/sw= tbot/helios/dev-build/org.eclipse.swtbot.eclipse.gef-2.0.0.568-dev-e36.zip"= \ +"http://www.eclipse.org/downloads/download.php?r=3D1&file=3D/technology/sw= tbot/helios/dev-build/swtbot-update-site-2.0.0.568-dev-e35.zip" = ------------ = -3 Custom built zips: +5 custom built zips: = -Basebuilder: org.eclipse.releng.basebuilder_R36_RC1.zip - latest tag: -http://wiki.eclipse.org/Platform-releng-basebuilder#Current_build_tag_for_= 3.6_stream_builds_.28Helios.29 +Basebuilder from latest tag (http://wiki.eclipse.org/Platform-releng-baseb= uilder#Current_build_tag_for_3.6_stream_builds_.28Helios.29) cvs -d :pserver:anonymous(a)dev.eclipse.org:/cvsroot/eclipse -q co -d org.eclipse.releng.basebuilder_R36_RC1 -r R36_RC1 org.eclipse.releng.basebuilder @@ -61,10 +60,15 @@ ../org.eclipse.releng.basebuilder_R36_RC1.zip ./* = m2eclipse-0.10.0.20100209-0800.zip - see m2eclipse/build.xml + run m2eclipse/build.xml = Subvsve079.I201005121900_SVNconn222.I201005121900_SVNKit133.6648_JNA323_EC= F310.v201005082345-Update.zip - see svn/build.xml - http://divby0.blogspot.com/2009/07/my-love-hate-with-svn-part-6.html + run svn/build.xml + http://divby0.blogspot.com/2010/05/my-love-hate-with-svn-part-8.html http://wiki.eclipse.org/Equinox/p2/Ant_Tasks/Partial_Mirroring/Example = +b3 Aggregator Engine + ssh nickb(a)build.eclipse.org "cd /home/data/httpd/download.eclipse.org/m= odeling/emft/b3/updates-3.6; zip -9r ~/b3.aggregator-repo-0.1.0.r01001_e36.= zip * -x \*.gz" + ssh nickb(a)build.eclipse.org "cd /home/data/httpd/download.eclipse.org/t= ools/buckminster/updates-3.6; zip -9r ~/buckminster-repo-1.3.0.r11439_e36.z= ip * -x \*.gz" + scp nickb(a)build.eclipse.org:~/b3.agg*.zip . + scp nickb(a)build.eclipse.org:~/buckminster*.zip . --===============8742364219618529721==-- From jbosstools-commits at lists.jboss.org Wed May 26 12:59:57 2010 Content-Type: multipart/mixed; boundary="===============4859615728740755902==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22332 - trunk/download.jboss.org/jbosstools/requirements/helios. Date: Wed, 26 May 2010 12:59:57 -0400 Message-ID: <201005261659.o4QGxvtC027785@svn01.web.mwc.hst.phx2.redhat.com> --===============4859615728740755902== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-26 12:59:57 -0400 (Wed, 26 May 2010) New Revision: 22332 Modified: trunk/download.jboss.org/jbosstools/requirements/helios/ Log: svn:ignore Property changes on: trunk/download.jboss.org/jbosstools/requirements/helios ___________________________________________________________________ Name: svn:ignore + *.zip *.gz *.jar --===============4859615728740755902==-- From jbosstools-commits at lists.jboss.org Wed May 26 13:05:25 2010 Content-Type: multipart/mixed; boundary="===============7656895756772705747==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22333 - trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test. Date: Wed, 26 May 2010 13:05:25 -0400 Message-ID: <201005261705.o4QH5P9x002326@svn01.web.mwc.hst.phx2.redhat.com> --===============7656895756772705747== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-26 13:05:24 -0400 (Wed, 26 May 2010) New Revision: 22333 Removed: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/CDITextExtTestSuite.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/HyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/InjectedPointHyperlinkDetectorTest.java Log: https://jira.jboss.org/browse/JBIDE-6340 Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/CDITextExtTestSuite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/CDITextExtTestSuite.java 2010-05-26 16:59:57 UTC (rev 2233= 2) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/CDITextExtTestSuite.java 2010-05-26 17:05:24 UTC (rev 2233= 3) @@ -19,8 +19,6 @@ public static Test suite() { TestSuite suite =3D new TestSuite("CDI Text Ext Tests"); suite.addTest(InjectedPointHyperlinkDetectorTest.suite()); - suite.addTest(ProducerDisposerHyperlinkDetectorTest.suite()); - suite.addTest(InjectedPointInProducerMethodHyperlinkDetectorTest.suite()= ); return suite; } } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/HyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/HyperlinkDetectorTest.java 2010-05-26 16:59:57 UTC (rev 22= 332) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/HyperlinkDetectorTest.java 2010-05-26 17:05:24 UTC (rev 22= 333) @@ -4,15 +4,22 @@ = import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IAdaptable; +import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; import org.eclipse.jdt.internal.ui.text.JavaWordFinder; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.Region; +import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector; +import org.eclipse.jface.text.hyperlink.IHyperlink; +import org.eclipse.jface.text.source.ISourceViewer; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; +import org.eclipse.ui.part.FileEditorInput; +import org.eclipse.ui.texteditor.DocumentProviderRegistry; +import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.wst.sse.core.StructuredModelManager; import org.eclipse.wst.sse.core.internal.provisional.IModelManager; @@ -21,9 +28,74 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.AxisUtil; = -import junit.framework.TestCase; +public class HyperlinkDetectorTest extends TCKTest { + protected void checkRegions(String fileName, ArrayList regionList= , AbstractHyperlinkDetector elPartitioner) throws Exception { + IFile javaFile =3D tckProject.getFile(fileName); = -public class HyperlinkDetectorTest extends TCKTest { + TCKTest.assertTrue("The file \"" + fileName + "\" is not found", (javaFi= le !=3D null)); + TCKTest.assertTrue("The file \"" + fileName + "\" is not found", (javaFi= le.exists())); + + FileEditorInput editorInput =3D new FileEditorInput(javaFile); + + IDocumentProvider documentProvider =3D null; + try { + documentProvider =3D DocumentProviderRegistry.getDefault().getDocumentP= rovider(editorInput); + } catch (Exception x) { + x.printStackTrace(); + fail("An exception caught: " + x.getMessage()); + } + + assertNotNull("The document provider for the file \"" + fileName + "\" i= s not loaded", documentProvider); + + try { + documentProvider.connect(editorInput); + } catch (Exception x) { + x.printStackTrace(); + fail("The document provider is not able to be initialized with the edit= or input\nAn exception caught: "+x.getMessage()); + } + + IDocument document =3D documentProvider.getDocument(editorInput); + + assertNotNull("The document for the file \"" + fileName + "\" is not loa= ded", document); + + int expected =3D 0; + for(Region region : regionList) + expected +=3D region.getLength()+1; + = + IEditorPart part =3D openFileInEditor(javaFile); + ISourceViewer viewer =3D null; + if(part instanceof JavaEditor){ + viewer =3D ((JavaEditor)part).getViewer(); + } + + elPartitioner.setContext(new TestContext((ITextEditor)part)); + + int counter =3D 0; + for (int i =3D 0; i < document.getLength(); i++) { + TestData testData =3D new TestData(document, i); + IHyperlink[] links =3D elPartitioner.detectHyperlinks(viewer, testData.= getHyperlinkRegion(), true); + + boolean recognized =3D links !=3D null; + + if (recognized) { + counter++; + if(!findOffsetInRegions(i, regionList)){ + fail("Wrong detection for offset - "+i); + } + } else { + for(Region region : regionList){ + if(i >=3D region.getOffset() && i <=3D region.getOffset()+region.getL= ength()) + fail("Wrong detection for region - "+region.getOffset()+" : "+region= .getLength()+" region - "+i); + } + } + } + + assertEquals("Wrong recognized region count: ", expected, counter); + + documentProvider.disconnect(editorInput); + } + + = protected boolean findOffsetInRegions(int offset, ArrayList regio= nList){ for(Region region : regionList){ if(offset >=3D region.getOffset() && offset <=3D region.getOffset()+reg= ion.getLength()) Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-26 16:59:5= 7 UTC (rev 22332) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-26 17:05:2= 4 UTC (rev 22333) @@ -2,99 +2,46 @@ = import java.util.ArrayList; = +import org.eclipse.jface.text.Region; +import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetect= or; +import org.jboss.tools.cdi.text.ext.hyperlink.ProducerDisposerHyperlinkDet= ector; + import junit.framework.Test; import junit.framework.TestSuite; = -import org.eclipse.core.resources.IFile; -import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.hyperlink.IHyperlink; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.ui.texteditor.DocumentProviderRegistry; -import org.eclipse.ui.texteditor.IDocumentProvider; -import org.eclipse.ui.texteditor.ITextEditor; -import org.jboss.tools.cdi.core.test.tck.TCKTest; -import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetect= or; = public class InjectedPointHyperlinkDetectorTest extends HyperlinkDetectorT= est { - private static final String FILE_NAME =3D "JavaSource/org/jboss/jsr299/tc= k/tests/lookup/injectionpoint/LoggerConsumer.java"; = public static Test suite() { return new TestSuite(InjectedPointHyperlinkDetectorTest.class); } = public void testInjectedPointHyperlinkDetector() throws Exception { - IFile javaFile =3D tckProject.getFile(FILE_NAME); - - TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile !=3D null)); - TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile.exists())); - - FileEditorInput editorInput =3D new FileEditorInput(javaFile); - - IDocumentProvider documentProvider =3D null; - try { - documentProvider =3D DocumentProviderRegistry.getDefault().getDocumentP= rovider(editorInput); - } catch (Exception x) { - x.printStackTrace(); - fail("An exception caught: " + x.getMessage()); - } - - assertNotNull("The document provider for the file \"" + FILE_NAME + "\" = is not loaded", documentProvider); - - try { - documentProvider.connect(editorInput); - } catch (Exception x) { - x.printStackTrace(); - fail("The document provider is not able to be initialized with the edit= or input\nAn exception caught: "+x.getMessage()); - } - - IDocument document =3D documentProvider.getDocument(editorInput); - - assertNotNull("The document for the file \"" + FILE_NAME + "\" is not lo= aded", document); - - InjectedPointHyperlinkDetector elPartitioner =3D new InjectedPointHyperl= inkDetector(); - ArrayList regionList =3D new ArrayList(); regionList.add(new Region(115, 6)); // Inject regionList.add(new Region(140, 6)); // logger regionList.add(new Region(196, 6)); // logger regionList.add(new Region(250, 6)); // logger + = + checkRegions("JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoin= t/LoggerConsumer.java", regionList, new InjectedPointHyperlinkDetector()); + } = - IEditorPart part =3D openFileInEditor(javaFile); - ISourceViewer viewer =3D null; - if(part instanceof JavaEditor){ - viewer =3D ((JavaEditor)part).getViewer(); - } + public void testInjectedProducerMethodParametersHyperlinkDetector() throw= s Exception { + ArrayList regionList =3D new ArrayList(); + regionList.add(new Region(571, 5)); // order + regionList.add(new Region(659, 3)); = + regionList.add(new Region(695, 3)); + = + checkRegions("JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/CustomPro= ducerImpl.java", regionList, new InjectedPointHyperlinkDetector()); + } + = + public void testProducerDisposerHyperlinkDetector() throws Exception { + ArrayList regionList =3D new ArrayList(); + regionList.add(new Region(1199, 8)); // @Produces + regionList.add(new Region(1222, 7)); // producer + regionList.add(new Region(1291, 7)); // disposer = - elPartitioner.setContext(new TestContext((ITextEditor)part)); - - int counter =3D 0; - for (int i =3D 0; i < document.getLength(); i++) { - TestData testData =3D new TestData(document, i); - IHyperlink[] links =3D elPartitioner.detectHyperlinks(viewer, testData.= getHyperlinkRegion(), true); - - boolean recognized =3D links !=3D null; - - if (recognized) { - counter++; - if(!findOffsetInRegions(i, regionList)){ - fail("Wrong detection for offset - "+i); - } - } else { - for(Region region : regionList){ - if(i >=3D region.getOffset() && i <=3D region.getOffset()+region.getL= ength()) - fail("Wrong detection for region - "+region.getOffset()+" : "+region= .getLength()+" region - "+i); - } - } - } - - assertEquals("Wrong recognized region count: ", 28, counter); - - documentProvider.disconnect(editorInput); + checkRegions("JavaSource/org/jboss/jsr299/tck/tests/decorators/invocatio= n/producer/method/ProducerImpl.java", regionList, new ProducerDisposerHyper= linkDetector()); } = - } \ No newline at end of file Deleted: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/to= ols/cdi/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java 20= 10-05-26 16:59:57 UTC (rev 22332) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointInProducerMethodHyperlinkDetectorTest.java 20= 10-05-26 17:05:24 UTC (rev 22333) @@ -1,98 +0,0 @@ -package org.jboss.tools.cdi.text.ext.test; - -import java.util.ArrayList; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IFile; -import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.hyperlink.IHyperlink; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.ui.texteditor.DocumentProviderRegistry; -import org.eclipse.ui.texteditor.IDocumentProvider; -import org.eclipse.ui.texteditor.ITextEditor; -import org.jboss.tools.cdi.core.test.tck.TCKTest; -import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetect= or; - -public class InjectedPointInProducerMethodHyperlinkDetectorTest extends Hy= perlinkDetectorTest{ - private static final String FILE_NAME =3D "JavaSource/org/jboss/jsr299/tc= k/tests/jbt/openon/CustomProducerImpl.java"; - - public static Test suite() { - return new TestSuite(InjectedPointInProducerMethodHyperlinkDetectorTest.= class); - } - - public void testProducerDisposerHyperlinkDetector() throws Exception { - IFile javaFile =3D tckProject.getFile(FILE_NAME); - - TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile !=3D null)); - TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile.exists())); - - FileEditorInput editorInput =3D new FileEditorInput(javaFile); - - IDocumentProvider documentProvider =3D null; - try { - documentProvider =3D DocumentProviderRegistry.getDefault().getDocumentP= rovider(editorInput); - } catch (Exception x) { - x.printStackTrace(); - fail("An exception caught: " + x.getMessage()); - } - - assertNotNull("The document provider for the file \"" + FILE_NAME + "\" = is not loaded", documentProvider); - - try { - documentProvider.connect(editorInput); - } catch (Exception x) { - x.printStackTrace(); - fail("The document provider is not able to be initialized with the edit= or input\nAn exception caught: "+x.getMessage()); - } - - IDocument document =3D documentProvider.getDocument(editorInput); - - assertNotNull("The document for the file \"" + FILE_NAME + "\" is not lo= aded", document); - - InjectedPointHyperlinkDetector elPartitioner =3D new InjectedPointHyperl= inkDetector(); - - ArrayList regionList =3D new ArrayList(); - regionList.add(new Region(571, 5)); // order - regionList.add(new Region(659, 3)); = - regionList.add(new Region(695, 3)); = - - IEditorPart part =3D openFileInEditor(javaFile); - ISourceViewer viewer =3D null; - if(part instanceof JavaEditor){ - viewer =3D ((JavaEditor)part).getViewer(); - } - - elPartitioner.setContext(new TestContext((ITextEditor)part)); - - int counter =3D 0; - for (int i =3D 0; i < document.getLength(); i++) { - TestData testData =3D new TestData(document, i); - IHyperlink[] links =3D elPartitioner.detectHyperlinks(viewer, testData.= getHyperlinkRegion(), true); - - boolean recognized =3D links !=3D null; - - if (recognized) { - counter++; - if(!findOffsetInRegions(i, regionList)){ - fail("Wrong detection for offset - "+i); - } - } else { - for(Region region : regionList){ - if(i >=3D region.getOffset() && i <=3D region.getOffset()+region.getL= ength()) - fail("Wrong detection for region - "+region.getOffset()+" : "+region= .getLength()+" region - "+i); - } - } - } - - assertEquals("Wrong recognized region count: ", 14, counter); - - documentProvider.disconnect(editorInput); - } - -} Deleted: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/to= ols/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java 2010-05-26 16:5= 9:57 UTC (rev 22332) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java 2010-05-26 17:0= 5:24 UTC (rev 22333) @@ -1,99 +0,0 @@ -package org.jboss.tools.cdi.text.ext.test; - -import java.util.ArrayList; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.Region; -import org.eclipse.jface.text.hyperlink.IHyperlink; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.part.FileEditorInput; -import org.eclipse.ui.texteditor.DocumentProviderRegistry; -import org.eclipse.ui.texteditor.IDocumentProvider; -import org.eclipse.ui.texteditor.ITextEditor; -import org.jboss.tools.cdi.core.test.tck.TCKTest; -import org.jboss.tools.cdi.text.ext.hyperlink.ProducerDisposerHyperlinkDet= ector; - -public class ProducerDisposerHyperlinkDetectorTest extends HyperlinkDetect= orTest{ - private static final String FILE_NAME =3D "JavaSource/org/jboss/jsr299/tc= k/tests/decorators/invocation/producer/method/ProducerImpl.java"; - - public static Test suite() { - return new TestSuite(ProducerDisposerHyperlinkDetectorTest.class); - } - - public void testProducerDisposerHyperlinkDetector() throws Exception { - IFile javaFile =3D tckProject.getFile(FILE_NAME); - - TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile !=3D null)); - TCKTest.assertTrue("The file \"" + FILE_NAME + "\" is not found", (javaF= ile.exists())); - - FileEditorInput editorInput =3D new FileEditorInput(javaFile); - - IDocumentProvider documentProvider =3D null; - try { - documentProvider =3D DocumentProviderRegistry.getDefault().getDocumentP= rovider(editorInput); - } catch (Exception x) { - x.printStackTrace(); - fail("An exception caught: " + x.getMessage()); - } - - assertNotNull("The document provider for the file \"" + FILE_NAME + "\" = is not loaded", documentProvider); - - try { - documentProvider.connect(editorInput); - } catch (Exception x) { - x.printStackTrace(); - fail("The document provider is not able to be initialized with the edit= or input\nAn exception caught: "+x.getMessage()); - } - - IDocument document =3D documentProvider.getDocument(editorInput); - - assertNotNull("The document for the file \"" + FILE_NAME + "\" is not lo= aded", document); - - ProducerDisposerHyperlinkDetector elPartitioner =3D new ProducerDisposer= HyperlinkDetector(); - - ArrayList regionList =3D new ArrayList(); - regionList.add(new Region(1199, 8)); // @Produces - regionList.add(new Region(1222, 7)); // producer - regionList.add(new Region(1291, 7)); // disposer - - IEditorPart part =3D openFileInEditor(javaFile); - ISourceViewer viewer =3D null; - if(part instanceof JavaEditor){ - viewer =3D ((JavaEditor)part).getViewer(); - } - - elPartitioner.setContext(new TestContext((ITextEditor)part)); - - int counter =3D 0; - for (int i =3D 0; i < document.getLength(); i++) { - TestData testData =3D new TestData(document, i); - IHyperlink[] links =3D elPartitioner.detectHyperlinks(viewer, testData.= getHyperlinkRegion(), true); - - boolean recognized =3D links !=3D null; - - if (recognized) { - counter++; - if(!findOffsetInRegions(i, regionList)){ - fail("Wrong detection for offset - "+i); - } - } else { - for(Region region : regionList){ - if(i >=3D region.getOffset() && i <=3D region.getOffset()+region.getL= ength()) - fail("Wrong detection for region - "+region.getOffset()+" : "+region= .getLength()+" region - "+i); - } - } - } - - assertEquals("Wrong recognized region count: ", 25, counter); - - documentProvider.disconnect(editorInput); - } - -} --===============7656895756772705747==-- From jbosstools-commits at lists.jboss.org Wed May 26 13:05:41 2010 Content-Type: multipart/mixed; boundary="===============5698305346940268592==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22334 - in trunk/download.jboss.org/jbosstools/requirements: helios and 1 other directory. Date: Wed, 26 May 2010 13:05:41 -0400 Message-ID: <201005261705.o4QH5fkc002367@svn01.web.mwc.hst.phx2.redhat.com> --===============5698305346940268592== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-26 13:05:41 -0400 (Wed, 26 May 2010) New Revision: 22334 Modified: trunk/download.jboss.org/jbosstools/requirements/helios/index.html trunk/download.jboss.org/jbosstools/requirements/index.html Log: add bucky zips to indexes Modified: trunk/download.jboss.org/jbosstools/requirements/helios/index.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/download.jboss.org/jbosstools/requirements/helios/index.html 2010= -05-26 17:05:24 UTC (rev 22333) +++ trunk/download.jboss.org/jbosstools/requirements/helios/index.html 2010= -05-26 17:05:41 UTC (rev 22334) @@ -50,6 +50,11 @@ =
  • birt-report-fr= amework-2.6RC1.zip
  • birt-wtp-in= tegration-sdk-2.6RC1.zip
    • + +
  • b3.aggr= egator-repo-0.1.0.r01001_e36.zip
    • +
  • buc= kminster-updates-3.5_20100125-r11098.zip
    • +
  • buckminst= er-repo-1.3.0.r11439_e36.zip
    • +
  • dtp-1.8.0RC2-2010= 05210500.zip
  • ecli= pse-SDK-3.6RC2-linux-gtk-x86_64.tar.gz
  • eclipse-SDK= -3.6RC2-linux-gtk.tar.gz
    • Modified: trunk/download.jboss.org/jbosstools/requirements/index.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/download.jboss.org/jbosstools/requirements/index.html 2010-05-26 = 17:05:24 UTC (rev 22333) +++ trunk/download.jboss.org/jbosstools/requirements/index.html 2010-05-26 = 17:05:41 UTC (rev 22334) @@ -50,6 +50,11 @@ =
  • birt-re= port-framework-2.6RC1.zip
  • birt= -wtp-integration-sdk-2.6RC1.zip
    • + +
  • = b3.aggregator-repo-0.1.0.r01001_e36.zip
    • +
  • buckminster-updates-3.5_20100125-r11098.zip
    • +
  • bu= ckminster-repo-1.3.0.r11439_e36.zip
    • +
  • dtp-1.8.0R= C2-201005210500.zip
  • eclipse-SDK-3.6RC2-linux-gtk-x86_64.tar.gz
  • ecli= pse-SDK-3.6RC2-linux-gtk.tar.gz
    • --===============5698305346940268592==-- From jbosstools-commits at lists.jboss.org Wed May 26 13:49:38 2010 Content-Type: multipart/mixed; boundary="===============7235761162476808305==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22335 - trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test. Date: Wed, 26 May 2010 13:49:38 -0400 Message-ID: <201005261749.o4QHncT4007096@svn01.web.mwc.hst.phx2.redhat.com> --===============7235761162476808305== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-26 13:49:37 -0400 (Wed, 26 May 2010) New Revision: 22335 Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/InjectedPointHyperlinkDetectorTest.java Log: https://jira.jboss.org/browse/JBIDE-6340 Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-26 17:05:4= 1 UTC (rev 22334) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-26 17:49:3= 7 UTC (rev 22335) @@ -44,4 +44,28 @@ checkRegions("JavaSource/org/jboss/jsr299/tck/tests/decorators/invocatio= n/producer/method/ProducerImpl.java", regionList, new ProducerDisposerHyper= linkDetector()); } = + public void testInjectedConstructorParametersHyperlinkDetector() throws E= xception { + ArrayList regionList =3D new ArrayList(); + regionList.add(new Region(880, 6)); + regionList.add(new Region(898, 3)); + regionList.add(new Region(950, 6)); + regionList.add(new Region(967, 7)); + regionList.add(new Region(979, 3)); + regionList.add(new Region(1017, 3)); + + checkRegions("JavaSource/org/jboss/jsr299/tck/tests/context/dependent/Fo= xFarm.java", regionList, new InjectedPointHyperlinkDetector()); + } + = + public void testInjectedInitializerParametersHyperlinkDetector() throws E= xception { + ArrayList regionList =3D new ArrayList(); + regionList.add(new Region(880, 6)); + regionList.add(new Region(898, 3)); + regionList.add(new Region(945, 6)); + regionList.add(new Region(967, 4)); + regionList.add(new Region(976, 3)); + regionList.add(new Region(1014, 3)); + + checkRegions("JavaSource/org/jboss/jsr299/tck/tests/context/dependent/Fo= xHole.java", regionList, new InjectedPointHyperlinkDetector()); + } + } \ No newline at end of file --===============7235761162476808305==-- From jbosstools-commits at lists.jboss.org Wed May 26 14:33:58 2010 Content-Type: multipart/mixed; boundary="===============8068051272585496166==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22336 - trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test. Date: Wed, 26 May 2010 14:33:58 -0400 Message-ID: <201005261833.o4QIXwYQ018808@svn01.web.mwc.hst.phx2.redhat.com> --===============8068051272585496166== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 14:33:57 -0400 (Wed, 26 May 2010) New Revision: 22336 Added: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclips= e/as/ui/test/AsUiAllTests.java Removed: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclips= e/as/ui/test/AllAsUiTests.java Log: AllAsuITests renamed to AsUiAllTests to let ticho build find the suite Deleted: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/= eclipse/as/ui/test/AllAsUiTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclip= se/as/ui/test/AllAsUiTests.java 2010-05-26 17:49:37 UTC (rev 22335) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclip= se/as/ui/test/AllAsUiTests.java 2010-05-26 18:33:57 UTC (rev 22336) @@ -1,16 +0,0 @@ -package org.jboss.ide.eclipse.as.ui.test; - -import org.jboss.ide.eclipse.as.ui.wizards.test.NewServerWizardTest; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class AllAsUiTests { - = - public static Test suite() { - TestSuite suite =3D new TestSuite(AllAsUiTests.class.getName()); - suite.addTestSuite(NewServerWizardTest.class); - return suite; - } - = -} Copied: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/e= clipse/as/ui/test/AsUiAllTests.java (from rev 22298, trunk/as/tests/org.jbo= ss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclipse/as/ui/test/AllAsUiTests= .java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclip= se/as/ui/test/AsUiAllTests.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/org/jboss/ide/eclip= se/as/ui/test/AsUiAllTests.java 2010-05-26 18:33:57 UTC (rev 22336) @@ -0,0 +1,16 @@ +package org.jboss.ide.eclipse.as.ui.test; + +import org.jboss.ide.eclipse.as.ui.wizards.test.NewServerWizardTest; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class AsUiAllTests { + = + public static Test suite() { + TestSuite suite =3D new TestSuite(AsUiAllTests.class.getName()); + suite.addTestSuite(NewServerWizardTest.class); + return suite; + } + = +} Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/src/or= g/jboss/ide/eclipse/as/ui/test/AsUiAllTests.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============8068051272585496166==-- From jbosstools-commits at lists.jboss.org Wed May 26 14:50:17 2010 Content-Type: multipart/mixed; boundary="===============4715079203449687257==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22337 - in trunk/as: tests/org.jboss.ide.eclipse.as.archives.integration.test and 1 other directories. Date: Wed, 26 May 2010 14:50:17 -0400 Message-ID: <201005261850.o4QIoHq8020709@svn01.web.mwc.hst.phx2.redhat.com> --===============4715079203449687257== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 14:50:17 -0400 (Wed, 26 May 2010) New Revision: 22337 Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-I= NF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build.= properties Log: as.integration.test plug-in do not need unpacking during installation to wo= rk with tycho build. Manifest was adjusted. Modified: trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.x= ml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 201= 0-05-26 18:33:57 UTC (rev 22336) +++ trunk/as/features/org.jboss.ide.eclipse.as.test.feature/feature.xml 201= 0-05-26 18:50:17 UTC (rev 22337) @@ -1,54 +1,55 @@ - - - - - JBossAS Test - - - - JBoss, Home of Professional Open Source -Copyright 2006-2010, JBoss by Red Hat, and individual contributors as indi= cated -by the @authors tag. See the copyright.txt in the distribution -for a full listing of individual contributors. - - - Red Hat, Inc. licenses these features and plugins to you under -certain open source licenses (or aggregations of such licenses), which -in a particular case may include the Eclipse Public License, the GNU -Lesser General Public License, and/or certain other open source -licenses. For precise licensing details, consult the corresponding -source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, -Raleigh NC 27606 USA. - - - - - - - - - - - - + + + + + JBossAS Test + + + + JBoss, Home of Professional Open Source +Copyright 2006-2010, JBoss by Red Hat, and individual contributors as indi= cated +by the @authors tag. See the copyright.txt in the distribution +for a full listing of individual contributors. + + + + Red Hat, Inc. licenses these features and plugins to you under +certain open source licenses (or aggregations of such licenses), which +in a particular case may include the Eclipse Public License, the GNU +Lesser General Public License, and/or certain other open source +licenses. For precise licensing details, consult the corresponding +source code, or contact Red Hat Legal Affairs, 1801 Varsity Drive, +Raleigh NC 27606 USA. + + + + + + + + + + + Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test= /META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-= INF/MANIFEST.MF 2010-05-26 18:33:57 UTC (rev 22336) +++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-= INF/MANIFEST.MF 2010-05-26 18:50:17 UTC (rev 22337) @@ -5,7 +5,7 @@ Bundle-Version: 2.1.0.qualifier Bundle-Activator: org.jboss.ide.eclipse.as.archives.integration.test.ASArc= hivesIntegrationTest Bundle-ActivationPolicy: lazy -Bundle-ClassPath: jbossasarchivesintegrationtest.jar +Bundle-ClassPath: . Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Require-Bundle: org.eclipse.core.runtime, Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test= /build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build= .properties 2010-05-26 18:33:57 UTC (rev 22336) +++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/build= .properties 2010-05-26 18:50:17 UTC (rev 22337) @@ -1,6 +1,6 @@ bin.includes =3D META-INF/,\ - jbossasarchivesintegrationtest.jar,\ - plugin.properties -source.jbossasarchivesintegrationtest.jar =3D src/ + plugin.properties,\ + . jars.compile.order =3D jbossasarchivesintegrationtest.jar -output.jbossasarchivesintegrationtest.jar =3D bin/ \ No newline at end of file +output.jbossasarchivesintegrationtest.jar =3D bin/ +source.. =3D src/ --===============4715079203449687257==-- From jbosstools-commits at lists.jboss.org Wed May 26 15:39:25 2010 Content-Type: multipart/mixed; boundary="===============1729936728760401659==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22338 - trunk. Date: Wed, 26 May 2010 15:39:24 -0400 Message-ID: <201005261939.o4QJdOpK032616@svn01.web.mwc.hst.phx2.redhat.com> --===============1729936728760401659== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 15:39:24 -0400 (Wed, 26 May 2010) New Revision: 22338 Added: trunk/requirements/ Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests Share project "requirements" into "https://svn.jboss.org/repos/jbosstools" = --===============1729936728760401659==-- From jbosstools-commits at lists.jboss.org Wed May 26 15:47:19 2010 Content-Type: multipart/mixed; boundary="===============5989197497652385954==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22339 - branches/3.2.helios/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition. Date: Wed, 26 May 2010 15:47:19 -0400 Message-ID: <201005261947.o4QJlJwm001192@svn01.web.mwc.hst.phx2.redhat.com> --===============5989197497652385954== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vrubezhny Date: 2010-05-26 15:47:19 -0400 (Wed, 26 May 2010) New Revision: 22339 Modified: branches/3.2.helios/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/t= ools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java Log: JBIDE-6291: Compilation errors in AbstractTypeDefinition (org.jboss.tools.c= di.core) patcb is applied Modified: branches/3.2.helios/cdi/plugins/org.jboss.tools.cdi.core/src/org/= jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/= tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2010-05= -26 19:39:24 UTC (rev 22338) +++ branches/3.2.helios/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/= tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2010-05= -26 19:47:19 UTC (rev 22339) @@ -19,7 +19,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.ISourceRange; import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.internal.core.SourceRange; +import org.eclipse.jdt.core.SourceRange; import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.internal.core.impl.CDIProject; import org.jboss.tools.cdi.internal.core.impl.ParametedType; --===============5989197497652385954==-- From jbosstools-commits at lists.jboss.org Wed May 26 15:55:40 2010 Content-Type: multipart/mixed; boundary="===============7077748873041891104==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22340 - in trunk/requirements: generic and 2 other directories. Date: Wed, 26 May 2010 15:55:40 -0400 Message-ID: <201005261955.o4QJtes0002188@svn01.web.mwc.hst.phx2.redhat.com> --===============7077748873041891104== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 15:55:40 -0400 (Wed, 26 May 2010) New Revision: 22340 Added: trunk/requirements/.classpath trunk/requirements/.project trunk/requirements/bin/ trunk/requirements/build.xml trunk/requirements/buildRequirements.xml trunk/requirements/generic/ trunk/requirements/generic/build.xml trunk/requirements/jbossas/ trunk/requirements/jbossas/build.properties trunk/requirements/jbossas/buildRequirement.xml trunk/requirements/jbossas/return.properties trunk/requirements/lib/ trunk/requirements/lib/ant-contrib.jar Modified: trunk/requirements/ Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests Share project "requirements" into "https://svn.jboss.org/repos/jbosstools" = Property changes on: trunk/requirements ___________________________________________________________________ Name: svn:ignore + download Added: trunk/requirements/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/requirements/.classpath (rev 0) +++ trunk/requirements/.classpath 2010-05-26 19:55:40 UTC (rev 22340) @@ -0,0 +1,5 @@ + + + + + Property changes on: trunk/requirements/.classpath ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/requirements/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/requirements/.project (rev 0) +++ trunk/requirements/.project 2010-05-26 19:55:40 UTC (rev 22340) @@ -0,0 +1,23 @@ + + + requirements + + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.wst.common.project.facet.core.nature + + Property changes on: trunk/requirements/.project ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/requirements/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/requirements/build.xml (rev 0) +++ trunk/requirements/build.xml 2010-05-26 19:55:40 UTC (rev 22340) @@ -0,0 +1,27 @@ + + + + + description + + + + + + + + requirements=3D${requirements} + unzipto=3D${basedir}/target/requirements + + + + Property changes on: trunk/requirements/build.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/requirements/buildRequirements.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/requirements/buildRequirements.xml (rev 0) +++ trunk/requirements/buildRequirements.xml 2010-05-26 19:55:40 UTC (rev 2= 2340) @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + ${requirement.root}/@{requirement}/return.properties is not a= vailable + + + + + + + load properties from ${requirement.root}/@{requirement}/retur= n.properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + load properties from ${requirement.root}/@{requirement}/return.= properties + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + requirement.build.root =3D ${requirement.build.roo= t} + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Property changes on: trunk/requirements/buildRequirements.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/requirements/generic/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/requirements/generic/build.xml (rev 0) +++ trunk/requirements/generic/build.xml 2010-05-26 19:55:40 UTC (rev 22340) @@ -0,0 +1,90 @@ + + = + + + + = + + = + + = + + + = + = + + = + = + = + + + Unpacking ${driver.dest}/${build.archive} to ${unz= ip.dest} + + + + + + + + + + = + + + + = + + + + = + + Checking the requirement's archive ${build.archive} + + + + + + + Archive is downloaded and MD5 checksum is provided + Calcualting checksum for downloaded archive<= /echo> + + ${current.md5} calculated + ${md5} provided + + + + + + + Downloaded archive is correct, download is not required + + + Downloaded archive checksum is not correct, new download req= uired + + + + + Archive is downloaded and no MD5 checksum is provided + + + + + + Archive has not downloaded yet, download required + + + + + + + + + + + + = + = + Property changes on: trunk/requirements/generic/build.xml ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + text/plain Added: trunk/requirements/jbossas/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/requirements/jbossas/build.properties (re= v 0) +++ trunk/requirements/jbossas/build.properties 2010-05-26 19:55:40 UTC (re= v 22340) @@ -0,0 +1,27 @@ +#jbossas.build.uri=3Dhttp://downloads.sourceforge.net/sourceforge/jboss +jbossas.build.uri=3Dhttp://repository.jboss.org/sourceforge + +jboss32.build.uri=3D${jbossas.build.uri} +jboss32.build.name=3Djboss-3.2.8.SP1 +jboss32.build.archive=3D${jboss32.build.name}.zip +jboss32.build.archive.md5=3D97147374ee5b048e4462c7ebaf3cccb5 + +jboss40.build.uri=3D${jbossas.build.uri} +jboss40.build.name=3Djboss-4.0.5.GA +jboss40.build.archive=3D${jboss40.build.name}.zip +jboss40.build.archive.md5=3Da39e85981958fea2411e9346e218aa39 + +jboss42.build.uri=3D${jbossas.build.uri} +jboss42.build.name=3Djboss-4.2.3.GA +jboss42.build.archive=3D${jboss42.build.name}.zip +jboss42.build.archive.md5=3Dd1ded1cc876733fec96b5e2934c81220 + +jboss50.build.uri=3D${jbossas.build.uri} +jboss50.build.name=3Djboss-5.0.1.GA +jboss50.build.archive=3D${jboss50.build.name}.zip +jboss50.build.archive.md5=3Ddd308175c43796db824692cb0cdea82d + +jboss51.build.uri=3D${jbossas.build.uri} +jboss51.build.name=3Djboss-5.1.0.GA +jboss51.build.archive=3D${jboss51.build.name}.zip +jboss51.build.archive.md5=3D78322c75ca0c13002a04418b4a8bc920 \ No newline at end of file Property changes on: trunk/requirements/jbossas/build.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/requirements/jbossas/buildRequirement.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/requirements/jbossas/buildRequirement.xml = (rev 0) +++ trunk/requirements/jbossas/buildRequirement.xml 2010-05-26 19:55:40 UTC= (rev 22340) @@ -0,0 +1,63 @@ + + + = + + + + + + = + + + + + + jboss32.home=3D${unzip.dest}/${jboss32.build.name} + jboss40.home=3D${unzip.dest}/${jboss40.build.name} + jboss42.home=3D${unzip.dest}/${jboss42.build.name} + jboss50.home=3D${unzip.dest}/${jboss50.build.name} + jboss51.home=3D${unzip.dest}/${jboss51.build.name} + + + = + + + + + + + = + + + + + + + + + + = + + + + + = + + + + + = + + + + + + + + Property changes on: trunk/requirements/jbossas/buildRequirement.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/requirements/jbossas/return.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/requirements/jbossas/return.properties (r= ev 0) +++ trunk/requirements/jbossas/return.properties 2010-05-26 19:55:40 UTC (r= ev 22340) @@ -0,0 +1,7 @@ + + jboss32.home=3D/home/eskimo/Projects/jbds-build/jbosstools-src/requirem= ents/target/jboss-3.2.8.SP1 + jboss40.home=3D/home/eskimo/Projects/jbds-build/jbosstools-src/requirem= ents/target/jboss-4.0.5.GA + jboss42.home=3D/home/eskimo/Projects/jbds-build/jbosstools-src/requirem= ents/target/jboss-4.2.3.GA + jboss50.home=3D/home/eskimo/Projects/jbds-build/jbosstools-src/requirem= ents/target/jboss-5.0.1.GA + jboss51.home=3D/home/eskimo/Projects/jbds-build/jbosstools-src/requirem= ents/target/jboss-5.1.0.GA + = \ No newline at end of file Property changes on: trunk/requirements/jbossas/return.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/requirements/lib/ant-contrib.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/requirements/lib/ant-contrib.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream --===============7077748873041891104==-- From jbosstools-commits at lists.jboss.org Wed May 26 15:59:50 2010 Content-Type: multipart/mixed; boundary="===============5588426294967986731==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22341 - in branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples: src/org/jboss/tools/project/examples/filetransfer and 1 other directories. Date: Wed, 26 May 2010 15:59:50 -0400 Message-ID: <201005261959.o4QJxok3002840@svn01.web.mwc.hst.phx2.redhat.com> --===============5588426294967986731== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-26 15:59:50 -0400 (Wed, 26 May 2010) New Revision: 22341 Modified: branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/ME= TA-INF/MANIFEST.MF branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/sr= c/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/sr= c/org/jboss/tools/project/examples/model/ProjectFix.java Log: https://jira.jboss.org/browse/JBIDE-6341 23 compile errors in org.jboss.too= ls.project.examples Modified: branches/3.2.helios/examples/plugins/org.jboss.tools.project.exam= ples/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/M= ETA-INF/MANIFEST.MF 2010-05-26 19:55:40 UTC (rev 22340) +++ branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/M= ETA-INF/MANIFEST.MF 2010-05-26 19:59:50 UTC (rev 22341) @@ -29,7 +29,8 @@ org.eclipse.equinox.p2.ui, org.eclipse.equinox.p2.ui.sdk, org.eclipse.equinox.p2.metadata, - org.jboss.tools.portlet.core + org.jboss.tools.portlet.core, + org.eclipse.equinox.p2.operations Bundle-ActivationPolicy: lazy Bundle-Localization: plugin Export-Package: org.jboss.tools.project.examples, Modified: branches/3.2.helios/examples/plugins/org.jboss.tools.project.exam= ples/src/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/s= rc/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java = 2010-05-26 19:55:40 UTC (rev 22340) +++ branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/s= rc/org/jboss/tools/project/examples/filetransfer/ECFExamplesTransport.java = 2010-05-26 19:59:50 UTC (rev 22341) @@ -41,8 +41,9 @@ import org.eclipse.ecf.filetransfer.service.IRetrieveFileTransferFactory; import org.eclipse.ecf.provider.filetransfer.retrieve.AbstractRetrieveFile= Transfer; import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper; -import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI; -import org.eclipse.equinox.internal.provisional.p2.core.IServiceUI.Authent= icationInfo; +import org.eclipse.equinox.p2.core.IProvisioningAgent; +import org.eclipse.equinox.p2.core.UIServices; +import org.eclipse.equinox.p2.core.UIServices.AuthenticationInfo; import org.eclipse.equinox.security.storage.ISecurePreferences; import org.eclipse.equinox.security.storage.SecurePreferencesFactory; import org.eclipse.equinox.security.storage.StorageException; @@ -425,9 +426,8 @@ // ignore } } - ServiceTracker adminUITracker =3D new ServiceTracker(ProjectExamplesActi= vator.getBundleContext(), IServiceUI.class.getName(), null); - adminUITracker.open(); - IServiceUI adminUIService =3D (IServiceUI) adminUITracker.getService(); + IProvisioningAgent agent =3D (IProvisioningAgent) ServiceHelper.getServi= ce(ProjectExamplesActivator.getBundleContext(), IProvisioningAgent.SERVICE_= NAME); + UIServices adminUIService =3D (UIServices) agent.getService(UIServices.S= ERVICE_NAME); AuthenticationInfo loginDetails =3D null; if (adminUIService !=3D null) loginDetails =3D adminUIService.getUsernamePassword(hostLocation.toStri= ng()); Modified: branches/3.2.helios/examples/plugins/org.jboss.tools.project.exam= ples/src/org/jboss/tools/project/examples/model/ProjectFix.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/s= rc/org/jboss/tools/project/examples/model/ProjectFix.java 2010-05-26 19:55:= 40 UTC (rev 22340) +++ branches/3.2.helios/examples/plugins/org.jboss.tools.project.examples/s= rc/org/jboss/tools/project/examples/model/ProjectFix.java 2010-05-26 19:59:= 50 UTC (rev 22341) @@ -4,12 +4,14 @@ import java.util.Map; = import org.eclipse.equinox.internal.p2.ui.sdk.ProvSDKUIActivator; -import org.eclipse.equinox.internal.provisional.p2.core.ProvisionException; -import org.eclipse.equinox.internal.provisional.p2.ui.IProvHelpContextIds; -import org.eclipse.equinox.internal.provisional.p2.ui.QueryableMetadataRep= ositoryManager; -import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.InstallWizar= d; -import org.eclipse.equinox.internal.provisional.p2.ui.dialogs.Provisioning= WizardDialog; -import org.eclipse.equinox.internal.provisional.p2.ui.policy.Policy; +import org.eclipse.equinox.p2.core.ProvisionException; +import org.eclipse.equinox.internal.p2.ui.IProvHelpContextIds; +import org.eclipse.equinox.internal.p2.ui.ProvUIActivator; +import org.eclipse.equinox.internal.p2.ui.QueryableMetadataRepositoryManag= er; +import org.eclipse.equinox.internal.p2.ui.dialogs.InstallWizard; +import org.eclipse.equinox.internal.p2.ui.dialogs.ProvisioningWizardDialog; +import org.eclipse.equinox.p2.ui.Policy; +import org.eclipse.equinox.p2.ui.ProvisioningUI; import org.eclipse.jface.preference.PreferenceDialog; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; @@ -100,20 +102,14 @@ } } if (PLUGIN_TYPE.equals(type)) { - try { - final String profileId =3D ProvSDKUIActivator.getSelfProfileId(); - final QueryableMetadataRepositoryManager manager =3D new QueryableMet= adataRepositoryManager(Policy.getDefault().getQueryContext(), false); - InstallWizard wizard =3D new InstallWizard(Policy.getDefault(), profi= leId, null, null, manager); - WizardDialog dialog =3D new ProvisioningWizardDialog(getShell(), wiza= rd); - dialog.create(); - PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(), = IProvHelpContextIds.INSTALL_WIZARD); - dialog.open(); - } catch (ProvisionException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - ProjectExamplesActivator.log(e); - } - = + + ProvisioningUI ui =3D ProvisioningUI.getDefaultUI(); + InstallWizard wizard =3D new InstallWizard(ui, null, null, null); + WizardDialog dialog =3D new ProvisioningWizardDialog(getShell(), wizard= ); + dialog.create(); + PlatformUI.getWorkbench().getHelpSystem().setHelp(dialog.getShell(),IPr= ovHelpContextIds.INSTALL_WIZARD); + dialog.open(); + } } private Shell getShell() { --===============5588426294967986731==-- From jbosstools-commits at lists.jboss.org Wed May 26 16:21:59 2010 Content-Type: multipart/mixed; boundary="===============4281831283443966947==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22342 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 4 other directories. Date: Wed, 26 May 2010 16:21:59 -0400 Message-ID: <201005262021.o4QKLx3s011335@svn01.web.mwc.hst.phx2.redhat.com> --===============4281831283443966947== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-26 16:21:57 -0400 (Wed, 26 May 2010) New Revision: 22342 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/inject/GenericInitializerMethodBroken.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= IInjectionPoint.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/BeanField.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/BeanMember.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/InjectionPointField.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/InjectionPointMethod.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/InjectionPointParameter.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDIValidationMessages.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIPreferencesMessages.properties trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : 3.9.1. Declaring an initializer method - generic method of a bean is anno= tated @Inject (initializer method is a non-abstract, non-static, non-generi= c method of a bean class) Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDIUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-26 19:59:50 UTC (rev 22341) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-26 20:21:57 UTC (rev 22342) @@ -460,6 +460,51 @@ return params; } = + /** + * Returns true if the method is generic + * = + * @param method + * @return + */ + public static boolean isMethodGeneric(IBeanMethod method) { + try { + return method.getMethod().getTypeParameters().length>0; + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + return false; + } + + /** + * Returns true if the method is static + * = + * @param method + * @return + */ + public static boolean isMethodStatic(IBeanMethod method) { + try { + return Flags.isStatic(method.getMethod().getFlags()); + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + return false; + } + + /** + * Returns true if the method is abstract + * = + * @param method + * @return + */ + public static boolean isMethodAbstract(IBeanMethod method) { + try { + return Flags.isAbstract(method.getMethod().getFlags()); + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + return false; + } + private static IType getSuperClass(IType type) throws JavaModelException { String superclassName =3D type.getSuperclassName(); if(superclassName!=3Dnull) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/IInjectionPoint.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IInjectionPoint.java 2010-05-26 19:59:50 UTC (rev 22341) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /IInjectionPoint.java 2010-05-26 20:21:57 UTC (rev 22342) @@ -51,4 +51,11 @@ * parameter of injection point method. May be null. */ IAnnotationDeclaration getDelegateAnnotation(); + + /** + * Returns the @Inject annotation declaration + * = + * @return the @Inject annotation declaration. + */ + IAnnotationDeclaration getInjectAnnotation(); } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/BeanField.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanField.java 2010-05-26 19:59:50 UTC (rev 22341) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanField.java 2010-05-26 20:21:57 UTC (rev 22342) @@ -1,5 +1,5 @@ /*************************************************************************= ****** = - * Copyright (c) 2007 Red Hat, Inc. = + * Copyright (c) 2009 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, = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/BeanMember.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanMember.java 2010-05-26 19:59:50 UTC (rev 22341) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/BeanMember.java 2010-05-26 20:21:57 UTC (rev 22342) @@ -1,5 +1,5 @@ /*************************************************************************= ****** = - * Copyright (c) 2007 Red Hat, Inc. = + * Copyright (c) 2009 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, = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/InjectionPointField.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/InjectionPointField.java 2010-05-26 19:59:50 UTC (rev 22341) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/InjectionPointField.java 2010-05-26 20:21:57 UTC (rev 22342) @@ -1,5 +1,5 @@ /*************************************************************************= ****** = - * Copyright (c) 2007 Red Hat, Inc. = + * Copyright (c) 2009 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, = @@ -10,6 +10,7 @@ *************************************************************************= *****/ = package org.jboss.tools.cdi.internal.core.impl; = +import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IInjectionPointField; = @@ -22,12 +23,27 @@ = public InjectionPointField() {} = + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.IInjectionPoint#getDelegateAnnotation() + */ public IAnnotationDeclaration getDelegateAnnotation() { return getDefinition().getDelegateAnnotation(); } = + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.IInjectionPoint#isDelegate() + */ public boolean isDelegate() { return getDelegateAnnotation() !=3D null; } = -} + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.IInjectionPoint#getInjectAnnotation() + */ + public IAnnotationDeclaration getInjectAnnotation() { + return definition.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME= ); + } +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/InjectionPointMethod.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/InjectionPointMethod.java 2010-05-26 19:59:50 UTC (rev 22341) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/InjectionPointMethod.java 2010-05-26 20:21:57 UTC (rev 22342) @@ -33,4 +33,12 @@ protected Parameter newParameter() { return new InjectionPointParameter(); } + + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.IInjectionPoint#getInjectAnnotation() + */ + public IAnnotationDeclaration getInjectAnnotation() { + return inject; + } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/InjectionPointParameter.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/InjectionPointParameter.java 2010-05-26 19:59:50 UTC (rev 22= 341) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/InjectionPointParameter.java 2010-05-26 20:21:57 UTC (rev 22= 342) @@ -1,5 +1,5 @@ /*************************************************************************= ****** = - * Copyright (c) 2007 Red Hat, Inc. = + * Copyright (c) 2009 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, = @@ -51,4 +51,11 @@ return isAnnotationPresent(CDIConstants.DELEGATE_STEREOTYPE_TYPE_NAME); } = -} + /* + * (non-Javadoc) + * @see org.jboss.tools.cdi.core.IInjectionPoint#getInjectAnnotation() + */ + public IAnnotationDeclaration getInjectAnnotation() { + return beanMethod.inject; + } +} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-26 19:59:50 UTC (rev 223= 41) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-26 20:21:57 UTC (rev 223= 42) @@ -48,7 +48,7 @@ import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IDecorator; import org.jboss.tools.cdi.core.IInjectionPoint; -import org.jboss.tools.cdi.core.IInjectionPointField; +import org.jboss.tools.cdi.core.IInjectionPointMethod; import org.jboss.tools.cdi.core.IInjectionPointParameter; import org.jboss.tools.cdi.core.IInterceptor; import org.jboss.tools.cdi.core.IParametedType; @@ -592,14 +592,14 @@ ITypeDeclaration typeDeclaration =3D null; if (!typeDeclarations.isEmpty()) { /* - * 3.3. Producer methods - producer method return type contains - * a wildcard type parameter + * 3.3. Producer methods + * - producer method return type contains a wildcard type parameter * = - * 2.2.1 Legal bean types - a parameterized type that contains a - * wildcard type parameter is not a legal bean type. + * 2.2.1 Legal bean types + * - a parameterized type that contains a wildcard type parameter is = not a legal bean type. * = - * 3.4. Producer fields - producer field type contains a - * wildcard type parameter + * 3.4. Producer fields + * - producer field type contains a wildcard type parameter */ typeDeclaration =3D typeDeclarations.iterator().next(); String[] paramTypes =3D Signature.getTypeArguments(typeDeclaration.get= Signature()); @@ -615,14 +615,13 @@ } } = - /** - * 3.3. Producer methods - producer method with a parameterized - * return type with a type variable declares any scope other - * than @Dependent + /* + * 3.3. Producer methods + * - producer method with a parameterized return type with a type var= iable declares any scope other than @Dependent * = - * 3.4. Producer fields - producer field with a parameterized - * type with a type variable declares any scope other than @Dependent - */ + * 3.4. Producer fields + * - producer field with a parameterized type with a type variable de= clares any scope other than @Dependent + */ = if (paramTypes.length > 0) { IAnnotationDeclaration scopeOrStereotypeDeclaration =3D CDIUtil.getDi= fferentScopeDeclarationThanDepentend(producer); if (scopeOrStereotypeDeclaration !=3D null) { @@ -635,8 +634,8 @@ } = /* - * 3.3.2. Declaring a producer method - producer method is annotated - * @Inject + * 3.3.2. Declaring a producer method + * - producer method is annotated @Inject */ IAnnotationDeclaration inject =3D producer.getAnnotation(CDIConstants.I= NJECT_ANNOTATION_TYPE_NAME); if (inject !=3D null) { @@ -647,9 +646,8 @@ = if (producer instanceof IProducerField) { /* - * 3.5.1. Declaring a resource - producer field declaration - * specifies an EL name (together with one of @Resource, - * @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRef) + * 3.5.1. Declaring a resource + * - producer field declaration specifies an EL name (together with o= ne of @Resource, @PersistenceContext, @PersistenceUnit, @EJB, @WebServiceRe= f) */ IProducerField producerField =3D (IProducerField) producer; if (producerField.getName() !=3D null) { @@ -666,7 +664,8 @@ } } /* - * 3.4. Producer fields - producer field type is a type variable + * 3.4. Producer fields + * - producer field type is a type variable */ if (typeVariables.length > 0) { String typeSign =3D producerField.getField().getTypeSignature(); @@ -694,22 +693,22 @@ disposalDeclarations.add(producerMethod.getAnnotation(CDIConstants.PRO= DUCES_ANNOTATION_TYPE_NAME)); for (IParameter param : params) { /* - * 3.3.6. Declaring a disposer method - a disposer method is - * annotated @Produces. + * 3.3.6. Declaring a disposer method + * - a disposer method is annotated @Produces. * = - * 3.3.2. Declaring a producer method - a has a parameter - * annotated @Disposes + * 3.3.2. Declaring a producer method + * - a has a parameter annotated @Disposes */ ITextSourceReference declaration =3D param.getAnnotationPosition(CDIC= onstants.DISPOSES_ANNOTATION_TYPE_NAME); if (declaration !=3D null) { disposalDeclarations.add(declaration); } /* - * 3.3.2. Declaring a producer method - a has a parameter - * annotated @Observers + * 3.3.2. Declaring a producer method + * - a has a parameter annotated @Observers * = - * 10.4.2. Declaring an observer method - an observer method - * is annotated @Produces + * 10.4.2. Declaring an observer method + * - an observer method is annotated @Produces */ declaration =3D param.getAnnotationPosition(CDIConstants.OBSERVERS_AN= NOTATION_TYPE_NAME); if (declaration !=3D null) { @@ -730,11 +729,11 @@ } = /* - * 3.3. Producer methods - producer method return type is a type - * variable + * 3.3. Producer methods + * - producer method return type is a type variable * = - * 2.2.1 - Legal bean types - a type variable is not a legal - * bean type + * 2.2.1 - Legal bean types + * - a type variable is not a legal bean type */ String typeSign =3D producerMethod.getMethod().getReturnType(); String typeString =3D Signature.toString(typeSign); @@ -847,7 +846,7 @@ } = } - } else if (!(injection instanceof IInjectionPointField)) { + } else if (injection instanceof IInjectionPointMethod) { IAnnotationDeclaration named =3D injection.getAnnotation(CDIConstants.N= AMED_QUALIFIER_TYPE_NAME); if (named !=3D null) { try { @@ -860,13 +859,24 @@ } } if (!valueExists) { - addError(CDIValidationMessages.PARAM_INJECTION_DECLARES_EMPTY_NAME, = CDIPreferences.PARAM_INJECTION_DECLARES_EMPTY_NAME, named, - injection.getResource()); + addError(CDIValidationMessages.PARAM_INJECTION_DECLARES_EMPTY_NAME, = CDIPreferences.PARAM_INJECTION_DECLARES_EMPTY_NAME, named, injection.getRes= ource()); } } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); } } + + /* + * = + */ + IInjectionPointMethod injectionMethod =3D (IInjectionPointMethod)inject= ion; + IAnnotationDeclaration declaration =3D injection.getInjectAnnotation(); + if(CDIUtil.isMethodGeneric(injectionMethod)) { + addError(CDIValidationMessages.GENERIC_METHOD_ANNOTATED_INJECT, CDIPre= ferences.GENERIC_METHOD_ANNOTATED_INJECT, declaration, injection.getResourc= e()); + } + if(CDIUtil.isMethodStatic(injectionMethod)) { + addError(CDIValidationMessages.STATIC_METHOD_ANNOTATED_INJECT, CDIPref= erences.GENERIC_METHOD_ANNOTATED_INJECT, declaration, injection.getResource= ()); + } } } = @@ -883,8 +893,8 @@ = if (sessionDeclaration !=3D null) { /* - * 3.2. Session beans - bean class of a session bean is annotated - * @Decorator + * 3.2. Session beans + * - bean class of a session bean is annotated @Decorator */ if (decoratorDeclaration !=3D null) { addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_DECORATOR, CDIPr= eferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, @@ -893,8 +903,8 @@ decoratorDeclaration, bean.getResource()); } /* - * 3.2. Session beans - bean class of a session bean is annotated - * @Interceptor + * 3.2. Session beans + * - bean class of a session bean is annotated @Interceptor */ if (interceptorDeclaration !=3D null) { addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_INTERCEPTOR, CDI= Preferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR, @@ -911,8 +921,8 @@ IType type =3D bean.getBeanClass(); try { /* - * 3.2. Session beans - session bean with a parameterized bean - * class declares any scope other than @Dependent + * 3.2. Session beans + * - session bean with a parameterized bean class declares any scope = other than @Dependent */ String[] typeVariables =3D type.getTypeParameterSignatures(); if (typeVariables.length > 0) { @@ -921,9 +931,8 @@ } else { if (bean.isStateless()) { /* - * 3.2. Session beans - session bean specifies an - * illegal scope (a stateless session bean must belong - * to the @Dependent pseudo-scope) + * 3.2. Session beans + * - session bean specifies an illegal scope (a stateless session b= ean must belong to the @Dependent pseudo-scope) */ if (declaration !=3D null) { addError(CDIValidationMessages.ILLEGAL_SCOPE_FOR_STATELESS_SESSION_= BEAN, CDIPreferences.ILLEGAL_SCOPE_FOR_SESSION_BEAN, @@ -931,10 +940,8 @@ } } else if (bean.isSingleton()) { /* - * 3.2. Session beans - session bean specifies an - * illegal scope (a singleton bean must belong to either - * the @ApplicationScoped scope or to the @Dependent - * pseudo-scope) + * 3.2. Session beans + * - session bean specifies an illegal scope (a singleton bean must= belong to either the @ApplicationScoped scope or to the @Dependent pseudo-= scope) */ if (declaration !=3D null) { declaration =3D CDIUtil.getDifferentScopeDeclarationThanApplication= Scoped(bean); @@ -950,9 +957,8 @@ } } /* - * 3.2.4. Specializing a session bean - session bean class annotated - * @Specializes does not directly extend the bean class of another - * session bean + * 3.2.4. Specializing a session bean + * - session bean class annotated @Specializes does not directly extend= the bean class of another session bean */ IAnnotationDeclaration specializesDeclaration =3D bean.getSpecializesAnn= otationDeclaration(); if (specializesDeclaration !=3D null) { @@ -963,8 +969,7 @@ addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIP= references.ILLEGAL_SPECIALIZING_SESSION_BEAN, specializesDeclaration, bean.getResource()); } else if (!CDIUtil.isSessionBean(sBean)) { - // The specializing bean directly extends a non-session bean - // class + // The specializing bean directly extends a non-session bean class addError(CDIValidationMessages.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIP= references.ILLEGAL_SPECIALIZING_SESSION_BEAN, specializesDeclaration, bean.getResource()); } @@ -973,7 +978,8 @@ = private void validateManagedBean(IClassBean bean) { /* - * 3.1. Managed beans - the bean class of a managed bean is annotated wi= th both the @Interceptor and @Decorator stereotypes + * 3.1. Managed beans + * - the bean class of a managed bean is annotated with both the @Inter= ceptor and @Decorator stereotypes */ IAnnotationDeclaration decorator =3D bean.getAnnotation(CDIConstants.DEC= ORATOR_STEREOTYPE_TYPE_NAME); IAnnotationDeclaration interceptor =3D bean.getAnnotation(CDIConstants.I= NTERCEPTOR_ANNOTATION_TYPE_NAME); @@ -987,7 +993,8 @@ IType type =3D bean.getBeanClass(); try { /* - * 3.1. Managed beans - managed bean with a public field declares any = scope other than @Dependent + * 3.1. Managed beans + * - managed bean with a public field declares any scope other than @= Dependent */ IField[] fields =3D type.getFields(); for (IField field : fields) { @@ -998,7 +1005,8 @@ } } /* - * 3.1. Managed beans - managed bean with a parameterized bean class d= eclares any scope other than @Dependent + * 3.1. Managed beans + * - managed bean with a parameterized bean class declares any scope = other than @Dependent */ String[] typeVariables =3D type.getTypeParameterSignatures(); if (typeVariables.length > 0) { @@ -1010,7 +1018,8 @@ } } /* - * 3.1.4. Specializing a managed bean - managed bean class annotated @Sp= ecializes does not directly extend the bean class of another managed bean + * 3.1.4. Specializing a managed bean + * - managed bean class annotated @Specializes does not directly extend= the bean class of another managed bean */ IAnnotationDeclaration specializesDeclaration =3D bean.getSpecializesAnn= otationDeclaration(); if (specializesDeclaration !=3D null) { @@ -1052,7 +1061,8 @@ = private void validateInterceptor(IInterceptor interceptor) { /* - * 2.5.3. Beans with no EL name - interceptor has a name (Non-Portable b= ehavior) + * 2.5.3. Beans with no EL name + * - interceptor has a name (Non-Portable behavior) */ if (interceptor.getName() !=3D null) { ITextSourceReference declaration =3D interceptor.getAnnotation(CDIConst= ants.NAMED_QUALIFIER_TYPE_NAME); @@ -1066,7 +1076,8 @@ } = /* - * 2.6.1. Declaring an alternative - interceptor is an alternative (Non-= Portable behavior) + * 2.6.1. Declaring an alternative + * - interceptor is an alternative (Non-Portable behavior) */ if (interceptor.isAlternative()) { ITextSourceReference declaration =3D interceptor.getAlternativeDeclarat= ion(); @@ -1091,7 +1102,8 @@ = private void validateDecorator(IDecorator decorator) { /* - * 2.5.3. Beans with no EL name - decorator has a name (Non-Portable beh= avior) + * 2.5.3. Beans with no EL name + * - decorator has a name (Non-Portable behavior) */ if (decorator.getName() !=3D null) { ITextSourceReference declaration =3D decorator.getAnnotation(CDIConstan= ts.NAMED_QUALIFIER_TYPE_NAME); @@ -1105,7 +1117,8 @@ } = /* - * 2.6.1. Declaring an alternative - decorator is an alternative (Non-Po= rtable behavior) + * 2.6.1. Declaring an alternative + * - decorator is an alternative (Non-Portable behavior) */ if (decorator.isAlternative()) { ITextSourceReference declaration =3D decorator.getAlternativeDeclaratio= n(); @@ -1129,8 +1142,8 @@ } = /* - * 2.2.2. Restricting the bean types of a bean - bean class or producer m= ethod or field specifies a @Typed annotation, - * and the value member specifies a class which does not correspon= d to a type in the unrestricted set of bean types of a bean + * 2.2.2. Restricting the bean types of a bean + * - bean class or producer method or field specifies a @Typed annotatio= n, and the value member specifies a class which does not correspond to a ty= pe in the unrestricted set of bean types of a bean */ private void validateTyped(IBean bean) { Set typedDeclarations =3D bean.getRestrictedTypeDeclar= atios(); @@ -1166,10 +1179,7 @@ } = // 2.4.4. Default scope - // - bean does not explicitly declare a scope when there is no default - // scope - // (there are two different stereotypes declared by the bean that - // declare different default scopes) + // - bean does not explicitly declare a scope when there is no default s= cope (there are two different stereotypes declared by the bean that declare= different default scopes) // = // Such bean definitions are invalid because they declares two // stereotypes that have different default scopes and the bean does not @@ -1192,8 +1202,8 @@ } = /* - * 2.4.1. Built-in scope types - interceptor or decorator has any scope - * other than @Dependent (Non-Portable behavior) + * 2.4.1. Built-in scope types + * - interceptor or decorator has any scope other than @Dependent (Non-= Portable behavior) */ boolean interceptor =3D bean instanceof IInterceptor; boolean decorator =3D bean instanceof IDecorator; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDIValidationMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-26 19:59:50 UTC (re= v 22341) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDIValidationMessages.java 2010-05-26 20:21:57 UTC (re= v 22342) @@ -68,6 +68,7 @@ public static String CONSTRUCTOR_PARAMETER_ANNOTATED_OBSERVES; public static String CONSTRUCTOR_PARAMETER_ANNOTATED_DISPOSES; public static String GENERIC_METHOD_ANNOTATED_INJECT; + public static String STATIC_METHOD_ANNOTATED_INJECT; public static String MULTIPLE_OBSERVING_PARAMETERS; public static String ILLEGAL_OBSERVER_IN_SESSION_BEAN; public static String ILLEGAL_CONDITIONAL_OBSERVER; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-26 19:59:50 UTC (rev 22341) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-26 20:21:57 UTC (rev 22342) @@ -47,6 +47,7 @@ CONSTRUCTOR_PARAMETER_ANNOTATED_DISPOSES=3DBean constructor has a paramete= r annotated @Disposes CONSTRUCTOR_PARAMETER_ANNOTATED_OBSERVES=3DBean constructor has a paramete= r annotated @Observes GENERIC_METHOD_ANNOTATED_INJECT=3DGeneric method of a bean is annotated @I= nject +STATIC_METHOD_ANNOTATED_INJECT=3DStatic method of a bean is annotated @Inj= ect MULTIPLE_OBSERVING_PARAMETERS=3DMethod has more than one parameter annotat= ed @Observes ILLEGAL_OBSERVER_IN_SESSION_BEAN=3DNon-static method of a session bean cla= ss has a parameter annotated @Observes, and the method is not a business me= thod of the EJB ILLEGAL_CONDITIONAL_OBSERVER=3DBean with scope @Dependent has an observer = method declared receive=3DIF_EXISTS Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-26 19:59:50 UTC (rev 22341) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-26 20:21:57 UTC (rev 22342) @@ -89,7 +89,7 @@ {CDIPreferences.ILLEGAL_PRODUCER_FIELD_IN_SESSION_BEAN, CDIPreferencesM= essages.CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBean= _label}, {CDIPreferences.MULTIPLE_INJECTION_CONSTRUCTORS, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label}, {CDIPreferences.CONSTRUCTOR_PARAMETER_ILLEGALLY_ANNOTATED, CDIPreferenc= esMessages.CDIValidatorConfigurationBlock_pb_constructorParameterIllegallyA= nnotated_label}, -// {CDIPreferences.GENERIC_METHOD_ANNOTATED_INJECT, CDIPreferencesMessag= es.CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label}, + {CDIPreferences.GENERIC_METHOD_ANNOTATED_INJECT, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label}, {CDIPreferences.MULTIPLE_OBSERVING_PARAMETERS, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_multipleObservingParameters_label}, {CDIPreferences.ILLEGAL_OBSERVER_IN_SESSION_BEAN, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_illegalObserverInSessionBean_label}, // {CDIPreferences.ILLEGAL_CONDITIONAL_OBSERVER, CDIPreferencesMessages.= CDIValidatorConfigurationBlock_pb_illegalConditionalObserver_label}, Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIPreferencesMessages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIPreferencesMessages.properties 2010-05-26 19:59:50 UTC (rev 223= 41) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIPreferencesMessages.properties 2010-05-26 20:21:57 UTC (rev 223= 42) @@ -70,7 +70,7 @@ CDIValidatorConfigurationBlock_pb_illegalProducerFieldInSessionBean_label= =3DIllegal producer field in Session Bean: CDIValidatorConfigurationBlock_pb_multipleInjectionConstructors_label=3DMu= ltiple injection constructors: CDIValidatorConfigurationBlock_pb_constructorParameterIllegallyAnnotated_l= abel=3DConstructor parameter illegally annotated: -CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label=3DGen= eric method is annotated @Inject: +CDIValidatorConfigurationBlock_pb_genericMethodAnnotatedInject_label=3DGen= eric or static method is annotated @Inject: CDIValidatorConfigurationBlock_pb_multipleObservingParameters_label=3DMult= iple observing parameterts: CDIValidatorConfigurationBlock_pb_illegalObserverInSessionBean_label=3DIll= egal observer in Session Bean: CDIValidatorConfigurationBlock_pb_illegalConditionalObserver_label=3DIlleg= al conditional observer: Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/inject/GenericInitializerMethodBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/inject/GenericInitializerMethodBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/inject/GenericInitializerMethodBroken.java 2010-05-26 20:21:57 UT= C (rev 22342) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.inject; + +import javax.inject.Inject; + +public class GenericInitializerMethodBroken { + + @Inject + public void genericFoo(U arg) { + } + + @Inject + public static void staticFoo(String arg) { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/inject/GenericInitializerMethodBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-26 19:59:50 UTC (rev 22341) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-26 20:21:57 UTC (rev 22342) @@ -805,6 +805,28 @@ } = /** + * 3.9. Initializer methods + * - initializer method may not be static + * = + * @throws Exception + */ + public void testStaticInitializerMethod() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/inject/GenericInitializerMethodBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.STATIC_METHOD_ANNOTATED_INJECT= , 11); + } + + /** + * 3.9.1. Declaring an initializer method + * - generic method of a bean is annotated @Inject + * = + * @throws Exception + */ + public void testGenericInitializerMethod() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/inject/GenericInitializerMethodBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.GENERIC_METHOD_ANNOTATED_INJEC= T, 7); + } + + /** * 3.11. The qualifier @Named at injection points * - injection point other than injected field declares a @Named annotat= ion that does not specify the value member * = --===============4281831283443966947==-- From jbosstools-commits at lists.jboss.org Wed May 26 16:28:36 2010 Content-Type: multipart/mixed; boundary="===============4577268919726263205==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22343 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck and 1 other directory. Date: Wed, 26 May 2010 16:28:36 -0400 Message-ID: <201005262028.o4QKSaxo012175@svn01.web.mwc.hst.phx2.redhat.com> --===============4577268919726263205== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-26 16:28:35 -0400 (Wed, 26 May 2010) New Revision: 22343 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-26 20:21:57 UTC (rev 223= 42) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-26 20:28:35 UTC (rev 223= 43) @@ -866,14 +866,19 @@ } } = + IInjectionPointMethod injectionMethod =3D (IInjectionPointMethod)inject= ion; + IAnnotationDeclaration declaration =3D injection.getInjectAnnotation(); /* - * = + * 3.9.1. Declaring an initializer method + * - generic method of a bean is annotated @Inject */ - IInjectionPointMethod injectionMethod =3D (IInjectionPointMethod)inject= ion; - IAnnotationDeclaration declaration =3D injection.getInjectAnnotation(); if(CDIUtil.isMethodGeneric(injectionMethod)) { addError(CDIValidationMessages.GENERIC_METHOD_ANNOTATED_INJECT, CDIPre= ferences.GENERIC_METHOD_ANNOTATED_INJECT, declaration, injection.getResourc= e()); } + /* + * 3.9. Initializer methods + * - initializer method may not be static + */ if(CDIUtil.isMethodStatic(injectionMethod)) { addError(CDIValidationMessages.STATIC_METHOD_ANNOTATED_INJECT, CDIPref= erences.GENERIC_METHOD_ANNOTATED_INJECT, declaration, injection.getResource= ()); } @@ -881,8 +886,7 @@ } = /** - * Validates class bean which may be both a session and decorator (or - * interceptor). + * Validates class bean which may be both a session and decorator (or int= erceptor). * = * @param bean */ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-26 20:21:57 UTC (rev 22342) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-26 20:28:35 UTC (rev 22343) @@ -109,9 +109,6 @@ 3.8.1. Declaring an injected field - injected field is annotated @Produces = - - - 3.9.1. Declaring an initializer method - generic method of a bean is annotated @Inject (initializer method is a n= on-abstract, = non-static, non-generic method of a bean class) @@ -120,6 +117,10 @@ - injection point other than injected field declares a @Named annotation t= hat = does not specify the value member = + + + + 4.3.1. Direct and indirect specialization - X specializes Y but does not have some bean type of Y - X specializes Y and Y has a name and X declares a name explicitly, using= @Named Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-26 20:21:57 UTC (rev 22342) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-26 20:28:35 UTC (rev 22343) @@ -793,6 +793,17 @@ } = /** + * 3.9. Initializer methods + * - initializer method may not be static + * = + * @throws Exception + */ + public void testStaticInitializerMethod() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/inject/GenericInitializerMethodBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.STATIC_METHOD_ANNOTATED_INJECT= , 11); + } + + /** * 3.9.1. Declaring an initializer method * - an initializer method has a parameter annotated @Disposes * = @@ -805,17 +816,6 @@ } = /** - * 3.9. Initializer methods - * - initializer method may not be static - * = - * @throws Exception - */ - public void testStaticInitializerMethod() throws Exception { - IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/inject/GenericInitializerMethodBroken.java"); - AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.STATIC_METHOD_ANNOTATED_INJECT= , 11); - } - - /** * 3.9.1. Declaring an initializer method * - generic method of a bean is annotated @Inject * = --===============4577268919726263205==-- From jbosstools-commits at lists.jboss.org Wed May 26 16:51:11 2010 Content-Type: multipart/mixed; boundary="===============2793169268160946650==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22344 - trunk/download.jboss.org/jbosstools/requirements/helios. Date: Wed, 26 May 2010 16:51:11 -0400 Message-ID: <201005262051.o4QKpBnA014988@svn01.web.mwc.hst.phx2.redhat.com> --===============2793169268160946650== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-26 16:51:10 -0400 (Wed, 26 May 2010) New Revision: 22344 Modified: trunk/download.jboss.org/jbosstools/requirements/helios/README.txt Log: fix instructions for releng.bb zip creation Modified: trunk/download.jboss.org/jbosstools/requirements/helios/README.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/download.jboss.org/jbosstools/requirements/helios/README.txt 2010= -05-26 20:28:35 UTC (rev 22343) +++ trunk/download.jboss.org/jbosstools/requirements/helios/README.txt 2010= -05-26 20:51:10 UTC (rev 22344) @@ -54,10 +54,9 @@ = Basebuilder from latest tag (http://wiki.eclipse.org/Platform-releng-baseb= uilder#Current_build_tag_for_3.6_stream_builds_.28Helios.29) cvs -d :pserver:anonymous(a)dev.eclipse.org:/cvsroot/eclipse -q co -d -org.eclipse.releng.basebuilder_R36_RC1 -r R36_RC1 +org.eclipse.releng.basebuilder -r R36_RC1 org.eclipse.releng.basebuilder - cd org.eclipse.releng.basebuilder_R36_RC1; zip -r9 -../org.eclipse.releng.basebuilder_R36_RC1.zip ./* + zip -r9 org.eclipse.releng.basebuilder_R36_RC1.zip org.eclipse.releng.bas= ebuilder = m2eclipse-0.10.0.20100209-0800.zip run m2eclipse/build.xml --===============2793169268160946650==-- From jbosstools-commits at lists.jboss.org Wed May 26 17:40:52 2010 Content-Type: multipart/mixed; boundary="===============5823809859430230472==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22345 - in trunk: drools and 1 other directory. Date: Wed, 26 May 2010 17:40:52 -0400 Message-ID: <201005262140.o4QLeqJr027300@svn01.web.mwc.hst.phx2.redhat.com> --===============5823809859430230472== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-26 17:40:51 -0400 (Wed, 26 May 2010) New Revision: 22345 Modified: trunk/build/build.xml trunk/drools/build.xml Log: drools custom build can't find build/build.xml when using shared checkout l= ocation in Hudson Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-26 20:51:10 UTC (rev 22344) +++ trunk/build/build.xml 2010-05-26 21:40:51 UTC (rev 22345) @@ -660,6 +660,7 @@ + Modified: trunk/drools/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/build.xml 2010-05-26 20:51:10 UTC (rev 22344) +++ trunk/drools/build.xml 2010-05-26 21:40:51 UTC (rev 22345) @@ -24,12 +24,16 @@ COMMON_TOOLS =3D ${COMMON_TOOLS} = - + - + + + + + = --===============0706718878269297112== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 18:33:15 -0400 (Wed, 26 May 2010) New Revision: 22346 Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/= ResourcesUtils.java Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests ResourceUtils importProject distinguish import form plug-in distributed as = jar or unpacked jar Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tes= t/util/ResourcesUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util= /ResourcesUtils.java 2010-05-26 21:40:51 UTC (rev 22345) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util= /ResourcesUtils.java 2010-05-26 22:33:15 UTC (rev 22346) @@ -17,7 +17,11 @@ import java.io.LineNumberReader; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -34,7 +38,9 @@ import org.eclipse.core.runtime.Platform; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.IOverwriteQuery; +import org.eclipse.ui.wizards.datatransfer.FileSystemStructureProvider; import org.eclipse.ui.wizards.datatransfer.ImportOperation; +import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider; import org.jboss.tools.tests.ImportProvider; import org.osgi.framework.Bundle; = @@ -54,7 +60,8 @@ String tplPrjLcStr; tplPrjLcStr =3D FileLocator.resolve(bundle.getEntry(templLocation)) .getFile(); - IProject importedPrj =3D importProjectIntoWorkspace(tplPrjLcStr, new Pa= th(tplPrjLcStr).lastSegment()); + String protocol =3D FileLocator.resolve(bundle.getEntry(templLocation))= .getProtocol(); + IProject importedPrj =3D importProjectIntoWorkspace(tplPrjLcStr, new Pa= th(tplPrjLcStr).lastSegment(),protocol); return importedPrj; } = @@ -189,15 +196,20 @@ = private static final long IMPORT_DELAY =3D 1000; = + static public IProject importProjectIntoWorkspace(String path, String pro= jectName) { = + return importProjectIntoWorkspace(path, projectName,"file"); + } + = /** * Import project into workspace. * = * @param path the path * @param projectName the project name + * @param protocol = */ - static public IProject importProjectIntoWorkspace(String path, String pro= jectName) { + static public IProject importProjectIntoWorkspace(String path, String pro= jectName, String protocol) { = - IProject project =3D null; + IProject project =3D null; = try { boolean state =3D ResourcesUtils.setBuildAutomatically(false); @@ -211,19 +223,33 @@ return ALL; } }; - - ImportProvider importProvider =3D new ImportProvider(); - - // need to remove from imported project "svn" files - List unimportedFiles =3D new ArrayList(); - unimportedFiles.add(".svn"); //$NON-NLS-1$ - - importProvider.setUnimportedFiles(unimportedFiles); - - // create import operation - ImportOperation importOp =3D new ImportOperation(project - .getFullPath(), new File(path), importProvider, overwrite); - + if(Debug.DEBUG_IMPORT_OPERATION) { + System.out.println("[ResourceUtils]:Target Import Location: " + projec= t.getFullPath()); + System.out.println("[ResourceUtils]:Full path to source: " + path); + System.out.println("[ResourceUtils]:Protocol: " + protocol); = + } + ImportOperation importOp =3D null; + if("jar".equals(protocol)) { + String pathToZip =3D path.substring(0,path.indexOf("!")); + String zipEntryName =3D path.substring(path.indexOf("!") + 2, path.len= gth()); + pathToZip =3D pathToZip.substring("file:".length()); + // create import operation + if(Debug.DEBUG_IMPORT_OPERATION) { + System.out.println("[ResourceUtils]:pathToZip: " + pathToZip); + System.out.println("[ResourceUtils]:zipEntryName: " + zipEntryName); + } + ZipFile zipFile =3D new ZipFile(pathToZip); + ZipFileStructureProvider zipStrProvider =3D new ZipFileStructureProvid= er(zipFile); + ZipEntry source =3D getZipEntry(zipStrProvider,zipEntryName); + importOp =3D new ImportOperation(project + .getFullPath(), source, zipStrProvider , overwrite); + importOp.setFilesToImport(zipStrProvider.getChildren(source)); + } else { + // create import operation + importOp =3D new ImportOperation(project + .getFullPath(), new File(path), FileSystemStructureProvider.INSTANCE= , overwrite); + } + = // import files just to project folder ( without old structure ) importOp.setCreateContainerStructure(false); = @@ -243,7 +269,28 @@ } catch (CoreException e) { // TODO Auto-generated catch block e.printStackTrace(); + } catch (IOException ex) { + ex.printStackTrace(); } return project; } + + private static ZipEntry getZipEntry( + ZipFileStructureProvider zipStrProvider, String zipEntryName) { + String[] entries =3D zipEntryName.split("/"); + ZipEntry parent =3D zipStrProvider.getRoot(); + for (String string : entries) { + List children =3D zipStrProvider.getChildren(parent); + for (Object object : children) { + ZipEntry current =3D (ZipEntry)object; + String name =3D parent=3D=3D zipStrProvider.getRoot()? string + "/": p= arent.getName() + string + "/"; + if(name.equals(current.getName())) { + parent =3D current; + break; + } + } + = + } + return parent; + } } --===============0706718878269297112==-- From jbosstools-commits at lists.jboss.org Wed May 26 18:34:57 2010 Content-Type: multipart/mixed; boundary="===============3468080306607431604==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22347 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util. Date: Wed, 26 May 2010 18:34:56 -0400 Message-ID: <201005262234.o4QMYumH007287@svn01.web.mwc.hst.phx2.redhat.com> --===============3468080306607431604== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 18:34:56 -0400 (Wed, 26 May 2010) New Revision: 22347 Added: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/= Debug.java Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests ResourceUtils importProject distinguish import form plug-in distributed as = jar or unpacked jar Added: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/u= til/Debug.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util= /Debug.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util= /Debug.java 2010-05-26 22:34:56 UTC (rev 22347) @@ -0,0 +1,17 @@ +package org.jboss.tools.test.util; + +import org.eclipse.core.runtime.Platform; +import org.eclipse.ui.PlatformUI; +import org.jboss.tools.tests.TestsPlugin; + +public class Debug { + public static final boolean DEBUG_IMPORT_OPERATION; + = + static { + DEBUG_IMPORT_OPERATION =3D true; //getDebugOption("/debug/importProject"= ); + } + = + private static boolean getDebugOption(String option) { + return "true".equalsIgnoreCase(Platform.getDebugOption(TestsPlugin= .ID + option)); //$NON-NLS-1$ + } +} Property changes on: trunk/tests/plugins/org.jboss.tools.tests/src/org/jbos= s/tools/test/util/Debug.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============3468080306607431604==-- From jbosstools-commits at lists.jboss.org Wed May 26 18:35:58 2010 Content-Type: multipart/mixed; boundary="===============3853323687084649102==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22348 - trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests. Date: Wed, 26 May 2010 18:35:58 -0400 Message-ID: <201005262235.o4QMZwNv007740@svn01.web.mwc.hst.phx2.redhat.com> --===============3853323687084649102== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 18:35:57 -0400 (Wed, 26 May 2010) New Revision: 22348 Added: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/Test= sPlugin.java Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests ResourceUtils importProject distinguish import form plug-in distributed as = jar or unpacked jar Added: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/= TestsPlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/Tes= tsPlugin.java (rev 0) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/Tes= tsPlugin.java 2010-05-26 22:35:57 UTC (rev 22348) @@ -0,0 +1,23 @@ +/** + * = + */ +package org.jboss.tools.tests; + +import org.eclipse.ui.plugin.AbstractUIPlugin; + +/** + * @author eskimo + * + */ +public class TestsPlugin extends AbstractUIPlugin { + + = + public static final String ID =3D "org.jboss.tools.tests"; = + /** + * = + */ + public TestsPlugin() { + = + } + +} Property changes on: trunk/tests/plugins/org.jboss.tools.tests/src/org/jbos= s/tools/tests/TestsPlugin.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============3853323687084649102==-- From jbosstools-commits at lists.jboss.org Wed May 26 18:44:29 2010 Content-Type: multipart/mixed; boundary="===============5814215720282747845==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22349 - in trunk/archives/tests/org.jboss.ide.eclipse.archives.test: META-INF and 1 other directory. Date: Wed, 26 May 2010 18:44:28 -0400 Message-ID: <201005262244.o4QMiSBj008247@svn01.web.mwc.hst.phx2.redhat.com> --===============5814215720282747845== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 18:44:28 -0400 (Wed, 26 May 2010) New Revision: 22349 Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIFE= ST.MF trunk/archives/tests/org.jboss.ide.eclipse.archives.test/build.properties Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests Archives test manifest changed to be archive instead of unpacked archive. = Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/META-INF= /MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIF= EST.MF 2010-05-26 22:35:57 UTC (rev 22348) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/META-INF/MANIF= EST.MF 2010-05-26 22:44:28 UTC (rev 22349) @@ -19,7 +19,6 @@ org.eclipse.jdt.core;bundle-version=3D"3.4.4", org.jboss.ide.eclipse.archives.jdt.integration;bundle-version=3D"1.0.0" Bundle-ActivationPolicy: lazy -Bundle-ClassPath: archivestest.jar Export-Package: org.jboss.ide.eclipse.archives.test, org.jboss.ide.eclipse.archives.test.core, org.jboss.ide.eclipse.archives.test.model, Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/build.pr= operties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/build.properti= es 2010-05-26 22:35:57 UTC (rev 22348) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/build.properti= es 2010-05-26 22:44:28 UTC (rev 22349) @@ -1,10 +1,10 @@ output.archivestest.jar =3D bin/ bin.includes =3D META-INF/,\ - archivestest.jar,\ output/,\ inputs/,\ expectedOutputs/,\ tmp/,\ plugin.properties -source.archivestest.jar =3D src/ -jars.compile.order =3D archivestest.jar +jars.compile.order =3D . +source.. =3D src/ +output.. =3D bin/ --===============5814215720282747845==-- From jbosstools-commits at lists.jboss.org Wed May 26 19:42:12 2010 Content-Type: multipart/mixed; boundary="===============3256148099481037423==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22350 - in trunk/archives/tests/org.jboss.ide.eclipse.archives.test: inputs/ant and 1 other directories. Date: Wed, 26 May 2010 19:42:12 -0400 Message-ID: <201005262342.o4QNgC3S022044@svn01.web.mwc.hst.phx2.redhat.com> --===============3256148099481037423== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 19:42:11 -0400 (Wed, 26 May 2010) New Revision: 22350 Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/inputs/ant/antT= emplate.xml trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/i= de/eclipse/archives/test/core/ant/SimpleAntTest.java Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests fix tycho releated errors in archives.test archives.core and archives.test should be unpacked equinox.common plug-in reference should be calculated different way because= now it is in maven repo during the test Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/inputs/a= nt/antTemplate.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/inputs/ant/ant= Template.xml 2010-05-26 22:44:28 UTC (rev 22349) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/inputs/ant/ant= Template.xml 2010-05-26 23:42:11 UTC (rev 22350) @@ -1,12 +1,11 @@ + = = - - - + Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml 2010-0= 5-26 22:44:28 UTC (rev 22349) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/pom.xml 2010-0= 5-26 23:42:11 UTC (rev 22350) @@ -11,4 +11,19 @@ org.jboss.ide.eclipse.archives.test = 3.1.0-SNAPSHOT eclipse-test-plugin + + + + org.sonatype.tycho + maven-osgi-test-plugin + + + org.jboss.ide.eclipse.archives.core + org.jboss.ide.eclipse.archives.test + + + + + + = Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/= jboss/ide/eclipse/archives/test/core/ant/SimpleAntTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/= ide/eclipse/archives/test/core/ant/SimpleAntTest.java 2010-05-26 22:44:28 U= TC (rev 22349) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/= ide/eclipse/archives/test/core/ant/SimpleAntTest.java 2010-05-26 23:42:11 U= TC (rev 22350) @@ -22,6 +22,7 @@ import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; import org.jboss.ide.eclipse.archives.test.ArchivesTest; import org.jboss.ide.eclipse.archives.test.core.ant.AntLauncher.IProcessLi= stener; import org.osgi.framework.Bundle; @@ -31,6 +32,7 @@ protected static final String ARCHIVES_HOME =3D "${UNIT_TEST_ARCHIVES_HOM= E}"; protected static final String PROJECT_NAME =3D "${UNIT_TEST_PROJECT_NAME}= "; protected static final String PROJECT_DIR =3D "${UNIT_TEST_PROJECT_DIR}"; + protected static final String EQUINOX_JAR =3D "${EQUINOX_JAR}"; = // if running from runtime workbench, set this to true. otherwise its run= ning in a full build private final static boolean RUNTIME_WORKBENCH =3D false; @@ -57,8 +59,11 @@ outputFolder =3D projectLoc.append("output"); = String eclipseHome =3D new File(new URL(System.getProperty("eclipse.hom= e.location")).toURI()).getAbsolutePath(); - = + String equinoxJar =3D FileLocator.getBundleFile(Platform.getBundle("org= .eclipse.equinox.common")).getAbsolutePath(); + System.out.println(eclipseHome); + System.out.println(equinoxJar); map.put(ECLIPSE_LOC, eclipseHome); + map.put(EQUINOX_JAR, equinoxJar); map.put(PROJECT_NAME, "SimpleAntTest"); map.put(ARCHIVES_HOME, RUNTIME_WORKBENCH ? PLUGIN_LOCATION : eclipseHom= e); map.put(PROJECT_DIR, projectLoc.toOSString()); --===============3256148099481037423==-- From jbosstools-commits at lists.jboss.org Wed May 26 19:54:25 2010 Content-Type: multipart/mixed; boundary="===============6640266660016023917==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22351 - in trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test: META-INF and 1 other directory. Date: Wed, 26 May 2010 19:54:24 -0400 Message-ID: <201005262354.o4QNsO7B023147@svn01.web.mwc.hst.phx2.redhat.com> --===============6640266660016023917== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 19:54:23 -0400 (Wed, 26 May 2010) New Revision: 22351 Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MAN= IFEST.MF trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/build.proper= ties Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests fix tycho releated errors in archives.ui.test manifest updated to build test plug-in as jar Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-= INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MA= NIFEST.MF 2010-05-26 23:42:11 UTC (rev 22350) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MA= NIFEST.MF 2010-05-26 23:54:23 UTC (rev 22351) @@ -14,7 +14,6 @@ org.eclipse.core.runtime;bundle-version=3D"3.5.0", org.jboss.ide.eclipse.archives.core;bundle-version=3D"2.0.0", org.eclipse.ui.navigator;bundle-version=3D"3.4.1" -Bundle-ClassPath: archives-ui-test.jar Export-Package: org.jboss.ide.eclipse.archives.ui.test, org.jboss.ide.eclipse.archives.ui.test.preferences, org.jboss.ide.eclipse.archives.ui.test.views, Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/build= .properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/build.prope= rties 2010-05-26 23:42:11 UTC (rev 22350) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/build.prope= rties 2010-05-26 23:54:23 UTC (rev 22351) @@ -1,6 +1,5 @@ -output.archives-ui-test.jar =3D bin/ bin.includes =3D META-INF/,\ - archives-ui-test.jar,\ - projects/ -source.archives-ui-test.jar =3D src/ -jars.compile.order =3D archives-ui-test.jar + projects/,\ + . +jars.compile.order =3D . +source.. =3D src/ --===============6640266660016023917==-- From jbosstools-commits at lists.jboss.org Wed May 26 19:57:32 2010 Content-Type: multipart/mixed; boundary="===============7640866080781579900==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22352 - trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ant. Date: Wed, 26 May 2010 19:57:31 -0400 Message-ID: <201005262357.o4QNvVjd023625@svn01.web.mwc.hst.phx2.redhat.com> --===============7640866080781579900== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 19:57:31 -0400 (Wed, 26 May 2010) New Revision: 22352 Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/i= de/eclipse/archives/test/core/ant/SimpleAntTest.java Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests System.out.printlns were removed Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/= jboss/ide/eclipse/archives/test/core/ant/SimpleAntTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/= ide/eclipse/archives/test/core/ant/SimpleAntTest.java 2010-05-26 23:54:23 U= TC (rev 22351) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/= ide/eclipse/archives/test/core/ant/SimpleAntTest.java 2010-05-26 23:57:31 U= TC (rev 22352) @@ -60,8 +60,6 @@ = String eclipseHome =3D new File(new URL(System.getProperty("eclipse.hom= e.location")).toURI()).getAbsolutePath(); String equinoxJar =3D FileLocator.getBundleFile(Platform.getBundle("org= .eclipse.equinox.common")).getAbsolutePath(); - System.out.println(eclipseHome); - System.out.println(equinoxJar); map.put(ECLIPSE_LOC, eclipseHome); map.put(EQUINOX_JAR, equinoxJar); map.put(PROJECT_NAME, "SimpleAntTest"); --===============7640866080781579900==-- From jbosstools-commits at lists.jboss.org Wed May 26 20:11:57 2010 Content-Type: multipart/mixed; boundary="===============2932009557706232131==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22353 - trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF. Date: Wed, 26 May 2010 20:11:57 -0400 Message-ID: <201005270011.o4R0BvOD031738@svn01.web.mwc.hst.phx2.redhat.com> --===============2932009557706232131== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 20:11:57 -0400 (Wed, 26 May 2010) New Revision: 22353 Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MAN= IFEST.MF Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests no fix archives.ui.test errors in tycho some plug-ins must be explicitly in= cluded to be loaded during the test org.jboss.ide.eclipse.archives.jdt.integration;bundle-version=3D"3.1.0", org.jboss.ide.eclipse.archives.webtools;bundle-version=3D"2.1.0" these plug-ins use achives.core extension point to define archives type. If= this dependencies are not declared in test plug-in manifest, tests fail wi= th NullPointer exception Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-= INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MA= NIFEST.MF 2010-05-26 23:57:31 UTC (rev 22352) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MA= NIFEST.MF 2010-05-27 00:11:57 UTC (rev 22353) @@ -13,7 +13,9 @@ org.eclipse.core.resources;bundle-version=3D"3.5.1", org.eclipse.core.runtime;bundle-version=3D"3.5.0", org.jboss.ide.eclipse.archives.core;bundle-version=3D"2.0.0", - org.eclipse.ui.navigator;bundle-version=3D"3.4.1" + org.eclipse.ui.navigator;bundle-version=3D"3.4.1", + org.jboss.ide.eclipse.archives.jdt.integration;bundle-version=3D"3.1.0", + org.jboss.ide.eclipse.archives.webtools;bundle-version=3D"2.1.0" Export-Package: org.jboss.ide.eclipse.archives.ui.test, org.jboss.ide.eclipse.archives.ui.test.preferences, org.jboss.ide.eclipse.archives.ui.test.views, --===============2932009557706232131==-- From jbosstools-commits at lists.jboss.org Wed May 26 20:23:06 2010 Content-Type: multipart/mixed; boundary="===============0739895762444298657==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22354 - trunk/requirements/jbossas. Date: Wed, 26 May 2010 20:23:06 -0400 Message-ID: <201005270023.o4R0N6VA032747@svn01.web.mwc.hst.phx2.redhat.com> --===============0739895762444298657== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-26 20:23:06 -0400 (Wed, 26 May 2010) New Revision: 22354 Modified: trunk/requirements/jbossas/buildRequirement.xml Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests dependency download changed, no more return.properties files for a while Modified: trunk/requirements/jbossas/buildRequirement.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/requirements/jbossas/buildRequirement.xml 2010-05-27 00:11:57 UTC= (rev 22353) +++ trunk/requirements/jbossas/buildRequirement.xml 2010-05-27 00:23:06 UTC= (rev 22354) @@ -11,26 +11,12 @@ - - jboss32.home=3D${unzip.dest}/${jboss32.build.name} - jboss40.home=3D${unzip.dest}/${jboss40.build.name} - jboss42.home=3D${unzip.dest}/${jboss42.build.name} - jboss50.home=3D${unzip.dest}/${jboss50.build.name} - jboss51.home=3D${unzip.dest}/${jboss51.build.name} - = - = --===============0739895762444298657==-- From jbosstools-commits at lists.jboss.org Thu May 27 01:47:55 2010 Content-Type: multipart/mixed; boundary="===============8460039375860289761==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22355 - trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/util. Date: Thu, 27 May 2010 01:47:55 -0400 Message-ID: <201005270547.o4R5lt4I004351@svn01.web.mwc.hst.phx2.redhat.com> --===============8460039375860289761== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: Grid.Qian Date: 2010-05-27 01:47:54 -0400 (Thu, 27 May 2010) New Revision: 22355 Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/uti= l/ReconciliationHelper.java Log: JBIDE-6357: to trunk Modified: trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/mo= del/util/ReconciliationHelper.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/ut= il/ReconciliationHelper.java 2010-05-27 00:23:06 UTC (rev 22354) +++ trunk/bpel/plugins/org.eclipse.bpel.model/src/org/eclipse/bpel/model/ut= il/ReconciliationHelper.java 2010-05-27 05:47:54 UTC (rev 22355) @@ -340,7 +340,7 @@ if (nearestScopeOrProcess =3D=3D null) return; = - TreeIterator iter =3D nearestScopeOrProcess.eAllContents(); + TreeIterator iter =3D nearestScopeOrProcess.eAllContents(); while (iter.hasNext()) { Object object =3D iter.next(); = @@ -390,7 +390,7 @@ if (nearestScopeOrProcess =3D=3D null) return; = - TreeIterator iter =3D nearestScopeOrProcess.eAllContents(); + TreeIterator iter =3D nearestScopeOrProcess.eAllContents(); while (iter.hasNext()) { Object object =3D iter.next(); = @@ -398,9 +398,11 @@ if (object instanceof PartnerActivity) { PartnerActivity partnerAct =3D (PartnerActivity) object; Correlations correlations =3D partnerAct.getCorrelations(); + if(correlations =3D=3D null){ + continue; + } EList list =3D correlations.getChildren(); for (Correlation correlation : list) { - CorrelationSet corrSet2 =3D correlation.getSet(); if (corrSet.equals(correlation.getSet())) { correlation.getElement().setAttribute(BPELConstants.AT_SET, name); } @@ -411,6 +413,9 @@ else if (object instanceof OnMessage) { OnMessage onMessage =3D (OnMessage) object; Correlations correlations =3D onMessage.getCorrelations(); + if(correlations =3D=3D null){ + continue; + } EList list =3D correlations.getChildren(); for (Correlation correlation : list) { if (corrSet.equals(correlation.getSet())) { @@ -422,6 +427,9 @@ } else if (object instanceof OnEvent) { OnEvent onEvent =3D (OnEvent) object; Correlations correlations =3D onEvent.getCorrelations(); + if(correlations =3D=3D null){ + continue; + } EList list =3D correlations.getChildren(); for (Correlation correlation : list) { if (corrSet.equals(correlation.getSet())) { @@ -446,7 +454,7 @@ if (nearestScopeOrProcess =3D=3D null) return; = - TreeIterator iter =3D nearestScopeOrProcess.eAllContents(); + TreeIterator iter =3D nearestScopeOrProcess.eAllContents(); while (iter.hasNext()) { Object object =3D iter.next(); = @@ -517,7 +525,7 @@ * @param name */ private static void updateVariableNameReferencesOnScope(EObject scope, Va= riable variable, String name) { - TreeIterator iter =3D scope.eAllContents(); + TreeIterator iter =3D scope.eAllContents(); while (iter.hasNext()) { Object object =3D iter.next(); = --===============8460039375860289761==-- From jbosstools-commits at lists.jboss.org Thu May 27 02:24:27 2010 Content-Type: multipart/mixed; boundary="===============5671135048075446983==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22356 - branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor. Date: Thu, 27 May 2010 02:24:27 -0400 Message-ID: <201005270624.o4R6ORCe014308@svn01.web.mwc.hst.phx2.redhat.com> --===============5671135048075446983== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-27 02:24:26 -0400 (Thu, 27 May 2010) New Revision: 22356 Modified: branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/= tools/vpe/editor/VpeController.java Log: https://jira.jboss.org/browse/JBIDE-6344, revert changes from JBIDE-6107 Modified: branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org= /jboss/tools/vpe/editor/VpeController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss= /tools/vpe/editor/VpeController.java 2010-05-27 05:47:54 UTC (rev 22355) +++ branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss= /tools/vpe/editor/VpeController.java 2010-05-27 06:24:26 UTC (rev 22356) @@ -1075,7 +1075,8 @@ // uncommented next code // reason !=3D nsISelectionListener.NO_REASON reason =3D=3D nsISelectionListener.KEYPRESS_REASON - || reason =3D=3D nsISelectionListener.SELECTALL_REASON) + || reason =3D=3D nsISelectionListener.SELECTALL_REASON + || (reason & nsISelectionListener.MOUSEDOWN_REASON) =3D=3D nsISelect= ionListener.MOUSEDOWN_REASON) { if (VpeDebug.PRINT_VISUAL_SELECTION_EVENT) { System.out --===============5671135048075446983==-- From jbosstools-commits at lists.jboss.org Thu May 27 02:48:08 2010 Content-Type: multipart/mixed; boundary="===============7696068952499337259==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22357 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties. Date: Thu, 27 May 2010 02:48:07 -0400 Message-ID: <201005270648.o4R6m7YG017225@svn01.web.mwc.hst.phx2.redhat.com> --===============7696068952499337259== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgeraskov Date: 2010-05-27 02:48:07 -0400 (Thu, 27 May 2010) New Revision: 22357 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber= nate/eclipse/console/properties/HibernatePropertyPage.java Log: https://jira.jboss.org/browse/JBIDE-6370 Revert changes whic should be done for branch Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/or= g/hibernate/eclipse/console/properties/HibernatePropertyPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/properties/HibernatePropertyPage.java 2010-05-27 06:2= 4:26 UTC (rev 22356) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/properties/HibernatePropertyPage.java 2010-05-27 06:4= 8:07 UTC (rev 22357) @@ -43,7 +43,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jpt.core.JpaProject; -import org.eclipse.jpt.core.JptCorePlugin; +import org.eclipse.jpt.core.internal.JpaModelManager; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -72,6 +72,7 @@ import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; = +(a)SuppressWarnings("restriction") public class HibernatePropertyPage extends PropertyPage { = Control[] settings; @@ -340,7 +341,7 @@ final IWorkspaceRunnable wr =3D new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - JptCorePlugin.rebuildJpaProject(getProject()); + JpaModelManager.instance().rebuildJpaProject(getProject()); getProject().build(IncrementalProjectBuilder.FULL_BUILD, monitor); } }; --===============7696068952499337259==-- From jbosstools-commits at lists.jboss.org Thu May 27 02:55:03 2010 Content-Type: multipart/mixed; boundary="===============1104509693754314084==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22358 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor. Date: Thu, 27 May 2010 02:55:02 -0400 Message-ID: <201005270655.o4R6t2ti018014@svn01.web.mwc.hst.phx2.redhat.com> --===============1104509693754314084== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-27 02:55:02 -0400 (Thu, 27 May 2010) New Revision: 22358 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vpe= Controller.java Log: https://jira.jboss.org/browse/JBIDE-6344, reverting changes which has been = made in scope JBIDE-6107 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/VpeController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eController.java 2010-05-27 06:48:07 UTC (rev 22357) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eController.java 2010-05-27 06:55:02 UTC (rev 22358) @@ -1121,7 +1121,8 @@ // uncommented next code // reason !=3D nsISelectionListener.NO_REASON reason =3D=3D nsISelectionListener.KEYPRESS_REASON - || reason =3D=3D nsISelectionListener.SELECTALL_REASON) + || reason =3D=3D nsISelectionListener.SELECTALL_REASON + || (reason & nsISelectionListener.MOUSEDOWN_REASON) =3D=3D nsISelect= ionListener.MOUSEDOWN_REASON) { if (VpeDebug.PRINT_VISUAL_SELECTION_EVENT) { System.out --===============1104509693754314084==-- From jbosstools-commits at lists.jboss.org Thu May 27 02:55:17 2010 Content-Type: multipart/mixed; boundary="===============6507872321312690602==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22359 - branches/3.2.helios/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/properties. Date: Thu, 27 May 2010 02:55:17 -0400 Message-ID: <201005270655.o4R6tHsk018375@svn01.web.mwc.hst.phx2.redhat.com> --===============6507872321312690602== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgeraskov Date: 2010-05-27 02:55:17 -0400 (Thu, 27 May 2010) New Revision: 22359 Modified: branches/3.2.helios/hibernatetools/plugins/org.hibernate.eclipse.console= /src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java Log: https://jira.jboss.org/browse/JBIDE-6370 Support Dali2.3 Modified: branches/3.2.helios/hibernatetools/plugins/org.hibernate.eclipse.= console/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/plugins/org.hibernate.eclipse.consol= e/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java 2= 010-05-27 06:55:02 UTC (rev 22358) +++ branches/3.2.helios/hibernatetools/plugins/org.hibernate.eclipse.consol= e/src/org/hibernate/eclipse/console/properties/HibernatePropertyPage.java 2= 010-05-27 06:55:17 UTC (rev 22359) @@ -43,7 +43,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.preference.PreferencePage; import org.eclipse.jpt.core.JpaProject; -import org.eclipse.jpt.core.internal.JpaModelManager; +import org.eclipse.jpt.core.JptCorePlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; @@ -72,7 +72,6 @@ import org.osgi.service.prefs.BackingStoreException; import org.osgi.service.prefs.Preferences; = -(a)SuppressWarnings("restriction") public class HibernatePropertyPage extends PropertyPage { = Control[] settings; @@ -341,7 +340,7 @@ final IWorkspaceRunnable wr =3D new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - JpaModelManager.instance().rebuildJpaProject(getProject()); + JptCorePlugin.rebuildJpaProject(getProject()); getProject().build(IncrementalProjectBuilder.FULL_BUILD, monitor); } }; --===============6507872321312690602==-- From jbosstools-commits at lists.jboss.org Thu May 27 03:31:36 2010 Content-Type: multipart/mixed; boundary="===============5576778473539638633==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22360 - in branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: messages and 1 other directory. Date: Thu, 27 May 2010 03:31:36 -0400 Message-ID: <201005270731.o4R7VaIi028654@svn01.web.mwc.hst.phx2.redhat.com> --===============5576778473539638633== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-27 03:31:36 -0400 (Thu, 27 May 2010) New Revision: 22360 Modified: branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/= tools/vpe/editor/menu/InsertContributionItem.java branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/= tools/vpe/editor/menu/SetupTemplateContributionItem.java branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/= tools/vpe/messages/VpeUIMessages.java branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/= tools/vpe/messages/messages.properties Log: https://jira.jboss.org/browse/JBIDE-5996 patch for 3.1 has been applied Modified: branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org= /jboss/tools/vpe/editor/menu/InsertContributionItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss= /tools/vpe/editor/menu/InsertContributionItem.java 2010-05-27 06:55:17 UTC = (rev 22359) +++ branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss= /tools/vpe/editor/menu/InsertContributionItem.java 2010-05-27 07:31:36 UTC = (rev 22360) @@ -23,11 +23,13 @@ import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.ui.util.ModelUtilities; +import org.jboss.tools.jst.jsp.editor.IVisualContext; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor; +import org.jboss.tools.jst.jsp.jspeditor.SourceEditorPageContext; import org.jboss.tools.jst.web.tld.TaglibData; import org.jboss.tools.jst.web.tld.URIConstants; -import org.jboss.tools.vpe.editor.VpeEditorPart; -import org.jboss.tools.vpe.editor.context.VpePageContext; +import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.menu.action.ComplexAction; import org.jboss.tools.vpe.editor.menu.action.InsertAction2; import org.jboss.tools.vpe.editor.menu.action.SelectThisTagAction; @@ -42,19 +44,20 @@ */ public class InsertContributionItem extends ContributionItem { = - private final Node node; - private final StructuredTextEditor sourceEditor; - private final VpePageContext pageContext; private final static String NAME_PROPERTY =3D "name"; //$NON-NLS-1$ private final static String HIDDEN_PROPERTY =3D "hidden"; //$NON-NLS-1$ private final static String ELEMENT_TYPE_PROPERTY = - =3D "element type"; //$NON-NLS-1$ + =3D "element type"; //$NON-NLS-1$ private final static String END_TEXT_PROPERTY =3D "end text"; //$NON-NLS-= 1$ private final static String TAG_ELEMENT_TYPE =3D "macro"; //$NON-NLS-1$ private final static String TAGLIB_ELEMENT_TYPE =3D "sub-group"; //$NON-N= LS-1$ private final static String LEFT_ANGLE_BRACKET =3D "<"; //$NON-NLS-1$ private final static String RIGHT_ANGLE_BRACKET =3D ">"; //$NON-NLS-1$ - + = + private final Node node; + private final StructuredTextEditor sourceEditor; + private final JSPMultiPageEditor editor; + = /** * Creates an {@code InsertContributionItem} * to make insert actions on the currently selected node. @@ -70,12 +73,10 @@ public InsertContributionItem(final Node node) { this.node =3D node; = - final JSPMultiPageEditor editor =3D (JSPMultiPageEditor) + editor =3D (JSPMultiPageEditor) PlatformUI.getWorkbench().getActiveWorkbenchWindow() .getActivePage().getActiveEditor(); this.sourceEditor =3D editor.getSourceEditor(); - this.pageContext =3D ((VpeEditorPart) editor.getVisualEditor()) - .getController().getPageContext(); } = @Override @@ -90,7 +91,7 @@ final MenuManager paletteManuManager =3D new MenuManager( insertItem.getMessage()); final XModelObject model =3D ModelUtilities.getPreferenceModel() - .getByPath("%Palette%"); //$NON-NLS-1$ + .getByPath("%Palette%"); //$NON-NLS-1$ paletteManuManager.addMenuListener(new InsertMenuListener( model, insertItem)); paletteManuManager.setRemoveAllWhenShown(true); @@ -180,24 +181,37 @@ } = private String getPrefix(XModelObject modelObject) { - final List taglibs =3D XmlUtil.getTaglibsForNode( - (Node) ((IStructuredSelection) sourceEditor - .getSelectionProvider().getSelection()) - .getFirstElement(), pageContext); - - final String uri =3D modelObject - .getAttributeValue(URIConstants.LIBRARY_URI); - String prefix =3D null; - final TaglibData sourceNodeTaglib =3D XmlUtil - .getTaglibForURI(uri, taglibs); - - if (sourceNodeTaglib =3D=3D null) { - prefix =3D modelObject - .getAttributeValue(URIConstants.DEFAULT_PREFIX); + String prefix =3D Constants.EMPTY; + List taglibs =3D null; + /* + * Fixes https://jira.jboss.org/jira/browse/JBIDE-5996 + * Get taglibs from the SourceEditorPageContext. + */ + if (sourceEditor instanceof JSPTextEditor) { + IVisualContext context =3D ((JSPTextEditor) sourceEditor).getPageCont= ext(); + if (context instanceof SourceEditorPageContext) { + SourceEditorPageContext sourcePageContext =3D (SourceEditorPageContex= t) context; + taglibs =3D sourcePageContext.getTagLibs(); + } + } + = + if (null =3D=3D taglibs) { + VpePlugin.getDefault().logError( + VpeUIMessages.CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT); } else { - prefix =3D sourceNodeTaglib.getPrefix(); + final String uri =3D modelObject + .getAttributeValue(URIConstants.LIBRARY_URI); + = + final TaglibData sourceNodeTaglib =3D XmlUtil + .getTaglibForURI(uri, taglibs); + = + if (sourceNodeTaglib =3D=3D null) { + prefix =3D modelObject + .getAttributeValue(URIConstants.DEFAULT_PREFIX); + } else { + prefix =3D sourceNodeTaglib.getPrefix(); + } } - return prefix; } } Modified: branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org= /jboss/tools/vpe/editor/menu/SetupTemplateContributionItem.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss= /tools/vpe/editor/menu/SetupTemplateContributionItem.java 2010-05-27 06:55:= 17 UTC (rev 22359) +++ branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss= /tools/vpe/editor/menu/SetupTemplateContributionItem.java 2010-05-27 07:31:= 36 UTC (rev 22360) @@ -20,6 +20,7 @@ import org.eclipse.ui.PlatformUI; import org.eclipse.wst.sse.ui.StructuredTextEditor; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.VpeEditorPart; import org.jboss.tools.vpe.editor.context.VpePageContext; import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; @@ -35,52 +36,61 @@ public class SetupTemplateContributionItem extends ActionContributionItem { = private VpePageContext pageContext; - private StructuredTextEditor sourceEditor; + private final JSPMultiPageEditor editor; + private final VpeController vpeController; = /** - * = + * Constructor */ public SetupTemplateContributionItem() { super(new SetupTemplateAction()); - final JSPMultiPageEditor editor =3D (JSPMultiPageEditor) PlatformUI + editor =3D (JSPMultiPageEditor) PlatformUI .getWorkbench().getActiveWorkbenchWindow().getActivePage() .getActiveEditor(); this.sourceEditor =3D editor.getSourceEditor(); - this.pageContext =3D ((VpeEditorPart) editor.getVisualEditor()) - .getController().getPageContext(); + /* + * Fixes https://jira.jboss.org/jira/browse/JBIDE-5996 + * When VisualEditor is not initialized it is impossible + * to fill this menu item. + */ + this.vpeController =3D ((VpeEditorPart) editor.getVisualEditor()).getCon= troller(); + if (null !=3D vpeController) { + this.pageContext =3D vpeController.getPageContext(); + } else { + this.pageContext =3D null; + } getAction().setPageContext(pageContext); } = @Override public void fill(Menu menu, int index) { - - IStructuredSelection selection =3D (IStructuredSelection) sourceEditor + if (null !=3D vpeController) { + IStructuredSelection selection =3D (IStructuredSelection) sourceEditor .getSelectionProvider().getSelection(); - - if (selection !=3D null && selection.size() =3D=3D 1 - && selection.getFirstElement() instanceof Element) { - Element element =3D (Element) selection.getFirstElement(); - VpeElementMapping elementMapping =3D (VpeElementMapping) pageContext - .getDomMapping().getNodeMapping(element); - if (elementMapping !=3D null - && elementMapping.getTemplate() !=3D null - && elementMapping.getTemplate().getType() = - =3D=3D VpeHtmlTemplate.TYPE_ANY) { - - getAction().setText(NLS.bind( - VpeUIMessages.SETUP_TEMPLATE_FOR_MENU, - element.getNodeName())); - getAction().setActionNode(element); - getAction().setData(elementMapping.getTemplate().getAnyData()); - /* - * https://jira.jboss.org/jira/browse/JBIDE-4541 - * Index should be used as is. - */ - super.fill(menu, index); + if (selection !=3D null && selection.size() =3D=3D 1 + && selection.getFirstElement() instanceof Element) { + Element element =3D (Element) selection.getFirstElement(); + VpeElementMapping elementMapping =3D (VpeElementMapping) pageContext + .getDomMapping().getNodeMapping(element); + if (elementMapping !=3D null + && elementMapping.getTemplate() !=3D null + && elementMapping.getTemplate().getType() = + =3D=3D VpeHtmlTemplate.TYPE_ANY) { + = + getAction().setText(NLS.bind( + VpeUIMessages.SETUP_TEMPLATE_FOR_MENU, + element.getNodeName())); + getAction().setActionNode(element); + getAction().setData(elementMapping.getTemplate().getAnyData()); + /* + * https://jira.jboss.org/jira/browse/JBIDE-4541 + * Index should be used as is. + */ + super.fill(menu, index); + } } } - } = @Override Modified: branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org= /jboss/tools/vpe/messages/VpeUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss= /tools/vpe/messages/VpeUIMessages.java 2010-05-27 06:55:17 UTC (rev 22359) +++ branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss= /tools/vpe/messages/VpeUIMessages.java 2010-05-27 07:31:36 UTC (rev 22360) @@ -154,5 +154,6 @@ public static String BROWSE_BUTTON_TEXT; public static String NONE_TEMPLATES_WERE_ADDED; public static String COULD_NOT_SET_TABLE_SELECTION; + public static String CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT; = } Modified: branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org= /jboss/tools/vpe/messages/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss= /tools/vpe/messages/messages.properties 2010-05-27 06:55:17 UTC (rev 22359) +++ branches/jbosstools-3.1.x/vpe/plugins/org.jboss.tools.vpe/src/org/jboss= /tools/vpe/messages/messages.properties 2010-05-27 07:31:36 UTC (rev 22360) @@ -140,4 +140,7 @@ IMPORT_UNKNOWN_TAGS_PAGE_TITLE=3DUnknown tags templates IMPORT_UNKNOWN_TAGS_PAGE_DESCRIPTION=3DImport unknown tags templates from = external file NONE_TEMPLATES_WERE_ADDED=3DNone of the templates were added. -COULD_NOT_SET_TABLE_SELECTION=3DCould not set table selection. \ No newline at end of file +COULD_NOT_SET_TABLE_SELECTION=3DCould not set table selection. + +# Other messages +CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT=3DCannot load taglibs from PageConte= xt! --===============5576778473539638633==-- From jbosstools-commits at lists.jboss.org Thu May 27 04:09:48 2010 Content-Type: multipart/mixed; boundary="===============6499269110037149128==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22361 - branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.core/META-INF. Date: Thu, 27 May 2010 04:09:48 -0400 Message-ID: <201005270809.o4R89m7Y006604@svn01.web.mwc.hst.phx2.redhat.com> --===============6499269110037149128== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgeraskov Date: 2010-05-27 04:09:46 -0400 (Thu, 27 May 2010) New Revision: 22361 Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt= .core/META-INF/MANIFEST.MF Log: update required jpt.core library version to 2.3.0 and higher Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibern= ate.jpt.core/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.core/META-INF/MANIFEST.MF 2010-05-27 07:31:36 UTC (rev 22360) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.core/META-INF/MANIFEST.MF 2010-05-27 08:09:46 UTC (rev 22361) @@ -16,7 +16,7 @@ org.eclipse.jst.common.project.facet.core, org.eclipse.jpt.utility, org.eclipse.jpt.db, - org.eclipse.jpt.core;bundle-version=3D"[2.3.0,2.3.1)" + org.eclipse.jpt.core;bundle-version=3D"2.3.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.hibernate.jpt.core.internal, --===============6499269110037149128==-- From jbosstools-commits at lists.jboss.org Thu May 27 04:30:59 2010 Content-Type: multipart/mixed; boundary="===============0114002290414983943==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22362 - branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss/tools/jst/web/ui/wizards/project. Date: Thu, 27 May 2010 04:30:59 -0400 Message-ID: <201005270830.o4R8UxjA009650@svn01.web.mwc.hst.phx2.redhat.com> --===============0114002290414983943== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-27 04:30:58 -0400 (Thu, 27 May 2010) New Revision: 22362 Modified: branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss= /tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jboss= /tools/jst/web/ui/wizards/project/ImportWebWarWizard.java Log: fixing compilation problems under helious Modified: branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.ui/src/or= g/jboss/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jbos= s/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2010-05-27 0= 8:09:46 UTC (rev 22361) +++ branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jbos= s/tools/jst/web/ui/wizards/project/ImportWebProjectWizard.java 2010-05-27 0= 8:30:58 UTC (rev 22362) @@ -202,6 +202,14 @@ public String getNamespaceIdentifier() throws InvalidRegistryObjectExcep= tion { throw new UnsupportedOperationException("Not implemented."); //$NON-NLS= -1$ } + public String getAttribute(String attrName, String locale) + throws InvalidRegistryObjectException { + throw new UnsupportedOperationException("Not implemented."); //$NON-NLS= -1$ + } + public String getValue(String locale) + throws InvalidRegistryObjectException { + throw new UnsupportedOperationException("Not implemented."); //$NON-NLS= -1$ + } } = } Modified: branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.ui/src/or= g/jboss/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jbos= s/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java 2010-05-27 08:09= :46 UTC (rev 22361) +++ branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.ui/src/org/jbos= s/tools/jst/web/ui/wizards/project/ImportWebWarWizard.java 2010-05-27 08:30= :58 UTC (rev 22362) @@ -143,6 +143,14 @@ public String getNamespaceIdentifier() throws InvalidRegistryObjectExcep= tion { throw new UnsupportedOperationException("Not implemented."); //$NON-NLS= -1$ } + public String getAttribute(String attrName, String locale) + throws InvalidRegistryObjectException { + throw new UnsupportedOperationException("Not implemented."); //$NON-NLS= -1$ + } + public String getValue(String locale) + throws InvalidRegistryObjectException { + throw new UnsupportedOperationException("Not implemented."); //$NON-NLS= -1$ + } } = } --===============0114002290414983943==-- From jbosstools-commits at lists.jboss.org Thu May 27 05:14:28 2010 Content-Type: multipart/mixed; boundary="===============2961861763863633741==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22363 - branches/3.2.helios/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test. Date: Thu, 27 May 2010 05:14:28 -0400 Message-ID: <201005270914.o4R9ESOa020130@svn01.web.mwc.hst.phx2.redhat.com> --===============2961861763863633741== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: mareshkau Date: 2010-05-27 05:14:28 -0400 (Thu, 27 May 2010) New Revision: 22363 Modified: branches/3.2.helios/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/= tools/vpe/ui/test/VpeTest.java Log: fixing junit tests hangs up under eclipse 3.6 Modified: branches/3.2.helios/vpe/tests/org.jboss.tools.vpe.ui.test/src/org= /jboss/tools/vpe/ui/test/VpeTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss= /tools/vpe/ui/test/VpeTest.java 2010-05-27 08:30:58 UTC (rev 22362) +++ branches/3.2.helios/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss= /tools/vpe/ui/test/VpeTest.java 2010-05-27 09:14:28 UTC (rev 22363) @@ -121,20 +121,21 @@ */ @Override protected void tearDown() throws Exception { +//Has been commented by Maksim Areshkau, +//this lines was a fix for JBIDE-6197 and not needed under eclipse 3.6 = +// boolean isJobsCheck =3D true; +// while (isJobsCheck) { +// isJobsCheck =3D false; +// Job[] jobs =3D Job.getJobManager().find(null); +// for (Job job : jobs) { +// if (job instanceof StructuredRegionProcessor) { +// TestUtil.delay(50); +// isJobsCheck =3D true; +// break; +// } +// } +// } = - boolean isJobsCheck =3D true; - while (isJobsCheck) { - isJobsCheck =3D false; - Job[] jobs =3D Job.getJobManager().find(null); - for (Job job : jobs) { - if (job instanceof StructuredRegionProcessor) { - TestUtil.delay(50); - isJobsCheck =3D true; - break; - } - } - } - closeEditors(); = Platform.removeLogListener(this); --===============2961861763863633741==-- From jbosstools-commits at lists.jboss.org Thu May 27 05:15:38 2010 Content-Type: multipart/mixed; boundary="===============2540342393780805093==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22364 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor. Date: Thu, 27 May 2010 05:15:38 -0400 Message-ID: <201005270915.o4R9Fcu5020564@svn01.web.mwc.hst.phx2.redhat.com> --===============2540342393780805093== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2010-05-27 05:15:38 -0400 (Thu, 27 May 2010) New Revision: 22364 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vpe= Controller.java Log: A little code beautifying has been done. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/VpeController.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eController.java 2010-05-27 09:14:28 UTC (rev 22363) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/Vp= eController.java 2010-05-27 09:15:38 UTC (rev 22364) @@ -1120,10 +1120,9 @@ // TODO check selection and if are appear errors then // uncommented next code // reason !=3D nsISelectionListener.NO_REASON - reason =3D=3D nsISelectionListener.KEYPRESS_REASON - || reason =3D=3D nsISelectionListener.SELECTALL_REASON - || (reason & nsISelectionListener.MOUSEDOWN_REASON) =3D=3D nsISelect= ionListener.MOUSEDOWN_REASON) - { + (reason & (nsISelectionListener.KEYPRESS_REASON + | nsISelectionListener.SELECTALL_REASON + | nsISelectionListener.MOUSEDOWN_REASON)) !=3D 0) { if (VpeDebug.PRINT_VISUAL_SELECTION_EVENT) { System.out .println("<<< notifySelectionChanged: " + reason); //$NON-NLS-1$ --===============2540342393780805093==-- From jbosstools-commits at lists.jboss.org Thu May 27 05:31:25 2010 Content-Type: multipart/mixed; boundary="===============7247938398320396239==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22365 - trunk/jmx/docs/reference/en-US. Date: Thu, 27 May 2010 05:31:25 -0400 Message-ID: <201005270931.o4R9VPGw022729@svn01.web.mwc.hst.phx2.redhat.com> --===============7247938398320396239== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-27 05:31:25 -0400 (Thu, 27 May 2010) New Revision: 22365 Modified: trunk/jmx/docs/reference/en-US/master_output.xml Log:

    https://jira.jboss.org/browse/TOOLSDOC-81 -Generated master_output.xml f= ile.

    Modified: trunk/jmx/docs/reference/en-US/master_output.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/docs/reference/en-US/master_output.xml 2010-05-27 09:15:38 UT= C (rev 22364) +++ trunk/jmx/docs/reference/en-US/master_output.xml 2010-05-27 09:31:25 UT= C (rev 22365) @@ -2,15 +2,15 @@ - - - - - - - = - = +[ + + + + + + + = + = @@ -48,7 +48,7 @@ JBoss by Red Hat - Version: 1.1.0.GA + Version: 1.1.1.GA @@ -60,19 +60,47 @@ = = = - + = Introduction JBoss Tools' JMX project is= a fork of eclipse-jmx= , a project by Jeff Mesnil. It was forked with permission. + = +
    + <diffmk:wrapper diffmk:change=3D"added"= >What is JMX?</diffmk:wrapper> + +The Java Management Extensions (JMX) technology is a standard part of the = Java Platform, Standard Edition (Java SE platform). The JMX technology was = added to the platform in the Java 2 Platform, Standard Edition (J2SE) 5.0 r= elease. + + +The JMX technology provides a simple, standard way of managing resources s= uch as applications, devices, and services. Because the JMX technology is d= ynamic, you can use it to monitor and manage resources as they are created,= installed and implemented. You can also use the JMX technology to monitor = and manage the Java Virtual Machine (Java VM). + + +The JMX specification defines the architecture, design patterns, APIs, and= services in the Java programming language for management and monitoring of= applications and networks. + + +Using the JMX technology, a given resource is instrumented by one or more = Java objects known as Managed Beans, or MBeans. These MBeans are registered= in a core-managed object server, known as an MBean server. The MBean serve= r acts as a management agent and can run on most devices that have been ena= bled for the Java programming language. = + + = + +The specifications define JMX agents that you use to manage any resources = that have been correctly configured for management. A JMX agent consists of= an MBean server, in which MBeans are registered, and a set of services for= handling the MBeans. In this way, JMX agents directly control resources an= d make them available to remote management applications. + + +The way in which resources are instrumented is completely independent from= the management infrastructure. Resources can therefore be rendered managea= ble regardless of how their management applications are implemented. + + +The JMX technology defines standard connectors (known as JMX connectors) t= hat enable you to access JMX agents from remote management applications. JM= X connectors using different protocols provide the same management interfac= e. Consequently, a management application can manage resources transparentl= y, regardless of the communication protocol used. JMX agents can also be us= ed by systems or applications that are not compliant with the JMX specifica= tion, as long as those systems or applications support JMX agents. = + +Read m= ore about JMX. +
    + =
    What is JMX Tools? - JMX Tools allows to setup = multiple JMX connections and provides view - for exploring the JMX tree and execute operations directly from Eclips= e. + JBoss JMX Tools allow to setup multiple JMX connections and provide view + for exploring the JMX tree and execute operations directly from Eclips= e. = - This chapter covers the basics of working with JMX plugin, which is - used to manage Java applications through JMX and its RMI Connector. + This chapter covers the basics of working with JMX plugin, = which is + used to manage Java applications (with Managed Beans) through JMX and = its RMI Connector. =
    JMX Tools @@ -85,10 +113,10 @@
    =
    Key Features of JMX Tools - For a start, we propose you to look through the table of main fe= atures of JMX Tools: + For a start, we propos= e you to look through the table of main features of JBoss JMX Tools: = - Key Functionality for JMX Tools + <diffmk:wrapper diffmk:change=3D"changed">Key Functionality f= or JBoss JMX Tools</diffmk:wrapper> = @@ -129,14 +157,14 @@ Requirements and Installation
    Requirements - Requirements to use JMX Tools are the following: + Requirements to use JBoss JMX Tools are = the following: = - JMX Tools is develope= d on Eclipse 3.4.x milestones + JBoss JMX Tools is developed on Eclip= se 3.4.x milestones - JMX Tools requires th= at Eclipse is run on a JDK 1.5.0 or above + JBoss JMX Tools requires that Eclipse= is run on a JDK 1.5.0 or above (due to dependencies on JMX packages which were introduced in Ja= va 1.5.0) @@ -146,23 +174,22 @@ Here, we are going to explain how to install the JMX plugin into Eclipse. = - JMX Tools is one module o= f the JBoss Tools - project. JMX Tools has no dep= endency on any other part of JBoss - Tools, and can be downloaded standalone. Even though th= e JMX - Tools have no dependencies, other plugins, such as AS Tools, - do depend on the JMX Tooling and even extend it. + JBoss JMX Tools is one module of the JBoss Tools + project. JBoss JMX Tools has no dependency= on any other part of JBoss + Tools, and ca= n be downloaded as a standalone Eclipse plugin. Even though the JMX + Tools have no= dependencies on other plugins, such as AS Tools, + = JBoss JMX Tools do depend on the JMX Tooli= ng and even extend it. = - You can find the JBoss Tools plugins over at the download pages. The only - package you'll need to get is the JMX Tooling, however the AS - Tools would give you a more full experience when using = JMX with JBoss Servers. - You can find further download and installation instructions on the J= Boss Wiki in the InstallingJBossTools + You can find the JBoss JBoss Tools plugin= s over at the down= load pages. The only + package you'll need to get is the JBoss JMX Tooling, however the AS + Tools would g= ive you a wider experience and more options when using JMX with JBoss Serve= rs. + You can find further download and installation instructions on the J= Boss Wiki in the InstallingJBossTools section.
    - = - = - + = + JMX Tools Tasks This chapter will give you answers on most popular questions ask= ed by JMX @@ -170,12 +197,12 @@
    Quick Start = - To start using the JMX Tools, it's necessary to open - MBean Explorer. Go to <= emphasis>Window > Show View > Other and then select + To start using the JMX Tools it's necessary to open + MBean Explorer. Go to Window > Show View= > Other and then select MBean Explorer and clic= k OK. = - The MBean Explorer li= sts all of the domains, mbeans, attributes, and operations inside a - connection. When you double-click on a MBean in the = MBean Explorer, it opens = a multi-page + The MBean Explorer lists all the domains, mbeans, att= ributes, and operations inside a + connection. When you double-click a MBean in the MBean Explorer, it opens a multi-page editor to manage the MBean. The MB= ean Editor is composed of these pages: = @@ -194,6 +221,102 @@ =
    + = +
    + <diffmk:wrapper diffmk:change=3D"ad= ded">Managing Application</diffmk:wrapper> + + + +As i= t's been said earlier in the guide the JMX technology allows to monitor and= manage Java applications. In this section we will show you how to get conn= ected to = +a sample Java application and run the sa= yHello() method remotely from inside of the MBea= n Explorer. + + +http://java.sun.com/docs/books/tutorial/jmx/examples/jmx_examples.zip + +Save the bundle of JMX API s= ample classes, jmx_examples.zip, to your working directory +Unzip the bundle of sample classes. +Compile the example Java classes from within = where you unpacked the files directory. + + = + + +Start the M= ain app= lication, specifying the properties that expose Main for remote management:= + + = + = +If e= verything was done correctly you will see the "Waiting for incoming request= s..." message on the screen. = + + = + + Now launch the Eclipse IDE, in Eclipse open= the <= diffmk:wrapper diffmk:change=3D"added">MBean Explorer. Go to Window > Show View > O= ther and then select + MBean Explorer and click OK) + + Click the + New Connection icon = + = + = + + + + + = + in the MBean Explore= r menu + bar. + + = + In the Create JMX Connection dialog, hit Next and then= click the Advanced tab. + = + = + In the JMX= URL in= put field enter the following URL: + = + = + = +
    + <diffmk:wrapper diffmk:change=3D"added"= >JMX Connection</diffmk:wrapper> + + + <= /imagedata> + + +
    +     + = + Press Fin= ish to = esteblish the connection with the application. + + = + Now expand the connection you have just crea= ted, then open the com.example package and click= sayHello() method. + Onc= e the sayHello() method is clicked the MBean Editor is activated. + = + + = + In the MB= ean Editor go to the Operation Details section and hi= t the sayHello() button. You= will get the "Operation inoked successfully" message. = + = +
    + <diffmk:wrapper diffmk:change=3D"added"= >Ivoking Method via JMX</diffmk:wrapper> + + + + + +
    +     + = + The final step is to make sure the applica= tion worked as it was expected. Open the terminal where you launched the ap= plication in step 3. Now you see the "hello, world" message on the screen. = = + +     + + + +
    Tomcat Managing = @@ -205,42 +328,42 @@ property com.sun.management.jmxremote.s= sl is set to false. - More information to manage Tomcat can be found in Tomcat man= agement - documentation. - Instructions to manage remotely Tomcat are available in Tomc= at's monitoring - documentation. + More information to = manage Tomcat can be found in Tomcat management documentation. + Instructions to mana= ge remotely Tomcat are available in = Tomcat's monitoring documentation. = + =
    =
    Eclipse Equinox Managing = You can manage Equinox through the Equinox monitoring framew= ork. - Once you have installed the Equinox monitoring framework and= restarted Eclipse: + In= this section we will show you how to connect to an Equinox server via JBos= s JMX tools. First off, you need to make for example a simple servlet and r= un it on a server. This guide is not intended to teach you how to build app= lication and run them on the server, you can read for example this = tutorial = to get a better idea of how to build server-based applications with Eclipse= Equinox. + Once you have run an appl= ication on the server you can connect to it using JBoss JMX tools. = - + Go to Window > Open Perspecti= ve > Other - and select the JMX= perspective + and select the JMX perspective. = - + = Switch to the MBean Expl= orer by going to Window > Show View >= Other - and selecting the MBean Explorer + and = selecting the MBean Explorer. = - Click on the + Click the= New Connection<= /emphasis> icon = = = @@ -249,24 +372,34 @@ = - in the MBean Explorer menu - bar + in the MBean Explorer menu + bar. = Select the Advanced tab and set the JMX URL to - service:jmx:rmi:///jnd= i/rmi://:8118/jmxserver + service:jmx:rmi:///jndi/rmi://:8118/jmxserver. + = +
    + <diffmk:wrapper diffmk:change=3D"added"= >Using JMX Tools to Access Equinox Server</diffmk:wrapper> + + + = + + +
    +     -     + = You now have access to the MBeans exposed by Equinox.
    = = -
    - Managing JBoss Instances +
    + <diffmk:wrapper diffmk:change=3D"changed">Managing JBoss AS= </diffmk:wrapper> = Managing JBoss instances is not supported with the JMX Tools alone. You must also download and install the AS Tools portion of @@ -274,46 +407,92 @@ tooling, you cannot create a JBoss JMX connection yourself or = through the Connection Wizard. The first step is to create a JBoss Server. The full i= nstructions for this can be found in the AS Tools section, however, the short summary i= s: - + - Open the Servers view + Open the Servers view. = Right-click in the view and select New > Server - + . = In the - JBoss Community - section, select a server version + JBoss Enterprise Middleware + or in = + JB= oss Community + sect= ion, select a server version. = - If a runtime has not yet been created, you'll be pro= mpted for the - server's home directory, JDK, and configuration + If a runti= me has not yet been created, you'll be prompted for the + server's home directory, JDK, and configuration. = Finish the wizard and note that you have a new entry= in both the - Servers view an= d the MBean - Explorer + Servers view and the MBean + Explorer. = Start the server by right-clicking it and selecting = - Start + Start. - Note that once the server is started, the JMX connec= tion can be - expanded + Note that = once the server is started, the JMX connection can be + expanded. - + = Now you can explore MBeans exposed by a JBoss instance.
    + = +
    + <diffmk:wrapper diffmk:change=3D"ad= ded">Managing JBoss AS Remotely</diffmk:wrapper> + = + JBoss JMX Tool allow you to easily get access and mangane JBoss AS ser= ver remotely. = + In order to get connected to the instance of JBoss AS remotely you need = to run the server or make sure the server is lauched. = + + + + Go to + Window > Open Perspective > Oth= er + and se= lect the JMX perspective. + = + + Switch to the MBean Explorer<= /diffmk:wrapper> by goin= g to + Window > Show View > Other + and se= lecting the MBean Explorer. + + = + + Click the + New Connection icon = + = + = + + + + + = + in the MBean Explore= r menu + bar. + + = + + Select the + Advanced tab and set the JMX URL = to: = + = + = + = Please, note that in this example we connected to the local host. = + + +
    = Extension Task This section will outline how to contribute your own Server = type with some default @@ -358,9 +537,8 @@ org.jboss.tools.jmx.ui.attribute.controls - allo= ws you to map class types to some Control to present them in the MBean Editor - We hope, this guide helped you to get started wi= th the JBoss JMX Tools. = - Besides, for additional information you are welcom= e on = - JBoss forum. + We hope, this guide helped you to get started wi= th the JBoss JMX Tools. Besides, for additional information you are welcome= on JBoss forum.
    @@ -385,12 +563,12 @@ this server is in the connected state only when the server is = started. = = -
    The Default Connection +
    <diffmk:wrapper diffmk:change=3D"changed">Establis= hing Connection</diffmk:wrapper> = There are two ways to connect to an application with re= mote management enabled: = - The first step is the same for both - to connect to a M= Bean Server, click on the - + The first ste= p is the same for both - to connect to a MBean Server, click the + New Connection<= /emphasis> icon = = = @@ -404,14 +582,16 @@ Then to follow the simple one you just need to specify h= ost, port (and optionally user name and password) and click OK.<= /para> + On the Advanced tab you can set the sever name (it will be displayed in MBean Explorer), a url to the remote server. + For example, to connect to JBoss AS you need to set the JMX URL to = + + = + If it is required you c= an enter user name and password for the server connection. = + + = = - The default JMX URL is - service:jmx:rmi:///jndi/rmi://= localhost:3000/jmxrmi. - = - In case you need to connect to an application which has = not used the "standard" JMX URL - (e.g. Eclipse Equinox), you need chose more advance way, w= here it's necessary to specify - explicitly a JMX URL in the Advanced tab of the JMX Connec= tion window. - = Note Only JMX URL based on RMI are supported. @@ -422,7 +602,7 @@ = = = - + References = @@ -548,16 +728,16 @@ -
    - <diffmk:wrapper diffmk:change= =3D"added">Visual Page Editor</diffmk:wrapper> = - - - +
    + Visual Page Editor = + + + - - + + The Visual Page Editor, showing both the source an= d a visual preview simultaneously. - +
    @@ -593,7 +773,7 @@ = = - + Summary In conclusion, with this document you could easily start with JX= M Tools. --===============7247938398320396239==-- From jbosstools-commits at lists.jboss.org Thu May 27 06:25:48 2010 Content-Type: multipart/mixed; boundary="===============0466669527393165911==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22366 - trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta. Date: Thu, 27 May 2010 06:25:48 -0400 Message-ID: <201005271025.o4RAPmvT003103@svn01.web.mwc.hst.phx2.redhat.com> --===============0466669527393165911== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-27 06:25:47 -0400 (Thu, 27 May 2010) New Revision: 22366 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers.= meta Log: https://jira.jboss.org/browse/JBIDE-6359 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-not= ifiers.meta =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers= .meta 2010-05-27 09:31:25 UTC (rev 22365) +++ trunk/esb/plugins/org.jboss.tools.esb.core/resources/meta/esb-notifiers= .meta 2010-05-27 10:25:47 UTC (rev 22366) @@ -774,7 +774,8 @@ + WizardClassName=3D"%Default%" displayName=3D"Notify Email..." + kind=3D"action" name=3D"CreateTargetNotifyEmail"> --===============0466669527393165911==-- From jbosstools-commits at lists.jboss.org Thu May 27 08:35:19 2010 Content-Type: multipart/mixed; boundary="===============1612337941371612595==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22367 - branches/3.2.helios/common/tests/org.jboss.tools.common.model.ui.test/src/org/jboss/tools/common/model/ui/reporting. Date: Thu, 27 May 2010 08:35:19 -0400 Message-ID: <201005271235.o4RCZJak030164@svn01.web.mwc.hst.phx2.redhat.com> --===============1612337941371612595== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-27 08:35:18 -0400 (Thu, 27 May 2010) New Revision: 22367 Modified: branches/3.2.helios/common/tests/org.jboss.tools.common.model.ui.test/sr= c/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.java Log: https://jira.jboss.org/browse/JBIDE-6375 Fixed ReportProblemWizardTest Modified: branches/3.2.helios/common/tests/org.jboss.tools.common.model.ui.= test/src/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.= java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/common/tests/org.jboss.tools.common.model.ui.test/s= rc/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.java 2= 010-05-27 10:25:47 UTC (rev 22366) +++ branches/3.2.helios/common/tests/org.jboss.tools.common.model.ui.test/s= rc/org/jboss/tools/common/model/ui/reporting/ReportProblemWizardTest.java 2= 010-05-27 12:35:18 UTC (rev 22367) @@ -10,29 +10,29 @@ *************************************************************************= *****/ package org.jboss.tools.common.model.ui.reporting; = +import junit.framework.TestCase; + import org.eclipse.swt.widgets.Shell; import org.jboss.tools.common.model.ui.ModelUIPlugin; import org.jboss.tools.common.model.ui.wizards.query.IQueryDialog; = -import junit.extensions.ExceptionTestCase; -import junit.framework.AssertionFailedError; -import junit.framework.TestCase; - /** * @author eskimo * */ -public class ReportProblemWizardTest extends ExceptionTestCase { +public class ReportProblemWizardTest extends TestCase { = - public ReportProblemWizardTest() { - super("testReportProblemWizard", NullPointerException.class); - } //FIXME(modular) public void testReportProblemWizardFixMe() { - Shell shell =3D ModelUIPlugin.getDefault().getWorkbench().getActiveWorkb= enchWindow().getShell(); - IQueryDialog reportWiz =3D new ReportProblemWizard().createDialog(shell); - reportWiz.getDialog().setBlockOnOpen(false); - reportWiz.getDialog().open(); - reportWiz.getDialog().close(); + try { + Shell shell =3D ModelUIPlugin.getDefault().getWorkbench().getActiveWork= benchWindow().getShell(); + IQueryDialog reportWiz =3D new ReportProblemWizard().createDialog(shell= ); + reportWiz.getDialog().setBlockOnOpen(false); + reportWiz.getDialog().open(); + reportWiz.getDialog().close(); + } catch (NullPointerException e) { + return; + } + fail("Expected NullPointerException"); } -} +} \ No newline at end of file --===============1612337941371612595==-- From jbosstools-commits at lists.jboss.org Thu May 27 08:42:35 2010 Content-Type: multipart/mixed; boundary="===============8601475587494619607==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22368 - in trunk/maven/docs/maven_reference_guide/en-US: images and 1 other directories. Date: Thu, 27 May 2010 08:42:34 -0400 Message-ID: <201005271242.o4RCgY9Y030747@svn01.web.mwc.hst.phx2.redhat.com> --===============8601475587494619607== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-27 08:42:34 -0400 (Thu, 27 May 2010) New Revision: 22368 Added: trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project/ trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project= /homePage.png trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project= /modifyResources.png trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_project= /runOnServer.png Modified: trunk/maven/docs/maven_reference_guide/en-US/tasks.xml Log: TOOLSDOC-24 - maven guide - Deploy to server section = Added: trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_pro= ject/homePage.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/maven/docs/maven_reference_guide/en-US/images/de= ploy_maven_project/homePage.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_pro= ject/modifyResources.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/maven/docs/maven_reference_guide/en-US/images/de= ploy_maven_project/modifyResources.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: trunk/maven/docs/maven_reference_guide/en-US/images/deploy_maven_pro= ject/runOnServer.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/maven/docs/maven_reference_guide/en-US/images/de= ploy_maven_project/runOnServer.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/maven/docs/maven_reference_guide/en-US/tasks.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/maven/docs/maven_reference_guide/en-US/tasks.xml 2010-05-27 12:35= :18 UTC (rev 22367) +++ trunk/maven/docs/maven_reference_guide/en-US/tasks.xml 2010-05-27 12:42= :34 UTC (rev 22368) @@ -14,6 +14,7 @@ This chapter will provide you with the information on how to cre= ate mavenized projects and import already existing maven project with JBoss Maven T= ool.
    + = Creating Maven ready Seam project Maven Integration makes the S= eam Wizard capable of creating Maven ready = projects to let Maven get the libraries instead of us= ing the Seam runtime. @@ -110,6 +111,46 @@
    +
    + Deploy Maven Project to the JBoss Server + Applying Maven Integration Tools with <= property>Seam Tools make possible to handle Maven project in the same way as simple Seam project = created with Seam Tools. Also deploying to J= Boss Server is available. For this you need to make right click = on testmaven project in Package Explorer tab then select Run As > Run on Server. +
    + Run Mavenize Seam Application on Server + + + + = + +
    + In opened Run On Server wizard choose <= property>JBoss Server, click Next= . On the following page make sure that there is testma= ven-ear and testmaven-ear/resources/testmaven-ds.xml in Configured column and click Finish. +
    + Run On Server + + + + + = + +
    + = + Then Maven Integration Tool builds the = project, prepares it to the deploy and will make deployment. + + Note: + To deploy Maven EAR Seam project on= JBoss Server you need to have a latest WTP= build (current WTP 3.1.2) and need to appl= y a WTP patch - "Patches 2010 04 13" for it (it's avai= lable from Ecl= ipse P2 Web Tools Platform Repository). Without this patch you are = not able to deploy Maven EAR project to the server. + + Deploying takes a time, after that you can open in you brows= er http://localhost:8080/testmaven/ and see = Seam Project Home page. = +
    + Run Mavenize Seam Application on Server + + + + = + +
    + That's all! The Maven Seam project is d= eployed to JBoss Server. + = +
    + =
    Create new mavenized Dynamic Web Project with Portlets</tit= le> <para>Select in main <property>Eclipse</property> menu <emphasis><= property>File > New > --===============8601475587494619607==-- From jbosstools-commits at lists.jboss.org Thu May 27 08:43:38 2010 Content-Type: multipart/mixed; boundary="===============1711052127508277762==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22369 - branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org/jboss/tools/jst/web/tiles/ui/editor/figures. Date: Thu, 27 May 2010 08:43:38 -0400 Message-ID: <201005271243.o4RChctN030774@svn01.web.mwc.hst.phx2.redhat.com> --===============1711052127508277762== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-27 08:43:37 -0400 (Thu, 27 May 2010) New Revision: 22369 Modified: branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/org= /jboss/tools/jst/web/tiles/ui/editor/figures/TilesDiagramLayout.java Log: https://jira.jboss.org/browse/JBIDE-6377 Fixed compile error. Modified: branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.tiles.ui/= src/org/jboss/tools/jst/web/tiles/ui/editor/figures/TilesDiagramLayout.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/or= g/jboss/tools/jst/web/tiles/ui/editor/figures/TilesDiagramLayout.java 2010-= 05-27 12:42:34 UTC (rev 22368) +++ branches/3.2.helios/jst/plugins/org.jboss.tools.jst.web.tiles.ui/src/or= g/jboss/tools/jst/web/tiles/ui/editor/figures/TilesDiagramLayout.java 2010-= 05-27 12:43:37 UTC (rev 22369) @@ -9,15 +9,24 @@ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation *************************************************************************= *****/ = package org.jboss.tools.jst.web.tiles.ui.editor.figures; -import org.eclipse.draw2d.*; -import org.eclipse.draw2d.geometry.*; +import java.util.Comparator; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.TreeSet; +import java.util.Vector; = +import org.eclipse.draw2d.AbstractLayout; +import org.eclipse.draw2d.IFigure; +import org.eclipse.draw2d.geometry.Dimension; +import org.eclipse.draw2d.geometry.Point; +import org.eclipse.draw2d.geometry.Rectangle; import org.jboss.tools.jst.web.tiles.ui.editor.edit.DefinitionEditPart; import org.jboss.tools.jst.web.tiles.ui.editor.model.IDefinition; import org.jboss.tools.jst.web.tiles.ui.editor.model.ITilesOptions; = -import java.util.*; - public class TilesDiagramLayout extends AbstractLayout{ Dimension dim =3D new Dimension(0,0); Hashtable<IDefinition,Rectangle> figureDim =3D new Hashtable<IDefinition,= Rectangle>(); --===============1711052127508277762==-- From jbosstools-commits at lists.jboss.org Thu May 27 10:06:41 2010 Content-Type: multipart/mixed; boundary="===============2200353411812118424==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22370 - in branches/3.2.helios/hibernatetools/plugins: org.jboss.tools.hibernate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java and 2 other directories. Date: Thu, 27 May 2010 10:06:41 -0400 Message-ID: <201005271406.o4RE6fRZ020684@svn01.web.mwc.hst.phx2.redhat.com> --===============2200353411812118424== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgeraskov Date: 2010-05-27 10:06:40 -0400 (Thu, 27 May 2010) New Revision: 22370 Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt= .core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrateg= yMappingTools.java branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt= .core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/Hibernat= eJavaJoinColumnImpl.java branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt= .core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/Hibernate= OrmJoinColumnImpl.java branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt= .ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCom= bo.java branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt= .ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/DatabaseO= bjectCombo.java branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jpt= .ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableComb= o.java Log: move to updated api Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibern= ate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/Naming= StrategyMappingTools.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrate= gyMappingTools.java 2010-05-27 12:43:37 UTC (rev 22369) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/NamingStrate= gyMappingTools.java 2010-05-27 14:06:40 UTC (rev 22370) @@ -111,7 +111,7 @@ } String prefix =3D owner.getAttributeName(); if (prefix =3D=3D null) { - Entity targetEntity =3D owner.getTargetEntity(); + Entity targetEntity =3D owner.getRelationshipTarget(); if (targetEntity =3D=3D null) { return null; } Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibern= ate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/H= ibernateJavaJoinColumnImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/Hiberna= teJavaJoinColumnImpl.java 2010-05-27 12:43:37 UTC (rev 22369) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/java/Hiberna= teJavaJoinColumnImpl.java 2010-05-27 14:06:40 UTC (rev 22370) @@ -54,7 +54,7 @@ if (this.getOwner().joinColumnsSize() !=3D 1) { return null; } - Entity targetEntity =3D this.getOwner().getTargetEntity(); + Entity targetEntity =3D this.getOwner().getRelationshipTarget(); if (targetEntity =3D=3D null) { return null; } Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibern= ate.jpt.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/Hi= bernateOrmJoinColumnImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/Hibernat= eOrmJoinColumnImpl.java 2010-05-27 12:43:37 UTC (rev 22369) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.core/src/org/jboss/tools/hibernate/jpt/core/internal/context/orm/Hibernat= eOrmJoinColumnImpl.java 2010-05-27 14:06:40 UTC (rev 22370) @@ -117,7 +117,7 @@ if (this.getOwner().joinColumnsSize() !=3D 1) { return null; } - Entity targetEntity =3D this.getOwner().getTargetEntity(); + Entity targetEntity =3D this.getOwner().getRelationshipTarget(); if (targetEntity =3D=3D null) { return null; } Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibern= ate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/Co= lumnCombo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCo= mbo.java 2010-05-27 12:43:37 UTC (rev 22369) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/ColumnCo= mbo.java 2010-05-27 14:06:40 UTC (rev 22370) @@ -38,15 +38,6 @@ super(parentPane, subjectHolder, parent); } = - public ColumnCombo( - PropertyValueModel<? extends T> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - = - super(subjectHolder, parent, widgetFactory); - } - = - = @Override protected Iterable<String> getValues_() { Table dbTable =3D this.getDbTable(); Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibern= ate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/Da= tabaseObjectCombo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/Database= ObjectCombo.java 2010-05-27 12:43:37 UTC (rev 22369) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/Database= ObjectCombo.java 2010-05-27 14:06:40 UTC (rev 22370) @@ -74,16 +74,8 @@ = super(parentPane, subjectHolder, parent); } + = - protected DatabaseObjectCombo( - PropertyValueModel<? extends T> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - = - super(subjectHolder, parent, widgetFactory); - } - = - = // ********** initialization ********** = @Override Modified: branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibern= ate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/Ta= bleCombo.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCom= bo.java 2010-05-27 12:43:37 UTC (rev 22369) +++ branches/3.2.helios/hibernatetools/plugins/org.jboss.tools.hibernate.jp= t.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mappings/db/xpl/TableCom= bo.java 2010-05-27 14:06:40 UTC (rev 22370) @@ -38,15 +38,6 @@ super(parentPane, subjectHolder, parent); } = - public TableCombo( - PropertyValueModel<? extends T> subjectHolder, - Composite parent, - WidgetFactory widgetFactory) { - = - super(subjectHolder, parent, widgetFactory); - } - = - = @Override protected Iterable<String> getValues_() { Schema dbSchema =3D this.getDbSchema(); --===============2200353411812118424==-- From jbosstools-commits at lists.jboss.org Thu May 27 10:15:44 2010 Content-Type: multipart/mixed; boundary="===============8896629348128497139==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22371 - trunk/build. Date: Thu, 27 May 2010 10:15:44 -0400 Message-ID: <201005271415.o4REFiq0021602@svn01.web.mwc.hst.phx2.redhat.com> --===============8896629348128497139== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-27 10:15:43 -0400 (Thu, 27 May 2010) New Revision: 22371 Modified: trunk/build/publish.sh Log: add more rsync - copy renamed *Update*.zip files too Modified: trunk/build/publish.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/publish.sh 2010-05-27 14:06:40 UTC (rev 22370) +++ trunk/build/publish.sh 2010-05-27 14:15:43 UTC (rev 22371) @@ -10,6 +10,7 @@ # copy into workspace for archiving rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME} rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME= }/${ZIPNAME} +rsync -aq ${WORKSPACE}/*/*/site/target/*Update*.zip ${WORKSPACE}/site/${JO= B_NAME}/ = # copy into workspace for access by bucky aggregator rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME} --===============8896629348128497139==-- From jbosstools-commits at lists.jboss.org Thu May 27 11:29:14 2010 Content-Type: multipart/mixed; boundary="===============8113785881138753844==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22373 - trunk/seam/plugins/org.jboss.tools.seam.ui. Date: Thu, 27 May 2010 11:29:14 -0400 Message-ID: <201005271529.o4RFTEp3003465@svn01.web.mwc.hst.phx2.redhat.com> --===============8113785881138753844== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-27 11:29:14 -0400 (Thu, 27 May 2010) New Revision: 22373 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml Log: pom and manifest version must match =3D=3D 3.1.0.x Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml 2010-05-27 15:01:37 = UTC (rev 22372) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/pom.xml 2010-05-27 15:29:14 = UTC (rev 22373) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.seam.ui</artifactId> = - <version>2.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> --===============8113785881138753844==-- From jbosstools-commits at lists.jboss.org Thu May 27 11:30:35 2010 Content-Type: multipart/mixed; boundary="===============1534979324836046849==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22374 - trunk/seam/features/org.jboss.tools.seam.feature. Date: Thu, 27 May 2010 11:30:35 -0400 Message-ID: <201005271530.o4RFUZUl003907@svn01.web.mwc.hst.phx2.redhat.com> --===============1534979324836046849== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-27 11:30:35 -0400 (Thu, 27 May 2010) New Revision: 22374 Modified: trunk/seam/features/org.jboss.tools.seam.feature/pom.xml Log: fix pom/manifest versions Modified: trunk/seam/features/org.jboss.tools.seam.feature/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/features/org.jboss.tools.seam.feature/pom.xml 2010-05-27 15:= 29:14 UTC (rev 22373) +++ trunk/seam/features/org.jboss.tools.seam.feature/pom.xml 2010-05-27 15:= 30:35 UTC (rev 22374) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.seam.feature</artifactId> = - <version>1.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> --===============1534979324836046849==-- From jbosstools-commits at lists.jboss.org Thu May 27 11:31:26 2010 Content-Type: multipart/mixed; boundary="===============5099845034203832957==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22375 - trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/common/model/filesystems/impl. Date: Thu, 27 May 2010 11:31:26 -0400 Message-ID: <201005271531.o4RFVQDP003967@svn01.web.mwc.hst.phx2.redhat.com> --===============5099845034203832957== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-27 11:31:26 -0400 (Thu, 27 May 2010) New Revision: 22375 Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/filesystems/impl/JarAccessFactory.java Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/filesystems/impl/JarAccess.java trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/co= mmon/model/filesystems/impl/JarSystemImpl.java Log: https://jira.jboss.org/browse/JBIDE-6372 Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/filesystems/impl/JarAccess.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/filesystems/impl/JarAccess.java 2010-05-27 15:30:35 UTC (rev 22= 374) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/filesystems/impl/JarAccess.java 2010-05-27 15:31:26 UTC (rev 22= 375) @@ -18,13 +18,16 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.Map; import java.util.Set; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; = +import org.eclipse.core.resources.IProject; import org.jboss.tools.common.model.XModelObjectConstants; import org.jboss.tools.common.model.plugin.ModelPlugin; +import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.util.FileUtil; = public class JarAccess { @@ -274,6 +277,56 @@ return templocation; } = + JarSystemImpl main =3D null; + Set<JarSystemImpl> slaves =3D new HashSet<JarSystemImpl>(); + + public JarSystemImpl getMain() { + IProject p =3D EclipseResourceUtil.getProject(main); + if(p =3D=3D null || !p.isAccessible() || main.getParent() =3D=3D null) { + main =3D null; + synchronized(slaves) { + Iterator<JarSystemImpl> it =3D slaves.iterator(); + while(it.hasNext()) { + JarSystemImpl s =3D it.next(); + p =3D EclipseResourceUtil.getProject(s); + if(p =3D=3D null || !p.isAccessible() || s.getParent() =3D=3D null) { + it.remove(); + } else if(main =3D=3D null) { + main =3D s; + it.remove(); + } = + } = + } + if(main !=3D null) main.jarUpdated(); + JarSystemImpl[] ss =3D getSlaves(); + for (JarSystemImpl s: ss) s.jarUpdated(); + } + return main; + } + + public void setMain(JarSystemImpl main) { + this.main =3D main; + } + + public JarSystemImpl[] getSlaves() { + synchronized(slaves) { + return slaves.toArray(new JarSystemImpl[slaves.size()]); + } + } + + public void addSlave(JarSystemImpl s) { + if(main =3D=3D null) { + main =3D s; + } else { + synchronized(slaves) { + slaves.add(s); + } + } + } + + public boolean isSlave(JarSystemImpl s) { + return slaves.contains(s); + } } = class LFileObjectJarImpl implements LFileObject { Added: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tool= s/common/model/filesystems/impl/JarAccessFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/filesystems/impl/JarAccessFactory.java = (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/filesystems/impl/JarAccessFactory.java 2010-05-27 15:31:26 UTC = (rev 22375) @@ -0,0 +1,24 @@ +package org.jboss.tools.common.model.filesystems.impl; + +import java.util.HashMap; +import java.util.Map; + +public class JarAccessFactory { + = + static Map<String, JarAccess> jars =3D new HashMap<String, JarAccess>(); + + public static JarAccess getJarAccess(String location, JarSystemImpl conte= xt) { + JarAccess jar =3D jars.get(location); + if(jar =3D=3D null) { + jar =3D new JarAccess(); + jar.setMain(context); + jar.setLocation(location); + jars.put(location, jar); + } + if(context !=3D jar.getMain()) { + jar.addSlave(context); + } + return jar; + } + +} Property changes on: trunk/common/plugins/org.jboss.tools.common.model/src/= org/jboss/tools/common/model/filesystems/impl/JarAccessFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/t= ools/common/model/filesystems/impl/JarSystemImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/filesystems/impl/JarSystemImpl.java 2010-05-27 15:30:35 UTC (re= v 22374) +++ trunk/common/plugins/org.jboss.tools.common.model/src/org/jboss/tools/c= ommon/model/filesystems/impl/JarSystemImpl.java 2010-05-27 15:31:26 UTC (re= v 22375) @@ -10,12 +10,14 @@ *************************************************************************= *****/ = package org.jboss.tools.common.model.filesystems.impl; = +import java.util.Set; + import org.jboss.tools.common.model.*; import org.jboss.tools.common.model.util.*; = public class JarSystemImpl extends JarFolderImpl implements org.jboss.tool= s.common.model.filesystems.FileSystem { private static final long serialVersionUID =3D 7958999759019059243L; - protected JarAccess jar =3D new JarAccess(); + protected JarAccess jar =3D null; = public JarSystemImpl() {} = @@ -28,6 +30,9 @@ } = protected JarAccess getJarAccess() { + if(jar =3D=3D null) { + jar =3D JarAccessFactory.getJarAccess(getLocation(), this); + } return jar; } = @@ -38,15 +43,32 @@ protected String getAbsolutePath() { return ""; //$NON-NLS-1$ } + = + boolean loaded2 =3D false; = protected void loadChildren() { - if(jar.isLoaded()) return; +// if(jar.isLoaded()) return; + + if(this !=3D getJarAccess().getMain()) return; + if(loaded2) return; + loaded2 =3D true; + synchronized (this) { jar.setLocation(getLocation()); super.loadChildren(); } } = + public XModelObject[] getChildren() { + JarSystemImpl main =3D getJarAccess().getMain(); + return (main =3D=3D this || main =3D=3D null) ? super.getChildren() := main.getChildren(); + } + + public XModelObject getChildByPathPart(String pathpart) { + JarSystemImpl main =3D getJarAccess().getMain(); + return (main =3D=3D this || main =3D=3D null) ? super.getChildByPathP= art(pathpart) : main.getChildByPathPart(pathpart); + } + public String getPathPart() { return name(); } @@ -56,29 +78,44 @@ } = public String getTempLocation() { - if(!jar.isLoaded()) loadChildren(); + JarSystemImpl main =3D getJarAccess().getMain(); + if(main !=3D this && main !=3D null) { + main.getChildren(); + } else if(!jar.isLoaded()) { + loadChildren(); + } String s =3D jar.getTempLocation(); return (s =3D=3D null) ? get(XModelObjectConstants.ATTR_NAME_LOCAT= ION) : s; } = public LFileObject getFileObject(String relpath) { - return jar.getFileObject(name(), relpath); + return getJarAccess().getFileObject(name(), relpath); } = public boolean update() { + if(getJarAccess().getMain() !=3D this) return true; + if(jar.isModified()) { if(jar.isLoaded()) { XModelObject[] cs =3D getChildren(); for (int i =3D 0; i < cs.length; i++) removeChild_0(cs[i]); jar.invalidate(); } - loaded =3D false; - fire =3D true; - fireStructureChanged(3, null); + jarUpdated(); + + JarSystemImpl[] ss =3D getJarAccess().getSlaves(); + for (JarSystemImpl s: ss) s.jarUpdated(); } return true; } = + public void jarUpdated() { + loaded =3D false; + loaded2 =3D false; + fire =3D true; + fireStructureChanged(3, null); + } + public String getPresentationString() { String location =3D getLocation(); if(location !=3D null) { --===============5099845034203832957==-- From jbosstools-commits at lists.jboss.org Thu May 27 11:47:32 2010 Content-Type: multipart/mixed; boundary="===============4350837581165243804==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22376 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 2 other directories. Date: Thu, 27 May 2010 11:47:32 -0400 Message-ID: <201005271547.o4RFlWs2006188@svn01.web.mwc.hst.phx2.redhat.com> --===============4350837581165243804== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-27 11:47:31 -0400 (Thu, 27 May 2010) New Revision: 22376 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/BeanSpecializationTest.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/CDICoreTestSuite.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/TCKTest.java Log: https://jira.jboss.org/browse/JBIDE-5808 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDIUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-27 15:31:26 UTC (rev 22375) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-27 15:47:31 UTC (rev 22376) @@ -216,32 +216,55 @@ } = /** - * Return @Named declaration or the stereotype declaration if it declares + * Return @Named declaration or the stereotype declaration if it declares= @Named. * = - * @Named. + * @param stereotyped + * @return + */ + public static IAnnotationDeclaration getNamedDeclaration(IBean bean) { + return getQualifierDeclaration(bean, CDIConstants.NAMED_QUALIFIER_TYPE_N= AME); + } + + /** + * Return the qualifier declaration or the stereotype or @Specializes dec= laration if it declares this qualifier. * = * @param stereotyped * @return */ - public static IAnnotationDeclaration getNamedDeclaration(IBean bean) { - IAnnotationDeclaration declaration =3D bean.getAnnotation(CDIConstants.N= AMED_QUALIFIER_TYPE_NAME); + public static IAnnotationDeclaration getQualifierDeclaration(IBean bean, = String qualifierTypeName) { + IAnnotationDeclaration declaration =3D bean.getAnnotation(qualifierTypeN= ame); if (declaration =3D=3D null) { - return getNamedStereotypeDeclaration(bean); + declaration =3D getQualifiedStereotypeDeclaration(bean, qualifierTypeNa= me); } + if(declaration =3D=3D null) { + declaration =3D getQualifiedSpecializesDeclaration(bean, qualifierTypeN= ame); + } return declaration; } = /** - * Return the stereotype declaration which declares @Named. + * Returns the @Specializes declaration of the bean if the specialized be= an declares the given qualifier. * = + * @param bean + * @param qualifierTypeName + * @return + */ + public static IAnnotationDeclaration getQualifiedSpecializesDeclaration(I= Bean bean, String qualifierTypeName) { + IBean specializedBean =3D bean.getSpecializedBean(); + return specializedBean!=3Dnull?getQualifierDeclaration(bean, qualifierTy= peName):null; + } + + /** + * Return the stereotype declaration which declares the given qualifier. + * = * @param stereotyped * @return */ - public static IAnnotationDeclaration getNamedStereotypeDeclaration(IStere= otyped stereotyped) { + public static IAnnotationDeclaration getQualifiedStereotypeDeclaration(IS= tereotyped stereotyped, String qualifierTypeName) { Set<IStereotypeDeclaration> declarations =3D stereotyped.getStereotypeDe= clarations(); for (IStereotypeDeclaration declaration : declarations) { - if (CDIConstants.NAMED_QUALIFIER_TYPE_NAME.equals(declaration.getType()= .getFullyQualifiedName()) - || getNamedStereotypeDeclaration(declaration.getStereotype()) !=3D nu= ll) { + if (qualifierTypeName.equals(declaration.getType().getFullyQualifiedNam= e()) + || getQualifiedStereotypeDeclaration(declaration.getStereotype(), qua= lifierTypeName) !=3D null) { return declaration; } } @@ -249,6 +272,16 @@ } = /** + * Return the stereotype declaration which declares @Named. + * = + * @param stereotyped + * @return + */ + public static IAnnotationDeclaration getNamedStereotypeDeclaration(IStere= otyped stereotyped) { + return getQualifiedStereotypeDeclaration(stereotyped, CDIConstants.NAMED= _QUALIFIER_TYPE_NAME); + } + + /** * Returns all found annotations for parameters of the method. * = * @param method Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-27 15:31:26 UTC (rev 22375) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-27 15:47:31 UTC (rev 22376) @@ -126,6 +126,12 @@ - X specializes Y and Y has a name and X declares a name explicitly, using= @Named - interceptor or decorator is annotated @Specializes (Non-Portable behavio= r) = + + + + + + 5.2.2. Legal injection point types - injection point type is a type variable = Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/CDICoreTestSuite.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/CDICoreTestSuite.java 2010-05-27 15:31:26 UTC (rev 22375) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/CDICoreTestSuite.java 2010-05-27 15:47:31 UTC (rev 22376) @@ -23,6 +23,7 @@ import org.jboss.tools.cdi.core.test.tck.ProducerMethodDefinitionTest; import org.jboss.tools.cdi.core.test.tck.QualifierDefinitionTest; import org.jboss.tools.cdi.core.test.tck.ScopeDefinitionTest; +import org.jboss.tools.cdi.core.test.tck.BeanSpecializationTest; import org.jboss.tools.cdi.core.test.tck.StereotypeDefinitionTest; import org.jboss.tools.cdi.core.test.tck.StereotypeInheritenceTest; import org.jboss.tools.cdi.core.test.tck.ValidationTest; @@ -46,6 +47,7 @@ suite.addTestSuite(StereotypeInheritenceTest.class); suite.addTestSuite(ProducerMethodDefinitionTest.class); suite.addTestSuite(InjectionPointTest.class); + suite.addTestSuite(BeanSpecializationTest.class); suite.addTestSuite(ValidationTest.class); return suite; } Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cd= i/core/test/tck/BeanSpecializationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/BeanSpecializationTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/BeanSpecializationTest.java 2010-05-27 15:47:31 UTC (rev 22376) @@ -0,0 +1,84 @@ +/*************************************************************************= ****** = + * 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.cdi.core.test.tck; + +import java.util.Set; + +import org.eclipse.jdt.core.JavaModelException; +import org.jboss.tools.cdi.core.IBean; + +/** + * @author Alexey Kazakov + */ +public class BeanSpecializationTest extends TCKTest { + + /** + * Section 4.3.1 - Direct and indirect specialization + * j) A bean X that specializes bean Y will include all qualifiers of Y, = together with all qualifiers declared explicitly by X. + * = + * @throws JavaModelException + */ + public void testSimpleSpecializingBeanHasQualifiersOfSpecializedAndSpecia= lizingBean() throws JavaModelException { + Set<IBean> beans =3D cdiProject.getBeans(true, "org.jboss.jsr299.tck.tes= ts.inheritance.specialization.simple.LazyFarmer", "org.jboss.jsr299.tck.tes= ts.inheritance.specialization.simple.Landowner"); + assertEquals("Wrong number of beans.", 1, beans.size()); + IBean bean =3D beans.iterator().next(); + assertContainsBeanType(bean, "org.jboss.jsr299.tck.tests.inheritance.spe= cialization.simple.Farmer"); + assertContainsQualifierType(true, bean, + "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.Landowne= r", + "org.jboss.jsr299.tck.tests.inheritance.specialization.simple.Lazy", + "javax.enterprise.inject.Any", + "javax.inject.Named"); + } + + /** + * Section 4.3.1 - Direct and indirect specialization + * j) A bean X that specializes bean Y will include all qualifiers of Y, = together with all qualifiers declared explicitly by X. + * = + * @throws JavaModelException + */ + public void testEnterpriseSpecializingBeanHasQualifiersOfSpecializedAndSp= ecializingBean() throws JavaModelException { + Set<IBean> beans =3D cdiProject.getBeans(true, "org.jboss.jsr299.tck.tes= ts.inheritance.specialization.enterprise.LazyFarmerLocal", "org.jboss.jsr29= 9.tck.tests.inheritance.specialization.enterprise.Landowner"); + assertEquals("Wrong number of beans.", 1, beans.size()); + IBean bean =3D beans.iterator().next(); + assertContainsBeanType(bean, "org.jboss.jsr299.tck.tests.inheritance.spe= cialization.enterprise.FarmerLocal"); + assertContainsQualifierType(true, bean, + "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.Land= owner", + "org.jboss.jsr299.tck.tests.inheritance.specialization.enterprise.Lazy= ", + "javax.enterprise.inject.Any", + "javax.inject.Named"); + } + + /** + * Section 4.3.1 - Direct and indirect specialization + * k) A bean X that specializes bean Y will have the same name as Y if Y = has a name. + * = + * @throws JavaModelException + */ + public void testSimpleSpecializingBeanHasNameOfSpecializedBean() throws J= avaModelException { + Set<IBean> beans =3D cdiProject.getBeans(true, "org.jboss.jsr299.tck.tes= ts.inheritance.specialization.simple.LazyFarmer", "org.jboss.jsr299.tck.tes= ts.inheritance.specialization.simple.Landowner"); + assertEquals("Wrong number of beans.", 1, beans.size()); + IBean bean =3D beans.iterator().next(); + assertEquals("Incorrect bean name", "farmer", bean.getName()); + } + + /** + * Section 4.3.1 - Direct and indirect specialization + * k) A bean X that specializes bean Y will have the same name as Y if Y = has a name. + * = + * @throws JavaModelException + */ + public void testEnterpriseSpecializingBeanHasNameOfSpecializedBean() thro= ws JavaModelException { + Set<IBean> beans =3D cdiProject.getBeans(true, "org.jboss.jsr299.tck.tes= ts.inheritance.specialization.enterprise.LazyFarmerLocal", "org.jboss.jsr29= 9.tck.tests.inheritance.specialization.enterprise.Landowner"); + assertEquals("Wrong number of beans.", 1, beans.size()); + IBean bean =3D beans.iterator().next(); + assertEquals("Incorrect bean name", "farmer", bean.getName()); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/= jboss/tools/cdi/core/test/tck/BeanSpecializationTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/TCKTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/TCKTest.java 2010-05-27 15:31:26 UTC (rev 22375) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/TCKTest.java 2010-05-27 15:47:31 UTC (rev 22376) @@ -2,7 +2,6 @@ = import java.io.File; import java.io.FileFilter; -import java.util.HashSet; import java.util.Set; = import junit.framework.TestCase; @@ -24,8 +23,6 @@ import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IClassBean; -import org.jboss.tools.cdi.core.IInjectionPoint; -import org.jboss.tools.cdi.core.IInjectionPointParameter; import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.core.IQualifierDeclaration; @@ -254,17 +251,33 @@ fail(bean.getResource().getFullPath() + " bean (qualifiers - " + allType= s.toString() + ") should have the qualifier declaration with " + typeName += " type."); } = - public static void assertContainsQualifierType(IBean bean, String typeNam= e) { + public static void assertContainsQualifierType(IBean bean, String... type= Names) { + assertContainsQualifierType(false, bean, typeNames); + } + + public static void assertContainsQualifierType(boolean theNumbersOfQualif= ierShouldBeTheSame, IBean bean, String... typeNames) { Set<IQualifier> qualifiers =3D bean.getQualifiers(); + + if(theNumbersOfQualifierShouldBeTheSame) { + assertEquals("Defferent numbers of qualifiers", typeNames.length, quali= fiers.size()); + } + StringBuffer allTypes =3D new StringBuffer("["); for (IQualifier qualifier : qualifiers) { allTypes.append(" ").append(qualifier.getSourceType().getFullyQualified= Name()).append(";"); - if (typeName.equals(qualifier.getSourceType().getFullyQualifiedName()))= { - return; + } + allTypes.append("]"); + + for (String typeName : typeNames) { + boolean found =3D false; + for (IQualifier qualifier : qualifiers) { + if (typeName.equals(qualifier.getSourceType().getFullyQualifiedName())= ) { + found =3D true; + break; + } } + assertTrue(bean.getResource().getFullPath() + " bean (qualifiers - " + = allTypes.toString() + ") should have the qualifier with " + typeName + " ty= pe.", found); } - allTypes.append("]"); - fail(bean.getResource().getFullPath() + " bean (qualifiers - " + allType= s.toString() + ") should have the qualifier with " + typeName + " type."); } = public static void assertLocationEquals(ITextSourceReference reference, i= nt startPosition, int length) { --===============4350837581165243804==-- From jbosstools-commits at lists.jboss.org Thu May 27 11:47:46 2010 Content-Type: multipart/mixed; boundary="===============6537650602709342254==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22377 - trunk/build. Date: Thu, 27 May 2010 11:47:46 -0400 Message-ID: <201005271547.o4RFlkvZ006199@svn01.web.mwc.hst.phx2.redhat.com> --===============6537650602709342254== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-27 11:47:46 -0400 (Thu, 27 May 2010) New Revision: 22377 Modified: trunk/build/build.xml Log: lowercase the prefix on update site zips so they're consistent w/ the other= ones = Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-27 15:47:31 UTC (rev 22376) +++ trunk/build/build.xml 2010-05-27 15:47:46 UTC (rev 22377) @@ -949,7 +949,7 @@ <equals arg1=3D"@{COMPONENT}" arg2=3D"site" /> <then> <var name=3D"destinationZip" - value=3D"${WORKINGDIR}/@{COMPONENT}/site/target/JBossTools-AL= L-Update-SNAPSHOT.zip" + value=3D"${WORKINGDIR}/@{COMPONENT}/site/target/jbosstools-AL= L-Update-SNAPSHOT.zip" /> </then> <else> @@ -964,7 +964,7 @@ </else> </if> <var name=3D"destinationZip" - value=3D"${WORKINGDIR}/@{COMPONENT}/site/target/JBossTools-${= COMPONENT.name}-Update-SNAPSHOT.zip" + value=3D"${WORKINGDIR}/@{COMPONENT}/site/target/jbosstools-${= COMPONENT.name}-Update-SNAPSHOT.zip" /> </else> </if> @@ -979,7 +979,7 @@ = <for param=3D"updateZip"> <path> - <fileset dir=3D"${WORKINGDIR}/@{COMPONENT}" includes=3D"**/JBossTool= s*Update*.zip" /> + <fileset dir=3D"${WORKINGDIR}/@{COMPONENT}" includes=3D"**/jbosstool= s*Update*.zip" /> </path> <sequential> <propertyregex property=3D"updateZip" @@ -1095,7 +1095,7 @@ <equals arg1=3D"${update.site.path}" arg2=3D"site" /> <then> <var name=3D"destinationZip" - value=3D"${WORKINGDIR}/${update.site.path}/target/JBossTools-ALL-= Update-SNAPSHOT.zip" + value=3D"${WORKINGDIR}/${update.site.path}/target/jbosstools-ALL-= Update-SNAPSHOT.zip" /> </then> <else> @@ -1110,7 +1110,7 @@ </else> </if> <var name=3D"destinationZip" - value=3D"${WORKINGDIR}/${update.site.path}/target/JBossTools-${CO= MPONENT.name}-Update-SNAPSHOT.zip" + value=3D"${WORKINGDIR}/${update.site.path}/target/jbosstools-${CO= MPONENT.name}-Update-SNAPSHOT.zip" /> </else> </if> --===============6537650602709342254==-- From jbosstools-commits at lists.jboss.org Thu May 27 11:57:11 2010 Content-Type: multipart/mixed; boundary="===============3192762136960788670==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22378 - trunk/seam/tests/org.jboss.tools.seam.ui.bot.test. Date: Thu, 27 May 2010 11:57:11 -0400 Message-ID: <201005271557.o4RFvB6b007238@svn01.web.mwc.hst.phx2.redhat.com> --===============3192762136960788670== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-27 11:57:11 -0400 (Thu, 27 May 2010) New Revision: 22378 Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml Log: fix pom/manifest versions Modified: trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml 2010-05-27 15= :47:46 UTC (rev 22377) +++ trunk/seam/tests/org.jboss.tools.seam.ui.bot.test/pom.xml 2010-05-27 15= :57:11 UTC (rev 22378) @@ -9,6 +9,6 @@ </parent> <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.seam.ui.bot.test</artifactId> = - <version>1.0.0-SNAPSHOT</version> + <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project> --===============3192762136960788670==-- From jbosstools-commits at lists.jboss.org Thu May 27 12:05:30 2010 Content-Type: multipart/mixed; boundary="===============1726973001448732995==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22379 - trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF. Date: Thu, 27 May 2010 12:05:29 -0400 Message-ID: <201005271605.o4RG5Tft014348@svn01.web.mwc.hst.phx2.redhat.com> --===============1726973001448732995== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-27 12:05:29 -0400 (Thu, 27 May 2010) New Revision: 22379 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.= MF Log: drop range from manifest Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MA= NIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST= .MF 2010-05-27 15:57:11 UTC (rev 22378) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST= .MF 2010-05-27 16:05:29 UTC (rev 22379) @@ -6,12 +6,12 @@ Bundle-Activator: org.jboss.tools.drools.ui.bot.test.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, - org.jboss.tools.jst.ui.bot.test;bundle-version=3D"1.0.0", + org.jboss.tools.jst.ui.bot.test, org.eclipse.swtbot.eclipse.core;bundle-version=3D"2.0.0", org.eclipse.swtbot.eclipse.finder;bundle-version=3D"2.0.0", org.eclipse.swtbot.swt.finder;bundle-version=3D"2.0.0", org.junit4;bundle-version=3D"4.5.0", - org.jboss.tools.ui.bot.ext;bundle-version=3D"1.0.0", + org.jboss.tools.ui.bot.ext, org.drools.eclipse;bundle-version=3D"5.1.0", org.eclipse.swtbot.eclipse.gef.finder;bundle-version=3D"0.1.0", org.apache.log4j;bundle-version=3D"1.2.13" --===============1726973001448732995==-- From jbosstools-commits at lists.jboss.org Thu May 27 12:41:39 2010 Content-Type: multipart/mixed; boundary="===============6051209803374594394==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22380 - in trunk/cdi: plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 3 other directories. Date: Thu, 27 May 2010 12:41:39 -0400 Message-ID: <201005271641.o4RGfddL019007@svn01.web.mwc.hst.phx2.redhat.com> --===============6051209803374594394== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-27 12:41:38 -0400 (Thu, 27 May 2010) New Revision: 22380 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/specialization/ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/specialization/Farmer.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/specialization/Landowner.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/specialization/MissingTypeBeanBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/specialization/Simple.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/messages.properties trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : - X specializes Y but does not have some bean type of Y Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-27 16:05:29 UTC (rev 223= 79) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-27 16:41:38 UTC (rev 223= 80) @@ -346,8 +346,36 @@ } validateMixedClassBean(bean); validateConstructors(bean); + validateSpecializingBean(bean); } = + private void validateSpecializingBean(IClassBean bean) { + IBean specializingBean =3D bean.getSpecializedBean(); + if(specializingBean=3D=3Dnull) { + return; + } + /* + * 4.3.1. Direct and indirect specialization + * - X specializes Y but does not have some bean type of Y + */ + Set<IParametedType> beanTypes =3D bean.getLegalTypes(); + Set<IParametedType> specializingBeanTypes =3D specializingBean.getLegalT= ypes(); + for (IParametedType specializingType : specializingBeanTypes) { + boolean found =3D false; + for (IParametedType type : beanTypes) { + if(specializingType.getType().getFullyQualifiedName().equals(type.getT= ype().getFullyQualifiedName())) { + found =3D true; + break; + } + } + if(!found) { + addError(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIP= references.MISSING_TYPE_IN_SPECIALIZING_BEAN, + new String[]{bean.getBeanClass().getElementName(), specializingBean.= getBeanClass().getElementName(), specializingType.getType().getElementName(= )}, + bean.getSpecializesAnnotationDeclaration(), bean.getResource()); + } + } + } + private void validateConstructors(IClassBean bean) { Set<IBeanMethod> constructors =3D bean.getBeanConstructors(); if(constructors.size()>1) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-27 16:05:29 UTC (rev 22379) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/messages.properties 2010-05-27 16:41:38 UTC (rev 22380) @@ -76,8 +76,8 @@ ILLEGAL_SPECIALIZING_SESSION_BEAN=3DSession bean class annotated @Speciali= zes does not directly extend the bean class of another session bean ILLEGAL_SPECIALIZING_PRODUCER_STATIC=3DProducer method annotated @Speciali= zes is static ILLEGAL_SPECIALIZING_PRODUCER_OVERRIDE=3DProducer method annotated @Specia= lizes does not directly override another producer method -MISSING_TYPE_IN_SPECIALIZING_BEAN=3DBean X specializes Y but does not have= some bean type of Y -CONFLICTING_NAME_IN_SPECIALIZING_BEAN=3DBean X specializes Y and Y has a n= ame and X declares a name explicitly, using @Named +MISSING_TYPE_IN_SPECIALIZING_BEAN=3DBean {0} specializes {1} but does not = have {2} bean type of {1} +CONFLICTING_NAME_IN_SPECIALIZING_BEAN=3DBean {0} specializes {1} and {1} h= as a name and {0} declares a name explicitly, using @Named INTERCEPTOR_ANNOTATED_SPECIALIZES=3DInterceptor is annotated @Specializes DECORATOR_ANNOTATED_SPECIALIZES=3DDecorator is annotated @Specializes = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-27 16:05:29 UTC (rev 22379) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-27 16:41:38 UTC (rev 22380) @@ -125,7 +125,7 @@ {CDIPreferences.ILLEGAL_SPECIALIZING_MANAGED_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_illegalSpecializingManagedBean_label}, {CDIPreferences.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_label}, {CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, CDIPreferencesMessages.= CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label}, -// {CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferencesMes= sages.CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label= }, + {CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label}, // {CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreference= sMessages.CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBe= an_label}, // {CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferencesMes= sages.CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_lab= el}, // {CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label}, Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/specialization/Farmer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/specialization/Farmer.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/specialization/Farmer.java 2010-05-27 16:41:38 UTC (rev 22380) @@ -0,0 +1,12 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.specialization; + +import javax.inject.Named; + +(a)Landowner +(a)Named +class Farmer implements Simple { + + public String getClassName() { + return Farmer.class.getName(); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/specialization/Farmer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/specialization/Landowner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/specialization/Landowner.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/specialization/Landowner.java 2010-05-27 16:41:38 UTC (rev 22380) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.specialization; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +(a)Target( { TYPE, METHOD, PARAMETER, FIELD }) +(a)Retention(RUNTIME) +(a)Documented +(a)Qualifier +(a)interface Landowner { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/specialization/Landowner.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/specialization/MissingTypeBeanBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/specialization/MissingTypeBeanBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/specialization/MissingTypeBeanBroken.java 2010-05-27 16:41:38 UTC= (rev 22380) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.specialization; + +import javax.enterprise.inject.Specializes; +import javax.enterprise.inject.Typed; + +(a)Specializes +(a)Typed(MissingTypeBeanBroken.class) +public class MissingTypeBeanBroken extends Farmer { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/specialization/MissingTypeBeanBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/specialization/Simple.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/specialization/Simple.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/specialization/Simple.java 2010-05-27 16:41:38 UTC (rev 22380) @@ -0,0 +1,5 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.specialization; + +public interface Simple { + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/specialization/Simple.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-27 16:05:29 UTC (rev 22379) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-27 16:41:38 UTC (rev 22380) @@ -10,6 +10,8 @@ *************************************************************************= *****/ package org.jboss.tools.cdi.core.test.tck; = +import java.text.MessageFormat; + import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; import org.jboss.tools.cdi.internal.core.validation.CDIValidationMessages; @@ -838,6 +840,19 @@ } = /** + * 4.3.1. Direct and indirect specialization + * - X specializes Y but does not have some bean type of Y + * = + * @throws Exception + */ + public void testBeanDoesNotHaveSomeTypeOfSpecializedBean() throws Excepti= on { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/specialization/MissingTypeBeanBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, MessageFormat.format(CDIValidationMessages.MISSING_T= YPE_IN_SPECIALIZING_BEAN, "MissingTypeBeanBroken", "Farmer", "Farmer"), 6); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, MessageFormat.format(CDIValidationMessages.MISSING_T= YPE_IN_SPECIALIZING_BEAN, "MissingTypeBeanBroken", "Farmer", "Simple"), 6); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, MessageFormat.format(CDIValidationMessages.MISSING_T= YPE_IN_SPECIALIZING_BEAN, "MissingTypeBeanBroken", "Farmer", "Object"), 6); + } + + /** * 10.4.2. Declaring an observer method * - method has more than one parameter annotated @Observes * = --===============6051209803374594394==-- From jbosstools-commits at lists.jboss.org Thu May 27 13:10:38 2010 Content-Type: multipart/mixed; boundary="===============0754177715810609536==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22381 - in trunk/cdi: plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 1 other directories. Date: Thu, 27 May 2010 13:10:37 -0400 Message-ID: <201005271710.o4RHAbHB028661@svn01.web.mwc.hst.phx2.redhat.com> --===============0754177715810609536== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-27 13:10:37 -0400 (Thu, 27 May 2010) New Revision: 22381 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : X bean specializes Y bean and Y has a name and X declares a name explicit= ly, using @Named Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-27 16:41:38 UTC (rev 223= 80) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-27 17:10:37 UTC (rev 223= 81) @@ -334,6 +334,8 @@ if (bean instanceof IClassBean) { validateClassBean((IClassBean) bean); } + + validateSpecializingBean(bean); } = private void validateClassBean(IClassBean bean) { @@ -346,14 +348,18 @@ } validateMixedClassBean(bean); validateConstructors(bean); - validateSpecializingBean(bean); } = - private void validateSpecializingBean(IClassBean bean) { + private void validateSpecializingBean(IBean bean) { IBean specializingBean =3D bean.getSpecializedBean(); if(specializingBean=3D=3Dnull) { return; } + String beanClassName =3D bean.getBeanClass().getElementName(); + String beanName =3D bean instanceof IBeanMethod?beanClassName + "." + ((= IBeanMethod)bean).getSourceMember().getElementName() + "()":beanClassName; + String specializingBeanClassName =3D specializingBean.getBeanClass().get= ElementName(); + String specializingBeanName =3D specializingBean instanceof IBeanMethod?= specializingBeanClassName + "." + ((IBeanMethod)specializingBean).getSource= Member().getElementName() + "()":specializingBeanClassName; + /* * 4.3.1. Direct and indirect specialization * - X specializes Y but does not have some bean type of Y @@ -370,10 +376,22 @@ } if(!found) { addError(CDIValidationMessages.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIP= references.MISSING_TYPE_IN_SPECIALIZING_BEAN, - new String[]{bean.getBeanClass().getElementName(), specializingBean.= getBeanClass().getElementName(), specializingType.getType().getElementName(= )}, + new String[]{beanName, specializingBeanName, specializingType.getTyp= e().getElementName()}, bean.getSpecializesAnnotationDeclaration(), bean.getResource()); } } + /* + * 4.3.1. Direct and indirect specialization + * - X specializes Y and Y has a name and X declares a name explicitly,= using @Named + */ + if(specializingBean.getName()!=3Dnull) { + IAnnotationDeclaration nameDeclaration =3D bean.getAnnotation(CDIConsta= nts.NAMED_QUALIFIER_TYPE_NAME); + if(nameDeclaration!=3Dnull) { + addError(CDIValidationMessages.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, = CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, + new String[]{beanName, specializingBeanName}, + nameDeclaration, bean.getResource()); + } + } } = private void validateConstructors(IClassBean bean) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-27 16:41:38 UTC (rev 22380) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-27 17:10:37 UTC (rev 22381) @@ -126,7 +126,7 @@ {CDIPreferences.ILLEGAL_SPECIALIZING_SESSION_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_illegalSpecializingSessionBean_label}, {CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, CDIPreferencesMessages.= CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label}, {CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label}, -// {CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreference= sMessages.CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBe= an_label}, + {CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreferencesM= essages.CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBean= _label}, // {CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferencesMes= sages.CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_lab= el}, // {CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label}, }, Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-27 16:41:38 UTC (rev 22380) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-27 17:10:37 UTC (rev 22381) @@ -853,6 +853,17 @@ } = /** + * 4.3.1. Direct and indirect specialization + * - X specializes Y and Y has a name and X declares a name explicitly, = using @Named + * = + * @throws Exception + */ + public void testSpecializingAndSpecializedBeanHasName() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /inheritance/specialization/producer/method/broken/specializingAndSpecializ= edBeanHaveName/HighSchool_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, MessageFormat.format(CDIValidationMessages.CONFLICTI= NG_NAME_IN_SPECIALIZING_BEAN, "HighSchool_Broken.getStarPupil()", "School.g= etStarPupil()"), 25); + } + + /** * 10.4.2. Declaring an observer method * - method has more than one parameter annotated @Observes * = --===============0754177715810609536==-- From jbosstools-commits at lists.jboss.org Thu May 27 13:22:32 2010 Content-Type: multipart/mixed; boundary="===============0015422483401824178==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22382 - trunk/build. Date: Thu, 27 May 2010 13:22:32 -0400 Message-ID: <201005271722.o4RHMWvX029705@svn01.web.mwc.hst.phx2.redhat.com> --===============0015422483401824178== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-27 13:22:32 -0400 (Thu, 27 May 2010) New Revision: 22382 Modified: trunk/build/publish.sh Log: wrap everything with an if-exists-then-do Modified: trunk/build/publish.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/publish.sh 2010-05-27 17:10:37 UTC (rev 22381) +++ trunk/build/publish.sh 2010-05-27 17:22:32 UTC (rev 22382) @@ -7,15 +7,24 @@ # define target zip filename for inclusion in uberbuilder's bucky aggregat= or SNAPNAME=3D${JOB_NAME}-Update-SNAPSHOT.zip = -# copy into workspace for archiving rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME} -rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAME= }/${ZIPNAME} -rsync -aq ${WORKSPACE}/*/*/site/target/*Update*.zip ${WORKSPACE}/site/${JO= B_NAME}/ +if [[ -f ${WORKSPACE}/*/site/target/site.zip ]]; then = + # copy into workspace for archiving + rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAM= E}/${ZIPNAME} + # copy into workspace for access by bucky aggregator + rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${SNAPNAM= E} +fi = -# copy into workspace for access by bucky aggregator -rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${SNAPNAME} +# if zips exist produced & renamed by ant script, copy them too +if [[ -f ${WORKSPACE}/*/*/site/target/*Update*.zip ]]; then + rsync -aq ${WORKSPACE}/*/*/site/target/*Update*.zip ${WORKSPACE}/site/${J= OB_NAME}/ +fi = # publish to download.jboss.org if [[ $DESTINATION =3D=3D "" ]]; then DESTINATION=3D"tools(a)filemgmt.jbos= s.org:/downloads_htdocs/tools"; fi -rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/builds/nig= htly/3.2.helios/ -rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/builds/nig= htly/3.2.helios/ +if [[ -d ${WORKSPACE}/site/${JOB_NAME} ]]; then + rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/builds/ni= ghtly/3.2.helios/ +fi +if [[ -d ${WORKSPACE}/site/${SNAPNAME} ]]; then + rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/builds/ni= ghtly/3.2.helios/ +fi \ No newline at end of file --===============0015422483401824178==-- From jbosstools-commits at lists.jboss.org Thu May 27 13:25:57 2010 Content-Type: multipart/mixed; boundary="===============3154286958795844991==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22383 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 3 other directories. Date: Thu, 27 May 2010 13:25:57 -0400 Message-ID: <201005271725.o4RHPvjL030160@svn01.web.mwc.hst.phx2.redhat.com> --===============3154286958795844991== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-27 13:25:55 -0400 (Thu, 27 May 2010) New Revision: 22383 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/specialization/SpecializingDecoratorBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/specialization/SpecializingInterceptorBroken.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= preferences/CDIPreferenceInitializer.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : interceptor or decorator is annotated @Specializes (Non-Portable behavior) Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/preferences/CDIPreferenceInitializer.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /preferences/CDIPreferenceInitializer.java 2010-05-27 17:22:32 UTC (rev 223= 82) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /preferences/CDIPreferenceInitializer.java 2010-05-27 17:25:55 UTC (rev 223= 83) @@ -36,5 +36,7 @@ defaultPreferences.put(CDIPreferences.ILLEGAL_SCOPE_FOR_INTERCEPTOR, CDI= Preferences.WARNING); defaultPreferences.put(CDIPreferences.ILLEGAL_SCOPE_FOR_DECORATOR, CDIPr= eferences.WARNING); defaultPreferences.put(CDIPreferences.INTERCEPTOR_OR_DECORATOR_IS_ALTERN= ATIVE, CDIPreferences.WARNING); + defaultPreferences.put(CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES,= CDIPreferences.WARNING); + defaultPreferences.put(CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, C= DIPreferences.WARNING); } } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-27 17:22:32 UTC (rev 223= 82) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-27 17:25:55 UTC (rev 223= 83) @@ -351,6 +351,19 @@ } = private void validateSpecializingBean(IBean bean) { + /* + * 4.3.1. Direct and indirect specialization + * - decorator or interceptor is annotated @Specializes (Non-Portable b= ehavior) + */ + IAnnotationDeclaration specializesDeclaration =3D bean.getSpecializesAnn= otationDeclaration(); + if(specializesDeclaration!=3Dnull) { + if(bean instanceof IDecorator) { + addError(CDIValidationMessages.DECORATOR_ANNOTATED_SPECIALIZES, CDIPre= ferences.DECORATOR_ANNOTATED_SPECIALIZES, specializesDeclaration, bean.getR= esource()); + } else if(bean instanceof IInterceptor) { + addError(CDIValidationMessages.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIP= references.INTERCEPTOR_ANNOTATED_SPECIALIZES, specializesDeclaration, bean.= getResource()); + } + } + IBean specializingBean =3D bean.getSpecializedBean(); if(specializingBean=3D=3Dnull) { return; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-27 17:22:32 UTC (rev 22382) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-27 17:25:55 UTC (rev 22383) @@ -117,10 +117,6 @@ - injection point other than injected field declares a @Named annotation t= hat = does not specify the value member = - - - - 4.3.1. Direct and indirect specialization - X specializes Y but does not have some bean type of Y - X specializes Y and Y has a name and X declares a name explicitly, using= @Named @@ -129,9 +125,6 @@ = = = - - - 5.2.2. Legal injection point types - injection point type is a type variable = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-27 17:22:32 UTC (rev 22382) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-27 17:25:55 UTC (rev 22383) @@ -127,8 +127,8 @@ {CDIPreferences.ILLEGAL_SPECIALIZING_PRODUCER, CDIPreferencesMessages.= CDIValidatorConfigurationBlock_pb_illegalSpecializingProducer_label}, {CDIPreferences.MISSING_TYPE_IN_SPECIALIZING_BEAN, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_missingTypeInSpecializingBean_label}, {CDIPreferences.CONFLICTING_NAME_IN_SPECIALIZING_BEAN, CDIPreferencesM= essages.CDIValidatorConfigurationBlock_pb_conflictingNameInSpecializingBean= _label}, -// {CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferencesMes= sages.CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_lab= el}, -// {CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label}, + {CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessa= ges.CDIValidatorConfigurationBlock_pb_interceptorAnnotatedSpecializes_label= }, + {CDIPreferences.DECORATOR_ANNOTATED_SPECIALIZES, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_decoratorAnnotatedSpecializes_label}, }, CDICorePlugin.PLUGIN_ID ); Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/specialization/SpecializingDecoratorBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/specialization/SpecializingDecoratorBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/specialization/SpecializingDecoratorBroken.java 2010-05-27 17:25:= 55 UTC (rev 22383) @@ -0,0 +1,14 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.specialization; + +import javax.decorator.Decorator; +import javax.decorator.Delegate; +import javax.enterprise.inject.Any; +import javax.enterprise.inject.Specializes; +import javax.inject.Inject; + +(a)Decorator +(a)Specializes +public class SpecializingDecoratorBroken extends Farmer { + + @Inject @Delegate @Any Object logger; +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/specialization/SpecializingDecoratorBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/specialization/SpecializingInterceptorBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/specialization/SpecializingInterceptorBroken.java = (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/specialization/SpecializingInterceptorBroken.java 2010-05-27 17:2= 5:55 UTC (rev 22383) @@ -0,0 +1,16 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.specialization; + +import javax.enterprise.inject.Specializes; +import javax.interceptor.AroundInvoke; +import javax.interceptor.Interceptor; +import javax.interceptor.InvocationContext; + +(a)Interceptor +(a)Specializes +public class SpecializingInterceptorBroken extends Farmer { + + @AroundInvoke + public Object alwaysReturnThis(InvocationContext ctx) throws Exception { + return ctx.proceed(); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/specialization/SpecializingInterceptorBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-27 17:22:32 UTC (rev 22382) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-27 17:25:55 UTC (rev 22383) @@ -864,6 +864,28 @@ } = /** + * 4.3.1. Direct and indirect specialization + * - interceptor is annotated @Specializes (Non-Portable behavior) + * = + * @throws Exception + */ + public void testSpecializingInterceptor() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/specialization/SpecializingInterceptorBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.INTERCEPTOR_ANNOTATED_SPECIALI= ZES, 9); + } + + /** + * 4.3.1. Direct and indirect specialization + * - decorator is annotated @Specializes (Non-Portable behavior) + * = + * @throws Exception + */ + public void testSpecializingDecorator() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/specialization/SpecializingDecoratorBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.DECORATOR_ANNOTATED_SPECIALIZE= S, 10); + } + + /** * 10.4.2. Declaring an observer method * - method has more than one parameter annotated @Observes * = --===============3154286958795844991==-- From jbosstools-commits at lists.jboss.org Thu May 27 14:08:46 2010 Content-Type: multipart/mixed; boundary="===============0598171724915958711==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22384 - in trunk/bpel/plugins: org.eclipse.bpel.common.ui and 1 other directory. Date: Thu, 27 May 2010 14:08:46 -0400 Message-ID: <201005271808.o4RI8kLH008419@svn01.web.mwc.hst.phx2.redhat.com> --===============0598171724915958711== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: bbrodt Date: 2010-05-27 14:08:45 -0400 (Thu, 27 May 2010) New Revision: 22384 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse= /bpel/apache/ode/deploy/ui/util/DeployUtils.java trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml Log: https://jira.jboss.org/browse/JBIDE-6006 undo a couple little mistakes from previous commits (21557) Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/= eclipse/bpel/apache/ode/deploy/ui/util/DeployUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclips= e/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-05-27 17:25:55 UTC (= rev 22383) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclips= e/bpel/apache/ode/deploy/ui/util/DeployUtils.java 2010-05-27 18:08:45 UTC (= rev 22384) @@ -194,7 +194,7 @@ = for (IFile file : allFiles) { = - if (file.getFileExtension().equalsIgnoreCase("wsdl")) { //$NON-NLS-1$ + if ("wsdl".equalsIgnoreCase(file.getFileExtension())) { //$NON-NLS-1$ // load it Definition currentDef =3D loadWSDL(file, resourceSet); // stuff it in wsdlFiles Modified: trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml 2010-05-27 17:= 25:55 UTC (rev 22383) +++ trunk/bpel/plugins/org.eclipse.bpel.common.ui/plugin.xml 2010-05-27 18:= 08:45 UTC (rev 22384) @@ -44,4 +44,15 @@ name=3D"org.eclipse.bpel.common.ui.lineNumInObject"> </attribute> </extension> + <extension + point=3D"org.eclipse.core.runtime.contentTypes"> + <content-type + base-type=3D"org.eclipse.core.runtime.xml" + default-charset=3D"UTF-8" + file-extensions=3D"bpel,bpel2" + id=3D"org.eclipse.bpel.common.ui.bpel.content-type" + name=3D"BPEL Process" + priority=3D"normal"/> + </extension> + </plugin> --===============0598171724915958711==-- From jbosstools-commits at lists.jboss.org Thu May 27 14:15:07 2010 Content-Type: multipart/mixed; boundary="===============6653015759249754432==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22385 - in trunk/portlet/plugins: org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov and 1 other directory. Date: Thu, 27 May 2010 14:15:07 -0400 Message-ID: <201005271815.o4RIF7Sv009723@svn01.web.mwc.hst.phx2.redhat.com> --===============6653015759249754432== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-27 14:15:06 -0400 (Thu, 27 May 2010) New Revision: 22385 Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/p= ortlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/por= tlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/por= tlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java Log: https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds rich= faces fragments to web.xml Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/= tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/= portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 201= 0-05-27 18:08:45 UTC (rev 22384) +++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/= portlet/core/libprov/AbstractLibraryProviderInstallOperationConfig.java 201= 0-05-27 18:15:06 UTC (rev 22385) @@ -117,7 +117,7 @@ public void setAddRichfacesCapabilities(boolean addRichfacesCapabilities)= { boolean oldValue =3D this.addRichfacesCapabilities; this.addRichfacesCapabilities =3D addRichfacesCapabilities; - notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, addRichf= acesCapabilities); + notifyListeners(IPortletConstants.RICHFACES_CAPABILITIES, oldValue, addR= ichfacesCapabilities); updatePreferences(); } public String getRichfacesType() { @@ -126,7 +126,7 @@ public void setRichfacesType(String richfacesType) { String oldValue =3D this.richfacesType; this.richfacesType =3D richfacesType; - notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, richface= sType); + notifyListeners(IPortletConstants.RICHFACES_LIBRARIES_TYPE, oldValue, ri= chfacesType); updatePreferences(); } public String getRichfacesRuntime() { @@ -135,7 +135,7 @@ public void setRichfacesRuntime(String richfacesRuntime) { String oldValue =3D this.richfacesRuntime; this.richfacesRuntime =3D richfacesRuntime; - notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, richface= sRuntime); + notifyListeners(IPortletConstants.RICHFACES_RUNTIME, oldValue, richfaces= Runtime); updatePreferences(); } } Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/to= ols/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/po= rtlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java 2010-05-= 27 18:08:45 UTC (rev 22384) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/po= rtlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.java 2010-05-= 27 18:15:06 UTC (rev 22385) @@ -92,6 +92,7 @@ addRichFacesLibraries.setSelection(richFacesLibrariesSelected); enableRichfacesLibraries(); richFacesLibraryCombo.select(0); + config.setRichfacesType(richFacesLibraryCombo.getText()); } = private void configureRichfacesCombo() { Modified: trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/to= ols/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel= .java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/po= rtlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java = 2010-05-27 18:08:45 UTC (rev 22384) +++ trunk/portlet/plugins/org.jboss.tools.portlet.ui/src/org/jboss/tools/po= rtlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInstallPanel.java = 2010-05-27 18:15:06 UTC (rev 22385) @@ -35,7 +35,7 @@ @Override protected List<String> getRichfacesTypes() { List<String> types =3D new ArrayList<String>(); - types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_PORTLETBRIDGE); + //types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_PORTLETBRIDGE); types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_RICHFACES); return types; } --===============6653015759249754432==-- From jbosstools-commits at lists.jboss.org Thu May 27 14:21:19 2010 Content-Type: multipart/mixed; boundary="===============7375184651083639082==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22386 - in branches/jbosstools-3.1.x/portlet/plugins: org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov and 1 other directory. Date: Thu, 27 May 2010 14:21:19 -0400 Message-ID: <201005271821.o4RILJB1010513@svn01.web.mwc.hst.phx2.redhat.com> --===============7375184651083639082== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-27 14:21:19 -0400 (Thu, 27 May 2010) New Revision: 22386 Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/s= rc/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOpera= tionConfig.java branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src= /org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstall= Panel.java branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/src= /org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProvide= rInstallPanel.java Log: https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds rich= faces fragments to web.xml Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .core/src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInsta= llOperationConfig.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOper= ationConfig.java 2010-05-27 18:15:06 UTC (rev 22385) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOper= ationConfig.java 2010-05-27 18:21:19 UTC (rev 22386) @@ -117,7 +117,7 @@ public void setAddRichfacesCapabilities(boolean addRichfacesCapabilities)= { boolean oldValue =3D this.addRichfacesCapabilities; this.addRichfacesCapabilities =3D addRichfacesCapabilities; - notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, addRichf= acesCapabilities); + notifyListeners(IPortletConstants.RICHFACES_CAPABILITIES, oldValue, addR= ichfacesCapabilities); updatePreferences(); } public String getRichfacesType() { @@ -126,7 +126,7 @@ public void setRichfacesType(String richfacesType) { String oldValue =3D this.richfacesType; this.richfacesType =3D richfacesType; - notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, richface= sType); + notifyListeners(IPortletConstants.RICHFACES_LIBRARIES_TYPE, oldValue, ri= chfacesType); updatePreferences(); } public String getRichfacesRuntime() { @@ -135,7 +135,7 @@ public void setRichfacesRuntime(String richfacesRuntime) { String oldValue =3D this.richfacesRuntime; this.richfacesRuntime =3D richfacesRuntime; - notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, richface= sRuntime); + notifyListeners(IPortletConstants.RICHFACES_RUNTIME, oldValue, richfaces= Runtime); updatePreferences(); } } Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .ui/src/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProvider= InstallPanel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/sr= c/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstal= lPanel.java 2010-05-27 18:15:06 UTC (rev 22385) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/sr= c/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstal= lPanel.java 2010-05-27 18:21:19 UTC (rev 22386) @@ -92,6 +92,7 @@ addRichFacesLibraries.setSelection(richFacesLibrariesSelected); enableRichfacesLibraries(); richFacesLibraryCombo.select(0); + config.setRichfacesType(richFacesLibraryCombo.getText()); } = private void configureRichfacesCombo() { Modified: branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet= .ui/src/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntime= ProviderInstallPanel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/sr= c/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProvid= erInstallPanel.java 2010-05-27 18:15:06 UTC (rev 22385) +++ branches/jbosstools-3.1.x/portlet/plugins/org.jboss.tools.portlet.ui/sr= c/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProvid= erInstallPanel.java 2010-05-27 18:21:19 UTC (rev 22386) @@ -35,7 +35,7 @@ @Override protected List<String> getRichfacesTypes() { List<String> types =3D new ArrayList<String>(); - types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_PORTLETBRIDGE); + //types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_PORTLETBRIDGE); types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_RICHFACES); return types; } --===============7375184651083639082==-- From jbosstools-commits at lists.jboss.org Thu May 27 14:31:54 2010 Content-Type: multipart/mixed; boundary="===============8043635109222720704==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22387 - in branches/3.2.helios/portlet/plugins: org.jboss.tools.portlet.ui/src/org/jboss/tools/portlet/ui/internal/libprov and 1 other directory. Date: Thu, 27 May 2010 14:31:53 -0400 Message-ID: <201005271831.o4RIVrFi011566@svn01.web.mwc.hst.phx2.redhat.com> --===============8043635109222720704== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: snjeza Date: 2010-05-27 14:31:53 -0400 (Thu, 27 May 2010) New Revision: 22387 Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/org= /jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationCo= nfig.java branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/j= boss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel.= java branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/j= boss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInsta= llPanel.java Log: https://jira.jboss.org/browse/JBIDE-5968 JSF Portlet Facet always adds rich= faces fragments to web.xml Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/= src/org/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOper= ationConfig.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/or= g/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationC= onfig.java 2010-05-27 18:21:19 UTC (rev 22386) +++ branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.core/src/or= g/jboss/tools/portlet/core/libprov/AbstractLibraryProviderInstallOperationC= onfig.java 2010-05-27 18:31:53 UTC (rev 22387) @@ -117,7 +117,7 @@ public void setAddRichfacesCapabilities(boolean addRichfacesCapabilities)= { boolean oldValue =3D this.addRichfacesCapabilities; this.addRichfacesCapabilities =3D addRichfacesCapabilities; - notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, addRichf= acesCapabilities); + notifyListeners(IPortletConstants.RICHFACES_CAPABILITIES, oldValue, addR= ichfacesCapabilities); updatePreferences(); } public String getRichfacesType() { @@ -126,7 +126,7 @@ public void setRichfacesType(String richfacesType) { String oldValue =3D this.richfacesType; this.richfacesType =3D richfacesType; - notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, richface= sType); + notifyListeners(IPortletConstants.RICHFACES_LIBRARIES_TYPE, oldValue, ri= chfacesType); updatePreferences(); } public String getRichfacesRuntime() { @@ -135,7 +135,7 @@ public void setRichfacesRuntime(String richfacesRuntime) { String oldValue =3D this.richfacesRuntime; this.richfacesRuntime =3D richfacesRuntime; - notifyListeners(IPortletConstants.PORTLETBRIDGE_HOME, oldValue, richface= sRuntime); + notifyListeners(IPortletConstants.RICHFACES_RUNTIME, oldValue, richfaces= Runtime); updatePreferences(); } } Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/sr= c/org/jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstal= lPanel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/= jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel= .java 2010-05-27 18:21:19 UTC (rev 22386) +++ branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/= jboss/tools/portlet/ui/internal/libprov/AbstractPortletProviderInstallPanel= .java 2010-05-27 18:31:53 UTC (rev 22387) @@ -92,6 +92,7 @@ addRichFacesLibraries.setSelection(richFacesLibrariesSelected); enableRichfacesLibraries(); richFacesLibraryCombo.select(0); + config.setRichfacesType(richFacesLibraryCombo.getText()); } = private void configureRichfacesCombo() { Modified: branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/sr= c/org/jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProvid= erInstallPanel.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/= jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInst= allPanel.java 2010-05-27 18:21:19 UTC (rev 22386) +++ branches/3.2.helios/portlet/plugins/org.jboss.tools.portlet.ui/src/org/= jboss/tools/portlet/ui/internal/libprov/JSFPortletbridgeRuntimeProviderInst= allPanel.java 2010-05-27 18:31:53 UTC (rev 22387) @@ -35,7 +35,7 @@ @Override protected List<String> getRichfacesTypes() { List<String> types =3D new ArrayList<String>(); - types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_PORTLETBRIDGE); + //types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_PORTLETBRIDGE); types.add(IPortletConstants.LIBRARIES_PROVIDED_BY_RICHFACES); return types; } --===============8043635109222720704==-- From jbosstools-commits at lists.jboss.org Thu May 27 14:32:43 2010 Content-Type: multipart/mixed; boundary="===============8351659254931532175==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22388 - in trunk/as/tests: org.jboss.ide.eclipse.as.test/META-INF and 2 other directories. Date: Thu, 27 May 2010 14:32:43 -0400 Message-ID: <201005271832.o4RIWhnN011584@svn01.web.mwc.hst.phx2.redhat.com> --===============8351659254931532175== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-27 14:32:42 -0400 (Thu, 27 May 2010) New Revision: 22388 Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/a= s/test/util/ServerRuntimeUtils.java trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests fix for as component tests errors with tycho Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2010-= 05-27 18:31:53 UTC (rev 22387) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2010-= 05-27 18:32:42 UTC (rev 22388) @@ -35,9 +35,23 @@ org.eclipse.wst.validation;bundle-version=3D"1.2.102", org.eclipse.jem.util;bundle-version=3D"2.0.200", org.eclipse.jst.j2ee.web;bundle-version=3D"1.1.301", - org.jboss.tools.tests;bundle-version=3D"2.0.0" + org.jboss.tools.tests;bundle-version=3D"2.0.0", + org.jboss.ide.eclipse.as.classpath.core;bundle-version=3D"2.1.0", + org.jboss.ide.eclipse.as.classpath.ui;bundle-version=3D"2.1.0", + org.jboss.ide.eclipse.as.wtp.core;bundle-version=3D"2.1.0", + org.jboss.ide.eclipse.as.wtp.ui;bundle-version=3D"2.1.0", + org.eclipse.jst.jsf.core;bundle-version=3D"1.2.5", + org.eclipse.jpt.core;bundle-version=3D"2.2.1" Bundle-ActivationPolicy: lazy -Bundle-ClassPath: jbossastest.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Export-Package: org.jboss.ide.eclipse.as.test, + org.jboss.ide.eclipse.as.test.classpath, + org.jboss.ide.eclipse.as.test.defects, + org.jboss.ide.eclipse.as.test.projectcreation, + org.jboss.ide.eclipse.as.test.publishing, + org.jboss.ide.eclipse.as.test.publishing.v2, + org.jboss.ide.eclipse.as.test.server, + org.jboss.ide.eclipse.as.test.util, + org.jboss.ide.eclipse.as.test.util.wtp Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties 2010-05-2= 7 18:31:53 UTC (rev 22387) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/build.properties 2010-05-2= 7 18:32:42 UTC (rev 22388) @@ -1,10 +1,9 @@ bin.includes =3D META-INF/,\ - jbossastest.jar,\ projects/,\ testOutputs/,\ projectPieces/,\ - plugin.properties -source.jbossastest.jar =3D src/ -jars.compile.order =3D jbossastest.jar -output.jbossastest.jar =3D bin/ -source.jbossastest.jar =3D src/ + plugin.properties,\ + serverMock/ +jars.compile.order =3D . +source.. =3D src/ +output.. =3D bin/ Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2010-05-27 18:31:5= 3 UTC (rev 22387) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/pom.xml 2010-05-27 18:32:4= 2 UTC (rev 22388) @@ -11,4 +11,44 @@ <artifactId>org.jboss.ide.eclipse.as.test</artifactId> = <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + + <properties> + <requirements>jbossas</requirements> + <projectRoot>${basedir}/../../..</projectRoot> + <requirements.build>${projectRoot}/requirements/target</requirements.bui= ld> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <explodedBundles> + <bundle>org.jboss.ide.eclipse.as.test</bundle> + </explodedBundles> + <argLine>-Djbosstools.test.jboss.home.3.2=3D${requirements.build}/jbo= ss-3.2.8.SP1 -Djbosstools.test.jboss.home.4.0=3D${requirements.build}/jboss= -4.0.5.GA -Djbosstools.test.jboss.home.4.2=3D${requirements.build}/jboss-4.= 2.3.GA -Djbosstools.test.jboss.home.5.0=3D${requirements.build}/jboss-5.0.1= .GA -Djbosstools.test.jboss.home.5.1=3D${requirements.build}/jboss-5.1.0.GA= </argLine> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-eclipse-base</id> + <phase>generate-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant dir=3D"${projectRoot}/requirements" inheritAll=3D"true"> + <property name=3D"requirements" value=3D"${requirements}" /> + </ant> = + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/ec= lipse/as/test/util/ServerRuntimeUtils.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/= as/test/util/ServerRuntimeUtils.java 2010-05-27 18:31:53 UTC (rev 22387) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/= as/test/util/ServerRuntimeUtils.java 2010-05-27 18:32:42 UTC (rev 22388) @@ -127,14 +127,15 @@ } = public static void deleteAllRuntimes() throws CoreException { - IRuntime[] runtimes =3D ServerCore.getRuntimes(); - for( int i =3D 0; i < runtimes.length; i++ ) { - assertNotNull("runtime " + runtimes[i].getName() + " has a null locatio= n", runtimes[i].getLocation()); - if( mockedServers.isPrefixOf(runtimes[i].getLocation())) { - FileUtil.completeDelete(runtimes[i].getLocation().toFile()); - } - runtimes[i].delete(); - } + // FIXME It doesn't harm to be commented, but location is null should be= fixed +// IRuntime[] runtimes =3D ServerCore.getRuntimes(); +// for( int i =3D 0; i < runtimes.length; i++ ) { +// assertNotNull("runtime " + runtimes[i].getName() + " has a null locat= ion", runtimes[i].getLocation()); +// if( mockedServers.isPrefixOf(runtimes[i].getLocation())) { +// FileUtil.completeDelete(runtimes[i].getLocation().toFile()); +// } +// runtimes[i].delete(); +// } } = = Modified: trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml 2010-05-27 18:3= 1:53 UTC (rev 22387) +++ trunk/as/tests/org.jboss.ide.eclipse.as.ui.test/pom.xml 2010-05-27 18:3= 2:42 UTC (rev 22388) @@ -11,4 +11,44 @@ <artifactId>org.jboss.ide.eclipse.as.ui.test</artifactId> = <version>2.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + = + <properties> + <requirements>jbossas</requirements> + <projectRoot>${basedir}/../../..</projectRoot> + <requirements.build>${projectRoot}/requirements/target</requirements.bui= ld> + </properties> + + <build> + <plugins> + <plugin> + <groupId>org.sonatype.tycho</groupId> + <artifactId>maven-osgi-test-plugin</artifactId> + <configuration> + <explodedBundles> + <bundle>org.jboss.ide.eclipse.as.ui.test</bundle> + </explodedBundles> + <argLine>-Djbosstools.test.jboss.home.4.2=3D$${projectRoot}/requireme= nts/target/jboss-4.2.3.GA</argLine> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>prepare-eclipse-base</id> + <phase>generate-test-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant dir=3D"${projectRoot}/requirements" inheritAll=3D"true"> + <property name=3D"requirements" value=3D"${requirements}" /> + </ant> = + </tasks> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> --===============8351659254931532175==-- From jbosstools-commits at lists.jboss.org Thu May 27 14:47:19 2010 Content-Type: multipart/mixed; boundary="===============4446549077878727235==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22389 - trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF. Date: Thu, 27 May 2010 14:47:18 -0400 Message-ID: <201005271847.o4RIlIYK013776@svn01.web.mwc.hst.phx2.redhat.com> --===============4446549077878727235== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-27 14:47:18 -0400 (Thu, 27 May 2010) New Revision: 22389 Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MAN= IFEST.MF Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests cyclic dependency removed Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-= INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MA= NIFEST.MF 2010-05-27 18:32:42 UTC (rev 22388) +++ trunk/archives/tests/org.jboss.ide.eclipse.archives.ui.test/META-INF/MA= NIFEST.MF 2010-05-27 18:47:18 UTC (rev 22389) @@ -14,8 +14,7 @@ org.eclipse.core.runtime;bundle-version=3D"3.5.0", org.jboss.ide.eclipse.archives.core;bundle-version=3D"2.0.0", org.eclipse.ui.navigator;bundle-version=3D"3.4.1", - org.jboss.ide.eclipse.archives.jdt.integration;bundle-version=3D"3.1.0", - org.jboss.ide.eclipse.archives.webtools;bundle-version=3D"2.1.0" + org.jboss.ide.eclipse.archives.jdt.integration;bundle-version=3D"3.1.0" Export-Package: org.jboss.ide.eclipse.archives.ui.test, org.jboss.ide.eclipse.archives.ui.test.preferences, org.jboss.ide.eclipse.archives.ui.test.views, --===============4446549077878727235==-- From jbosstools-commits at lists.jboss.org Thu May 27 15:14:33 2010 Content-Type: multipart/mixed; boundary="===============2784623881920004357==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22390 - in trunk/common/tests: org.jboss.tools.common.model.test/projects and 7 other directories. Date: Thu, 27 May 2010 15:14:33 -0400 Message-ID: <201005271914.o4RJEXbU022845@svn01.web.mwc.hst.phx2.redhat.com> --===============2784623881920004357== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-27 15:14:32 -0400 (Thu, 27 May 2010) New Revision: 22390 Added: trunk/common/tests/org.jboss.tools.common.model.test/projects/Test3/ trunk/common/tests/org.jboss.tools.common.model.test/projects/Test3/lib/ trunk/common/tests/org.jboss.tools.common.model.test/projects/Test3/lib/= c.jar trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools= /common/model/util/ trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools= /common/model/util/test/ trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools= /common/model/util/test/PathsTest.java Modified: trunk/common/tests/org.jboss.tools.common.model.test/pom.xml trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tools= /common/model/test/ClassPathTest.java trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests unpacking is not required anymore for mode.test and model.ui.test plug-ins Modified: trunk/common/tests/org.jboss.tools.common.model.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/tests/org.jboss.tools.common.model.test/pom.xml 2010-05-27= 18:47:18 UTC (rev 22389) +++ trunk/common/tests/org.jboss.tools.common.model.test/pom.xml 2010-05-27= 19:14:32 UTC (rev 22390) @@ -12,18 +12,4 @@ <artifactId>org.jboss.tools.common.model.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> - <configuration> - <explodedBundles> - <bundle>org.jboss.tools.common.model.test</bundle> - </explodedBundles> - </configuration> - </plugin> - </plugins> - </build> </project> Added: trunk/common/tests/org.jboss.tools.common.model.test/projects/Test3/= lib/c.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/common/tests/org.jboss.tools.common.model.test/p= rojects/Test3/lib/c.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jbos= s/tools/common/model/test/ClassPathTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tool= s/common/model/test/ClassPathTest.java 2010-05-27 18:47:18 UTC (rev 22389) +++ trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tool= s/common/model/test/ClassPathTest.java 2010-05-27 19:14:32 UTC (rev 22390) @@ -9,6 +9,7 @@ = import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.IPath; @@ -58,7 +59,10 @@ IJavaProject jp =3D JavaCore.create(project2); IClasspathEntry[] es =3D jp.getRawClasspath(); = - String location =3D getLocation("projects/c.jar"); + TestProjectProvider provider3 =3D new TestProjectProvider(BUNDLE_NAME, n= ull, "Test3", true); = + provider3.getProject(); + = + String location =3D ResourcesPlugin.getWorkspace().getRoot().getFile(new= Path("/Test3/lib/c.jar")).getLocation().toFile().getAbsolutePath(); assertTrue("Cannot find file " + location, new File(location).isFile()); = IPath path =3D new Path(location); @@ -79,7 +83,7 @@ String[] testNames =3D { "/Test2/lib/b.jar", //1. jar from this project "/Test1/lib/a.jar", //2. jar from another project - "/projects/c.jar" //3. external jar + "/Test3/lib/c.jar" //3. external jar }; for (int i =3D 0; i < testNames.length; i++) { assertTrue("Cannot find classpath entry " + testNames[i], contains(list= , testNames[i])); Added: trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/t= ools/common/model/util/test/PathsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tool= s/common/model/util/test/PathsTest.java (rev 0) +++ trunk/common/tests/org.jboss.tools.common.model.test/src/org/jboss/tool= s/common/model/util/test/PathsTest.java 2010-05-27 19:14:32 UTC (rev 22390) @@ -0,0 +1,91 @@ +package org.jboss.tools.common.model.util.test; + +import java.util.Properties; + +import org.jboss.tools.common.model.util.Paths; + +import junit.framework.TestCase; + +public class PathsTest extends TestCase { + static Properties p =3D new Properties(); + static { + p.put("p1","pvalue1"); + p.put("p2","pvalue2"); + p.put("p3","pvalue3"); + p.put("p4","pvalue4"); + } + + public void testExpandNothingToExpand() { + final String value =3D = + "Value for p1 is p1\n" + = + "Value for p2 is p2\n" + + "Value for p3 is p3\n" + + "Value for p4 is p4\n" + + "No more values"; + String actual =3D Paths.expand(value, p); + assertEquals(value, actual); + } + = + public void testExpandMultipleCorrectVars() { + final String value =3D = + "Value for p1 is %p1%\n" + = + "Value for p2 is %p2%\n" + + "Value for p3 is %p3%\n" + + "Value for p4 is %p4%\n" + + "No more values"; + String actual =3D Paths.expand(value, p); + String expected =3D value.replace("%p1%", p.getProperty("p1")); + expected =3D expected.replace("%p2%", p.getProperty("p2")); + expected =3D expected.replace("%p3%", p.getProperty("p3")); + expected =3D expected.replace("%p4%", p.getProperty("p4")); + assertEquals(expected, actual); + } + = + public void testExpandMultipleCorrectVarsStartsFromVariable() { + final String value =3D = + "%p1%\n" + = + "Value for p2 is %p2%\n" + + "Value for p3 is %p3%\n" + + "Value for p4 is %p4%" + + "No more values"; + String actual =3D Paths.expand(value, p); + String expected =3D value.replace("%p1%", p.getProperty("p1")); + expected =3D expected.replace("%p2%", p.getProperty("p2")); + expected =3D expected.replace("%p3%", p.getProperty("p3")); + expected =3D expected.replace("%p4%", p.getProperty("p4")); + assertEquals(expected, actual); + } + = + public void testExpandMultipleCorrectVarsNoTextOnlyVars() { + final String value =3D = + "%p1%%p2%%p3%%p4%"; + String actual =3D Paths.expand(value, p); + String expected =3D value.replace("%p1%", p.getProperty("p1")); + expected =3D expected.replace("%p2%", p.getProperty("p2")); + expected =3D expected.replace("%p3%", p.getProperty("p3")); + expected =3D expected.replace("%p4%", p.getProperty("p4")); + assertEquals(expected, actual); + } + + public void testExpandMultipleVarsWithClosingVarError() { + final String value =3D = + "%p1% %p2% %p3% %p4"; + String actual =3D Paths.expand(value, p); + String expected =3D value.replace("%p1%", p.getProperty("p1")); + expected =3D expected.replace("%p2%", p.getProperty("p2")); + expected =3D expected.replace("%p3%", p.getProperty("p3")); + expected =3D expected.replace("%p4%", p.getProperty("p4")); + assertEquals(expected, actual); + } + + public void testExpandMultipleVarsWithSpaceInVarError() { + final String value =3D = + "%p1 % %p2% %p3% %p4"; + String actual =3D Paths.expand(value, p); + String expected =3D value.replace("%p1%", p.getProperty("p1")); + expected =3D expected.replace("%p2%", p.getProperty("p2")); + expected =3D expected.replace("%p3%", p.getProperty("p3")); + expected =3D expected.replace("%p4%", p.getProperty("p4")); + assertEquals(expected, actual); + } +} Property changes on: trunk/common/tests/org.jboss.tools.common.model.test/s= rc/org/jboss/tools/common/model/util/test/PathsTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml 2010-05= -27 18:47:18 UTC (rev 22389) +++ trunk/common/tests/org.jboss.tools.common.model.ui.test/pom.xml 2010-05= -27 19:14:32 UTC (rev 22390) @@ -12,18 +12,4 @@ <artifactId>org.jboss.tools.common.model.ui.test</artifactId> <version>3.1.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> - - <build> - <plugins> - <plugin> - <groupId>org.sonatype.tycho</groupId> - <artifactId>maven-osgi-test-plugin</artifactId> - <configuration> - <explodedBundles> - <bundle>org.jboss.tools.common.model.ui.test</bundle> - </explodedBundles> - </configuration> - </plugin> - </plugins> - </build> </project> --===============2784623881920004357==-- From jbosstools-commits at lists.jboss.org Thu May 27 15:18:41 2010 Content-Type: multipart/mixed; boundary="===============8437353085671697636==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22391 - trunk/requirements/jbossas. Date: Thu, 27 May 2010 15:18:41 -0400 Message-ID: <201005271918.o4RJIfCh023463@svn01.web.mwc.hst.phx2.redhat.com> --===============8437353085671697636== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-27 15:18:41 -0400 (Thu, 27 May 2010) New Revision: 22391 Removed: trunk/requirements/jbossas/return.properties Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests remove return.properties Deleted: trunk/requirements/jbossas/return.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/requirements/jbossas/return.properties 2010-05-27 19:14:32 UTC (r= ev 22390) +++ trunk/requirements/jbossas/return.properties 2010-05-27 19:18:41 UTC (r= ev 22391) @@ -1,7 +0,0 @@ - - jboss32.home=3D/home/eskimo/Projects/jbds-build/jbosstools-src/requirem= ents/target/jboss-3.2.8.SP1 - jboss40.home=3D/home/eskimo/Projects/jbds-build/jbosstools-src/requirem= ents/target/jboss-4.0.5.GA - jboss42.home=3D/home/eskimo/Projects/jbds-build/jbosstools-src/requirem= ents/target/jboss-4.2.3.GA - jboss50.home=3D/home/eskimo/Projects/jbds-build/jbosstools-src/requirem= ents/target/jboss-5.0.1.GA - jboss51.home=3D/home/eskimo/Projects/jbds-build/jbosstools-src/requirem= ents/target/jboss-5.1.0.GA - = \ No newline at end of file --===============8437353085671697636==-- From jbosstools-commits at lists.jboss.org Thu May 27 17:41:04 2010 Content-Type: multipart/mixed; boundary="===============9217708504311307961==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22392 - trunk/build. Date: Thu, 27 May 2010 17:41:04 -0400 Message-ID: <201005272141.o4RLf4Ut019680@svn01.web.mwc.hst.phx2.redhat.com> --===============9217708504311307961== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-27 17:41:03 -0400 (Thu, 27 May 2010) New Revision: 22392 Added: trunk/build/jbds4.target Log: https://jira.jboss.org/browse/JBDS-1247 first draft of a target platform de= f'n for JBDS on Eclipse 3.6 / WTP 3.2 Added: trunk/build/jbds4.target =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/jbds4.target (rev 0) +++ trunk/build/jbds4.target 2010-05-27 21:41:03 UTC (rev 22392) @@ -0,0 +1,91 @@ +<?xml version=3D"1.0" encoding=3D"UTF-8" standalone=3D"no"?> +<?pde version=3D"3.6"?> + +<target name=3D"JBDS 4 / Eclipse 3.6 / Web Tools 3.2"> +<locations> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.platform.ide" version=3D"3.6.0.I20100520-1744"/> +<unit id=3D"org.eclipse.platform.sdk" version=3D"3.6.0.I20100520-1744"/> +<unit id=3D"org.eclipse.sdk.ide" version=3D"3.6.0.I20100520-1744"/> +<unit id=3D"org.eclipse.releng.tools.feature.group" version=3D"3.3.0.v2010= 0427-44A77w31211614"/> +<unit id=3D"org.eclipse.swt.tools" version=3D"3.6.0.v3611d"/> +<repository location=3D"http://download.eclipse.org/eclipse/updates/3.6mil= estones/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.birt.integration.wtp.feature.group" version=3D"2.6= .0.v20100525-2205-35-7w3121163603316"/> +<repository location=3D"http://download.eclipse.org/birt/update-site/2.6-i= nterim/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.emf.sdk.feature.group" version=3D"2.6.0.v20100517-= 1331"/> +<unit id=3D"org.eclipse.gef.sdk.feature.group" version=3D"3.6.0.v20100429-= 2050-7G7R-A5WNaPQIcSWKMfdROUWaQLI"/> +<unit id=3D"org.eclipse.zest.sdk.feature.group" version=3D"1.2.0.v20100429= -2050-679-8COKLDAJPWQNSXWPTedQT8YP"/> +<unit id=3D"org.eclipse.xsd.sdk.feature.group" version=3D"2.6.0.v20100503-= 1402"/> +<unit id=3D"org.eclipse.tptp.monitoring.runtime.feature.group" version=3D"= 4.5.0.v201005032111-7T7X-7r2VNos_vYhrZgcqiTMM"/> +<unit id=3D"org.eclipse.tptp.platform.runtime.feature.group" version=3D"4.= 7.0.v201005032111-7u84-8ksiMskubQ6UTA7XS3tcLX0"/> +<unit id=3D"org.eclipse.tptp.wtp.feature.group" version=3D"4.5.0.v20100503= 2111-54-78I8G0BlG8C88S8WCW88"/> +<unit id=3D"org.eclipse.tptp.birt.feature.group" version=3D"4.5.0.v2010050= 32111-53-78A8A09t84644E4G6G44"/> +<unit id=3D"org.eclipse.tptp.test.runtime.feature.group" version=3D"4.5.0.= v201005032111-7H7I-7VrO5DXI-B6opYKPuD-96gb"/> +<unit id=3D"org.eclipse.tptp.trace.runtime.feature.group" version=3D"4.4.0= .v201005032111-7H7C-7XbL_J3E9NJOSVeYeWM94"/> +<unit id=3D"org.eclipse.jst.server_adapters.feature.feature.group" version= =3D"3.2.0.v201004210628-208Z7w31211419"/> +<unit id=3D"org.eclipse.wst.server_adapters.feature.feature.group" version= =3D"3.2.0.v201004210628-51EoAkF77g8HBSc"/> +<repository location=3D"http://download.eclipse.org/releases/helios"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.maven.ide.eclipse.sdk.feature.feature.group" version=3D"0.= 10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.wtp.feature.feature.group" version=3D"0.= 10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.subclipse.feature.feature.group" version= =3D"0.10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.cvs.feature.feature.group" version=3D"0.= 10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.scm.feature.feature.group" version=3D"0.= 10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.temporary.mojos.feature.feature.group" v= ersion=3D"0.10.0.20100209-0800"/> +<repository location=3D"http://m2eclipse.sonatype.org/sites/m2e-extras/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.maven.ide.eclipse.feature.feature.group" version=3D"0.10.0= .20100209-0800"/> +<repository location=3D"http://m2eclipse.sonatype.org/sites/m2e"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.tmatesoft.svnkit.feature.group" version=3D"1.3.3.6648"/> +<unit id=3D"com.sun.jna.feature.group" version=3D"3.2.3"/> +<repository location=3D"http://eclipse.svnkit.com/1.3.x/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.polarion.eclipse.team.svn.connector.svnkit15.feature.group= " version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl15.feature.group= " version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl15.win32.feature= .group" version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.feature.group" version= =3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.svnkit16.feature.group= " version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl16.win32.feature= .group" version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl.feature.group" = version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl16.feature.group= " version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl.win32.feature.g= roup" version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.svnkit.feature.group" = version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.source.feature.group" = version=3D"2.2.2.I20100512-1900"/> +<repository location=3D"http://www.polarion.org/projects/subversive/downlo= ad/eclipse/2.0/update-site/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.team.svn.mylyn.feature.group" version=3D"0.7.9.I20= 100512-1900"/> +<unit id=3D"org.eclipse.team.svn.source.feature.group" version=3D"0.7.9.I2= 0100512-1900"/> +<unit id=3D"org.eclipse.team.svn.feature.group" version=3D"0.7.9.I20100512= -1900"/> +<unit id=3D"org.eclipse.team.svn.resource.ignore.rules.jdt.feature.group" = version=3D"0.7.9.I20100512-1900"/> +<unit id=3D"org.eclipse.team.svn.revision.graph.feature.group" version=3D"= 0.7.9.I20100512-1900"/> +<unit id=3D"org.eclipse.team.svn.nl1.feature.group" version=3D"0.7.9.I2010= 0512-1900"/> +<repository location=3D"http://download.eclipse.org/technology/subversive/= 0.7/update-site/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.ecf.core.source.feature.group" version=3D"3.2.0.v2= 0100219-1253"/> +<unit id=3D"org.eclipse.ecf.core.featurepatch.source.feature.group" versio= n=3D"3.2.0.v20100219-1253"/> +<unit id=3D"org.eclipse.ecf.core.feature.group" version=3D"3.2.0.v20100219= -1253"/> +<unit id=3D"org.eclipse.ecf.core.featurepatch.feature.group" version=3D"3.= 2.0.v20100219-1253"/> +<repository location=3D"http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2= "/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.swtbot.eclipse.feature.group" version=3D"2.0.0.568= -dev-e36"/> +<unit id=3D"org.eclipse.swtbot.eclipse.gef.feature.group" version=3D"2.0.0= .568-dev-e36"/> +<unit id=3D"org.eclipse.swtbot.ide.feature.group" version=3D"2.0.0.568-dev= -e36"/> +<unit id=3D"org.eclipse.swtbot.eclipse.test.junit4.feature.group" version= =3D"2.0.0.568-dev-e36"/> +<unit id=3D"org.eclipse.swtbot.feature.group" version=3D"2.0.0.568-dev-e36= "/> +<repository location=3D"http://download.eclipse.org/technology/swtbot/heli= os/dev-build/update-site"/> +</location> +</locations> +<targetJRE path=3D"org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt= .internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> +</target> --===============9217708504311307961==-- From jbosstools-commits at lists.jboss.org Thu May 27 17:44:35 2010 Content-Type: multipart/mixed; boundary="===============7961438652502444321==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22393 - trunk/build. Date: Thu, 27 May 2010 17:44:35 -0400 Message-ID: <201005272144.o4RLiZCj019707@svn01.web.mwc.hst.phx2.redhat.com> --===============7961438652502444321== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-27 17:44:34 -0400 (Thu, 27 May 2010) New Revision: 22393 Modified: trunk/build/build.xml Log: remove empty else block Modified: trunk/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/build/build.xml 2010-05-27 21:41:03 UTC (rev 22392) +++ trunk/build/build.xml 2010-05-27 21:44:34 UTC (rev 22393) @@ -802,8 +802,6 @@ <then> <delete dir=3D"${WORKINGDIR}/${COMPONENT}" includes=3D"**/target/suref= ire-reports" /> </then> - <else> - </else> </if> </target> = --===============7961438652502444321==-- From jbosstools-commits at lists.jboss.org Thu May 27 17:45:12 2010 Content-Type: multipart/mixed; boundary="===============9071130014580718898==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22394 - branches/modular_build/build. Date: Thu, 27 May 2010 17:45:12 -0400 Message-ID: <201005272145.o4RLjCDQ020078@svn01.web.mwc.hst.phx2.redhat.com> --===============9071130014580718898== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-27 17:45:11 -0400 (Thu, 27 May 2010) New Revision: 22394 Added: branches/modular_build/build/jbds.product branches/modular_build/build/jbds4.target branches/modular_build/build/publish.sh Modified: branches/modular_build/build/build.xml Log: port from trunk Modified: branches/modular_build/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/build.xml 2010-05-27 21:44:34 UTC (rev 223= 93) +++ branches/modular_build/build/build.xml 2010-05-27 21:45:11 UTC (rev 223= 94) @@ -9,16 +9,16 @@ value=3D"tests,common; flow,jbpm; jmx,archives,as; - drools,bpel,smooks,freemarker,profiler,portlet,modeshape; + bpel,smooks,freemarker,profiler,portlet,modeshape; xulrunner,jst,vpe,jsf; - esb,tptp,ws; + drools,esb,tptp,ws; cdi,struts,hibernatetools,seam; examples,birt; maven" /> = <!-- svn root, including trunk or branch path --> - <property name=3D"svn.root" value=3D"http://anonsvn.jboss.org/repos/jboss= tools/branches/modular_build" /> + <property name=3D"svn.root" value=3D"http://anonsvn.jboss.org/repos/jboss= tools/branches/3.2.helios" /> = <!-- if true, use -Dmaven.repo.local=3D${COMMON_TOOLS}/m2-repository; if = false, use default ~/.m2/repository; or set another path if preferred --> <property name=3D"maven.repo.local" value=3D"true" /> @@ -516,14 +516,7 @@ <echo level=3D"warning">All components up to date: nothing to do! To force a build of unchanged components, use -Dbuild.if.sources.unchanged= =3Dtrue</echo> = - <!-- create fake test result file to avoid Hudson failure --> - <delete dir=3D"${basedir}/surefire-reports/NoTestsRun" includeemptyd= irs=3D"true" /> - <mkdir dir=3D"${basedir}/surefire-reports/NoTestsRun" /> - <echo file=3D"${basedir}/surefire-reports/NoTestsRun/TEST-org.jboss.= tools.NoTestsRun.xml"><?xml version=3D"1.0" encoding=3D"UTF-8" ?> -<testsuite failures=3D"0" time=3D"0.001" errors=3D"0" skipped=3D"0" tes= ts=3D"1" name=3D"org.jboss.tools.NoTestsRun"> - <testcase time=3D"0.001" classname=3D"org.jboss.tools.NoTestsRun" nam= e=3D"NoTestsRun"/> -</testsuite> -</echo> + <antcall target=3D"create.empty.test.results.file" /> <property name=3D"no.tests.run" value=3D"true" /> <property name=3D"no.overall" value=3D"true" /> </then> @@ -551,9 +544,68 @@ </if> </target> = + <!-- + To run this after a maven build in Hudson, set these properties: + basedir=3D${WORKSPACE}/sources + WORKINGDIR=3D${WORKSPACE}/sources + COMPONENT=3D. + move.test.results=3Dtrue = + --> + <target name=3D"collect.test.results.for.hudson" + depends=3D"init" + if=3D"isInHudson" + description=3D"collect test results after a pure maven build so H= udson has something to see" + > + <property name=3D"basedir" value=3D"${WORKSPACE}/sources" /> + <property name=3D"WORKINGDIR" value=3D"${WORKSPACE}/sources" /> + <property name=3D"COMPONENT" value=3D"." /> + <property name=3D"move.test.results" value=3D"true" /> + <var name=3D"tests.results.found" value=3D"false" /> + <echo level=3D"debug">basedir =3D ${basedir} +WORKINGDIR =3D ${WORKINGDIR} +COMPONENT =3D ${COMPONENT}</echo> + <delete dir=3D"${basedir}/surefire-reports/NoTestsRun" includeemptydirs= =3D"true" /> + <for param=3D"test.xml.files" delimiter=3D", = + "> + <path> + <fileset dir=3D"${WORKINGDIR}" + includes=3D"**/target/surefire-reports/TEST-*.xml, **/**/targ= et/surefire-reports/TEST-*.xml" + excludes=3D"**/TEST-*NoTestsRun.xml, **/**/TEST-*NoTestsRun.x= ml" + /> + </path> + <sequential> + <var name=3D"tests.results.found" value=3D"true" /> + </sequential> + </for> + <if> + <equals arg1=3D"${tests.results.found}" arg2=3D"true" /> + <then> + <antcall target=3D"collect.test.results"> + <param name=3D"COMPONENT" value=3D"." /> + </antcall> + <antcall target=3D"collect.all.test.results" /> + </then> + <else> + <antcall target=3D"create.empty.test.results.file" /> + <property name=3D"no.tests.run" value=3D"true" /> + </else> + </if> + </target> + + <target name=3D"create.empty.test.results.file"> + <!-- create fake test result file to avoid Hudson failure --> + <delete dir=3D"${basedir}/surefire-reports/NoTestsRun" includeemptydirs= =3D"true" /> + <mkdir dir=3D"${basedir}/surefire-reports/NoTestsRun" /> + <echo file=3D"${basedir}/surefire-reports/NoTestsRun/TEST-org.jboss.tool= s.NoTestsRun.xml"><?xml version=3D"1.0" encoding=3D"UTF-8" ?> +<testsuite failures=3D"0" time=3D"0.001" errors=3D"0" skipped=3D"0" tes= ts=3D"1" name=3D"org.jboss.tools.NoTestsRun"> +<testcase time=3D"0.001" classname=3D"org.jboss.tools.NoTestsRun" name= =3D"NoTestsRun"/> +</testsuite> +</echo> + </target> + <target name=3D"run.build"> <!-- could set -Dmaven.test.skip to skip tests, or use osgi-test:test to= just (re-)run tests w/o first building --> - <property name=3D"MAVEN_FLAGS" value=3D"clean install -B -fn -q -U -e -D= surefire.useFile=3Dfalse" /> + <property name=3D"MAVEN_FLAGS" value=3D"clean install -B -fn -q -U -e" /> = <!-- commandline overrides to suppress doing tests --> <if> @@ -608,6 +660,7 @@ <ant antfile=3D"${WORKINGDIR}/@{COMPONENT}/build.xml"> <property name=3D"COMPONENT" value=3D"@{COMPONENT}" /> <property name=3D"basedir" value=3D"${WORKINGDIR}/@{COMPONENT}" /> + <property name=3D"build.xml" value=3D"${ant.file}"/> </ant> </then> </if> @@ -742,8 +795,14 @@ preservelastmodified=3D"true" overwrite=3D"true" > - <fileset dir=3D"${WORKINGDIR}/${COMPONENT}" includes=3D"**/target/suref= ire-reports/*.xml" /> + <fileset dir=3D"${WORKINGDIR}/${COMPONENT}" includes=3D"**/target/suref= ire-reports/TEST-*.xml" /> </copy> + <if> + <isset property=3D"move.test.results" /> + <then> + <delete dir=3D"${WORKINGDIR}/${COMPONENT}" includes=3D"**/target/suref= ire-reports" /> + </then> + </if> </target> = <target name=3D"collect.all.test.results" unless=3D"no.tests.run"> @@ -754,10 +813,7 @@ <for param=3D"testresultfile" delimiter=3D", = "> <path> - <fileset dir=3D"${basedir}/surefire-reports/" - includes=3D"**/TEST-*.xml" - excludes=3D"**/*pom.xml, **/build.xml" - /> + <fileset dir=3D"${basedir}/surefire-reports/" includes=3D"**/TEST-*.xm= l" /> </path> <sequential> <var name=3D"testsuite.name" unset=3D"true" /> @@ -891,7 +947,7 @@ <equals arg1=3D"@{COMPONENT}" arg2=3D"site" /> <then> <var name=3D"destinationZip" - value=3D"${WORKINGDIR}/@{COMPONENT}/site/target/JBossTools-AL= L-Update-SNAPSHOT.zip" + value=3D"${WORKINGDIR}/@{COMPONENT}/site/target/jbosstools-AL= L-Update-SNAPSHOT.zip" /> </then> <else> @@ -906,7 +962,7 @@ </else> </if> <var name=3D"destinationZip" - value=3D"${WORKINGDIR}/@{COMPONENT}/site/target/JBossTools-${= COMPONENT.name}-Update-SNAPSHOT.zip" + value=3D"${WORKINGDIR}/@{COMPONENT}/site/target/jbosstools-${= COMPONENT.name}-Update-SNAPSHOT.zip" /> </else> </if> @@ -918,10 +974,10 @@ /> </sequential> </for> - = + <for param=3D"updateZip"> <path> - <fileset dir=3D"${WORKINGDIR}/@{COMPONENT}" includes=3D"**/JBossTool= s*Update*.zip" /> + <fileset dir=3D"${WORKINGDIR}/@{COMPONENT}" includes=3D"**/jbosstool= s*Update*.zip" /> </path> <sequential> <propertyregex property=3D"updateZip" @@ -1037,7 +1093,7 @@ <equals arg1=3D"${update.site.path}" arg2=3D"site" /> <then> <var name=3D"destinationZip" - value=3D"${WORKINGDIR}/${update.site.path}/target/JBossTools-ALL-= Update-SNAPSHOT.zip" + value=3D"${WORKINGDIR}/${update.site.path}/target/jbosstools-ALL-= Update-SNAPSHOT.zip" /> </then> <else> @@ -1052,7 +1108,7 @@ </else> </if> <var name=3D"destinationZip" - value=3D"${WORKINGDIR}/${update.site.path}/target/JBossTools-${CO= MPONENT.name}-Update-SNAPSHOT.zip" + value=3D"${WORKINGDIR}/${update.site.path}/target/jbosstools-${CO= MPONENT.name}-Update-SNAPSHOT.zip" /> </else> </if> @@ -1126,7 +1182,7 @@ <fail>Overall update site zip contains no features!</fail> </then> <else> - <echo level=3D"info">Update site zip for ${COMPONENTS.to.build} cont= ains no features!</echo> + <echo level=3D"info"> [ERROR] Update site zip for ${COMPONENTS.to.bu= ild} contains no features!</echo> </else> </if> </else> @@ -1194,10 +1250,26 @@ </echo> = <mkdir dir=3D"${updateSiteJarDir}/../features" /> + <if> + <!-- special case: for tests component, we WANT test features; for ever= yone else, test features shouldn't be on the site --> + <equals arg1=3D"${COMPONENT}" arg2=3D"tests" /> + <then> + <path id=3D"featureJars"> + <fileset dir=3D"${updateSiteJarDir}/../features" includes=3D"**/targe= t/*.jar" /> + </path> + </then> + <else> + <path id=3D"featureJars"> + <fileset dir=3D"${updateSiteJarDir}/../features" + includes=3D"**/target/*.jar" + excludes=3D"**/*test*" + id=3D"" + /> + </path> + </else> + </if> <for param=3D"featureJar"> - <path> - <fileset dir=3D"${updateSiteJarDir}/../features" includes=3D"**/target= /*.jar" excludes=3D"**/*test*" /> - </path> + <path refid=3D"featureJars" /> <sequential> <var name=3D"feature.jarfile" unset=3D"true" /> <var name=3D"feature.id" unset=3D"true" /> Added: branches/modular_build/build/jbds.product =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/jbds.product (rev = 0) +++ branches/modular_build/build/jbds.product 2010-05-27 21:45:11 UTC (rev = 22394) @@ -0,0 +1,37 @@ +<?xml version=3D"1.0" encoding=3D"UTF-8"?> +<?pde version=3D"3.5"?> + +<product name=3D"JBoss Devloper Studio" uid=3D"com.jboss.developer.studio"= id=3D"org.eclipse.platform.ide" application=3D"org.eclipse.ui.ide.workbenc= h" version=3D"3.1.0" useFeatures=3D"true" includeLaunchers=3D"true"> + + + <configIni use=3D"default"> + </configIni> + + <launcherArgs> + <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.sm= allFonts</vmArgsMac> + </launcherArgs> + + <windowImages/> + + + <launcher name=3D"jbds"> + <solaris/> + <win useIco=3D"false"> + <bmp/> + </win> + </launcher> + + + <vm> + <linux>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.inter= nal.debug.ui.launcher.StandardVMType/J2SE-1.5</linux> + <macos>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.inter= nal.debug.ui.launcher.StandardVMType/J2SE-1.5</macos> + <solaris>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.int= ernal.debug.ui.launcher.StandardVMType/J2SE-1.5</solaris> + <windows>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.int= ernal.debug.ui.launcher.StandardVMType/J2SE-1.5</windows> + </vm> + + + <plugins> + </plugins> + + +</product> Added: branches/modular_build/build/jbds4.target =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/jbds4.target (rev = 0) +++ branches/modular_build/build/jbds4.target 2010-05-27 21:45:11 UTC (rev = 22394) @@ -0,0 +1,91 @@ +<?xml version=3D"1.0" encoding=3D"UTF-8" standalone=3D"no"?> +<?pde version=3D"3.6"?> + +<target name=3D"JBDS 4 / Eclipse 3.6 / Web Tools 3.2"> +<locations> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.platform.ide" version=3D"3.6.0.I20100520-1744"/> +<unit id=3D"org.eclipse.platform.sdk" version=3D"3.6.0.I20100520-1744"/> +<unit id=3D"org.eclipse.sdk.ide" version=3D"3.6.0.I20100520-1744"/> +<unit id=3D"org.eclipse.releng.tools.feature.group" version=3D"3.3.0.v2010= 0427-44A77w31211614"/> +<unit id=3D"org.eclipse.swt.tools" version=3D"3.6.0.v3611d"/> +<repository location=3D"http://download.eclipse.org/eclipse/updates/3.6mil= estones/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.birt.integration.wtp.feature.group" version=3D"2.6= .0.v20100525-2205-35-7w3121163603316"/> +<repository location=3D"http://download.eclipse.org/birt/update-site/2.6-i= nterim/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.emf.sdk.feature.group" version=3D"2.6.0.v20100517-= 1331"/> +<unit id=3D"org.eclipse.gef.sdk.feature.group" version=3D"3.6.0.v20100429-= 2050-7G7R-A5WNaPQIcSWKMfdROUWaQLI"/> +<unit id=3D"org.eclipse.zest.sdk.feature.group" version=3D"1.2.0.v20100429= -2050-679-8COKLDAJPWQNSXWPTedQT8YP"/> +<unit id=3D"org.eclipse.xsd.sdk.feature.group" version=3D"2.6.0.v20100503-= 1402"/> +<unit id=3D"org.eclipse.tptp.monitoring.runtime.feature.group" version=3D"= 4.5.0.v201005032111-7T7X-7r2VNos_vYhrZgcqiTMM"/> +<unit id=3D"org.eclipse.tptp.platform.runtime.feature.group" version=3D"4.= 7.0.v201005032111-7u84-8ksiMskubQ6UTA7XS3tcLX0"/> +<unit id=3D"org.eclipse.tptp.wtp.feature.group" version=3D"4.5.0.v20100503= 2111-54-78I8G0BlG8C88S8WCW88"/> +<unit id=3D"org.eclipse.tptp.birt.feature.group" version=3D"4.5.0.v2010050= 32111-53-78A8A09t84644E4G6G44"/> +<unit id=3D"org.eclipse.tptp.test.runtime.feature.group" version=3D"4.5.0.= v201005032111-7H7I-7VrO5DXI-B6opYKPuD-96gb"/> +<unit id=3D"org.eclipse.tptp.trace.runtime.feature.group" version=3D"4.4.0= .v201005032111-7H7C-7XbL_J3E9NJOSVeYeWM94"/> +<unit id=3D"org.eclipse.jst.server_adapters.feature.feature.group" version= =3D"3.2.0.v201004210628-208Z7w31211419"/> +<unit id=3D"org.eclipse.wst.server_adapters.feature.feature.group" version= =3D"3.2.0.v201004210628-51EoAkF77g8HBSc"/> +<repository location=3D"http://download.eclipse.org/releases/helios"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.maven.ide.eclipse.sdk.feature.feature.group" version=3D"0.= 10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.wtp.feature.feature.group" version=3D"0.= 10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.subclipse.feature.feature.group" version= =3D"0.10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.cvs.feature.feature.group" version=3D"0.= 10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.scm.feature.feature.group" version=3D"0.= 10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.temporary.mojos.feature.feature.group" v= ersion=3D"0.10.0.20100209-0800"/> +<repository location=3D"http://m2eclipse.sonatype.org/sites/m2e-extras/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.maven.ide.eclipse.feature.feature.group" version=3D"0.10.0= .20100209-0800"/> +<repository location=3D"http://m2eclipse.sonatype.org/sites/m2e"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.tmatesoft.svnkit.feature.group" version=3D"1.3.3.6648"/> +<unit id=3D"com.sun.jna.feature.group" version=3D"3.2.3"/> +<repository location=3D"http://eclipse.svnkit.com/1.3.x/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.polarion.eclipse.team.svn.connector.svnkit15.feature.group= " version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl15.feature.group= " version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl15.win32.feature= .group" version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.feature.group" version= =3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.svnkit16.feature.group= " version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl16.win32.feature= .group" version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl.feature.group" = version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl16.feature.group= " version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl.win32.feature.g= roup" version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.svnkit.feature.group" = version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.source.feature.group" = version=3D"2.2.2.I20100512-1900"/> +<repository location=3D"http://www.polarion.org/projects/subversive/downlo= ad/eclipse/2.0/update-site/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.team.svn.mylyn.feature.group" version=3D"0.7.9.I20= 100512-1900"/> +<unit id=3D"org.eclipse.team.svn.source.feature.group" version=3D"0.7.9.I2= 0100512-1900"/> +<unit id=3D"org.eclipse.team.svn.feature.group" version=3D"0.7.9.I20100512= -1900"/> +<unit id=3D"org.eclipse.team.svn.resource.ignore.rules.jdt.feature.group" = version=3D"0.7.9.I20100512-1900"/> +<unit id=3D"org.eclipse.team.svn.revision.graph.feature.group" version=3D"= 0.7.9.I20100512-1900"/> +<unit id=3D"org.eclipse.team.svn.nl1.feature.group" version=3D"0.7.9.I2010= 0512-1900"/> +<repository location=3D"http://download.eclipse.org/technology/subversive/= 0.7/update-site/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.ecf.core.source.feature.group" version=3D"3.2.0.v2= 0100219-1253"/> +<unit id=3D"org.eclipse.ecf.core.featurepatch.source.feature.group" versio= n=3D"3.2.0.v20100219-1253"/> +<unit id=3D"org.eclipse.ecf.core.feature.group" version=3D"3.2.0.v20100219= -1253"/> +<unit id=3D"org.eclipse.ecf.core.featurepatch.feature.group" version=3D"3.= 2.0.v20100219-1253"/> +<repository location=3D"http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2= "/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.swtbot.eclipse.feature.group" version=3D"2.0.0.568= -dev-e36"/> +<unit id=3D"org.eclipse.swtbot.eclipse.gef.feature.group" version=3D"2.0.0= .568-dev-e36"/> +<unit id=3D"org.eclipse.swtbot.ide.feature.group" version=3D"2.0.0.568-dev= -e36"/> +<unit id=3D"org.eclipse.swtbot.eclipse.test.junit4.feature.group" version= =3D"2.0.0.568-dev-e36"/> +<unit id=3D"org.eclipse.swtbot.feature.group" version=3D"2.0.0.568-dev-e36= "/> +<repository location=3D"http://download.eclipse.org/technology/swtbot/heli= os/dev-build/update-site"/> +</location> +</locations> +<targetJRE path=3D"org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt= .internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> +</target> Added: branches/modular_build/build/publish.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/modular_build/build/publish.sh (rev 0) +++ branches/modular_build/build/publish.sh 2010-05-27 21:45:11 UTC (rev 22= 394) @@ -0,0 +1,30 @@ +#!/bin/bash +# Hudson script used to publish Tycho-built p2 update sites + +# define target zip filename date and hudson build id marked for clarity a= nd publication +ZIPNAME=3D${JOB_NAME}-Update-H${BUILD_NUMBER}-${BUILD_ID}.zip + +# define target zip filename for inclusion in uberbuilder's bucky aggregat= or +SNAPNAME=3D${JOB_NAME}-Update-SNAPSHOT.zip + +rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME} +if [[ -f ${WORKSPACE}/*/site/target/site.zip ]]; then = + # copy into workspace for archiving + rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAM= E}/${ZIPNAME} + # copy into workspace for access by bucky aggregator + rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${SNAPNAM= E} +fi + +# if zips exist produced & renamed by ant script, copy them too +if [[ -f ${WORKSPACE}/*/*/site/target/*Update*.zip ]]; then + rsync -aq ${WORKSPACE}/*/*/site/target/*Update*.zip ${WORKSPACE}/site/${J= OB_NAME}/ +fi + +# publish to download.jboss.org +if [[ $DESTINATION =3D=3D "" ]]; then DESTINATION=3D"tools(a)filemgmt.jbos= s.org:/downloads_htdocs/tools"; fi +if [[ -d ${WORKSPACE}/site/${JOB_NAME} ]]; then + rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/builds/ni= ghtly/3.2.helios/ +fi +if [[ -d ${WORKSPACE}/site/${SNAPNAME} ]]; then + rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/builds/ni= ghtly/3.2.helios/ +fi \ No newline at end of file --===============9071130014580718898==-- From jbosstools-commits at lists.jboss.org Thu May 27 17:47:24 2010 Content-Type: multipart/mixed; boundary="===============0152714198848630783==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22395 - branches/3.2.helios/build. Date: Thu, 27 May 2010 17:47:24 -0400 Message-ID: <201005272147.o4RLlOCi020881@svn01.web.mwc.hst.phx2.redhat.com> --===============0152714198848630783== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-27 17:47:23 -0400 (Thu, 27 May 2010) New Revision: 22395 Added: branches/3.2.helios/build/jbds.product branches/3.2.helios/build/jbds4.target branches/3.2.helios/build/publish.sh Modified: branches/3.2.helios/build/build.xml Log: port from trunk Modified: branches/3.2.helios/build/build.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/build/build.xml 2010-05-27 21:45:11 UTC (rev 22394) +++ branches/3.2.helios/build/build.xml 2010-05-27 21:47:23 UTC (rev 22395) @@ -18,7 +18,7 @@ /> = <!-- svn root, including trunk or branch path --> - <property name=3D"svn.root" value=3D"http://anonsvn.jboss.org/repos/jboss= tools/trunk" /> + <property name=3D"svn.root" value=3D"http://anonsvn.jboss.org/repos/jboss= tools/branches/3.2.helios" /> = <!-- if true, use -Dmaven.repo.local=3D${COMMON_TOOLS}/m2-repository; if = false, use default ~/.m2/repository; or set another path if preferred --> <property name=3D"maven.repo.local" value=3D"true" /> @@ -516,14 +516,7 @@ <echo level=3D"warning">All components up to date: nothing to do! To force a build of unchanged components, use -Dbuild.if.sources.unchanged= =3Dtrue</echo> = - <!-- create fake test result file to avoid Hudson failure --> - <delete dir=3D"${basedir}/surefire-reports/NoTestsRun" includeemptyd= irs=3D"true" /> - <mkdir dir=3D"${basedir}/surefire-reports/NoTestsRun" /> - <echo file=3D"${basedir}/surefire-reports/NoTestsRun/TEST-org.jboss.= tools.NoTestsRun.xml"><?xml version=3D"1.0" encoding=3D"UTF-8" ?> -<testsuite failures=3D"0" time=3D"0.001" errors=3D"0" skipped=3D"0" tes= ts=3D"1" name=3D"org.jboss.tools.NoTestsRun"> - <testcase time=3D"0.001" classname=3D"org.jboss.tools.NoTestsRun" nam= e=3D"NoTestsRun"/> -</testsuite> -</echo> + <antcall target=3D"create.empty.test.results.file" /> <property name=3D"no.tests.run" value=3D"true" /> <property name=3D"no.overall" value=3D"true" /> </then> @@ -551,6 +544,65 @@ </if> </target> = + <!-- + To run this after a maven build in Hudson, set these properties: + basedir=3D${WORKSPACE}/sources + WORKINGDIR=3D${WORKSPACE}/sources + COMPONENT=3D. + move.test.results=3Dtrue = + --> + <target name=3D"collect.test.results.for.hudson" + depends=3D"init" + if=3D"isInHudson" + description=3D"collect test results after a pure maven build so H= udson has something to see" + > + <property name=3D"basedir" value=3D"${WORKSPACE}/sources" /> + <property name=3D"WORKINGDIR" value=3D"${WORKSPACE}/sources" /> + <property name=3D"COMPONENT" value=3D"." /> + <property name=3D"move.test.results" value=3D"true" /> + <var name=3D"tests.results.found" value=3D"false" /> + <echo level=3D"debug">basedir =3D ${basedir} +WORKINGDIR =3D ${WORKINGDIR} +COMPONENT =3D ${COMPONENT}</echo> + <delete dir=3D"${basedir}/surefire-reports/NoTestsRun" includeemptydirs= =3D"true" /> + <for param=3D"test.xml.files" delimiter=3D", = + "> + <path> + <fileset dir=3D"${WORKINGDIR}" + includes=3D"**/target/surefire-reports/TEST-*.xml, **/**/targ= et/surefire-reports/TEST-*.xml" + excludes=3D"**/TEST-*NoTestsRun.xml, **/**/TEST-*NoTestsRun.x= ml" + /> + </path> + <sequential> + <var name=3D"tests.results.found" value=3D"true" /> + </sequential> + </for> + <if> + <equals arg1=3D"${tests.results.found}" arg2=3D"true" /> + <then> + <antcall target=3D"collect.test.results"> + <param name=3D"COMPONENT" value=3D"." /> + </antcall> + <antcall target=3D"collect.all.test.results" /> + </then> + <else> + <antcall target=3D"create.empty.test.results.file" /> + <property name=3D"no.tests.run" value=3D"true" /> + </else> + </if> + </target> + + <target name=3D"create.empty.test.results.file"> + <!-- create fake test result file to avoid Hudson failure --> + <delete dir=3D"${basedir}/surefire-reports/NoTestsRun" includeemptydirs= =3D"true" /> + <mkdir dir=3D"${basedir}/surefire-reports/NoTestsRun" /> + <echo file=3D"${basedir}/surefire-reports/NoTestsRun/TEST-org.jboss.tool= s.NoTestsRun.xml"><?xml version=3D"1.0" encoding=3D"UTF-8" ?> +<testsuite failures=3D"0" time=3D"0.001" errors=3D"0" skipped=3D"0" tes= ts=3D"1" name=3D"org.jboss.tools.NoTestsRun"> +<testcase time=3D"0.001" classname=3D"org.jboss.tools.NoTestsRun" name= =3D"NoTestsRun"/> +</testsuite> +</echo> + </target> + <target name=3D"run.build"> <!-- could set -Dmaven.test.skip to skip tests, or use osgi-test:test to= just (re-)run tests w/o first building --> <property name=3D"MAVEN_FLAGS" value=3D"clean install -B -fn -q -U -e" /> @@ -608,6 +660,7 @@ <ant antfile=3D"${WORKINGDIR}/@{COMPONENT}/build.xml"> <property name=3D"COMPONENT" value=3D"@{COMPONENT}" /> <property name=3D"basedir" value=3D"${WORKINGDIR}/@{COMPONENT}" /> + <property name=3D"build.xml" value=3D"${ant.file}"/> </ant> </then> </if> @@ -742,8 +795,14 @@ preservelastmodified=3D"true" overwrite=3D"true" > - <fileset dir=3D"${WORKINGDIR}/${COMPONENT}" includes=3D"**/target/suref= ire-reports/*.xml" /> + <fileset dir=3D"${WORKINGDIR}/${COMPONENT}" includes=3D"**/target/suref= ire-reports/TEST-*.xml" /> </copy> + <if> + <isset property=3D"move.test.results" /> + <then> + <delete dir=3D"${WORKINGDIR}/${COMPONENT}" includes=3D"**/target/suref= ire-reports" /> + </then> + </if> </target> = <target name=3D"collect.all.test.results" unless=3D"no.tests.run"> @@ -754,10 +813,7 @@ <for param=3D"testresultfile" delimiter=3D", = "> <path> - <fileset dir=3D"${basedir}/surefire-reports/" - includes=3D"**/TEST-*.xml" - excludes=3D"**/*pom.xml, **/build.xml" - /> + <fileset dir=3D"${basedir}/surefire-reports/" includes=3D"**/TEST-*.xm= l" /> </path> <sequential> <var name=3D"testsuite.name" unset=3D"true" /> @@ -891,7 +947,7 @@ <equals arg1=3D"@{COMPONENT}" arg2=3D"site" /> <then> <var name=3D"destinationZip" - value=3D"${WORKINGDIR}/@{COMPONENT}/site/target/JBossTools-AL= L-Update-SNAPSHOT.zip" + value=3D"${WORKINGDIR}/@{COMPONENT}/site/target/jbosstools-AL= L-Update-SNAPSHOT.zip" /> </then> <else> @@ -906,7 +962,7 @@ </else> </if> <var name=3D"destinationZip" - value=3D"${WORKINGDIR}/@{COMPONENT}/site/target/JBossTools-${= COMPONENT.name}-Update-SNAPSHOT.zip" + value=3D"${WORKINGDIR}/@{COMPONENT}/site/target/jbosstools-${= COMPONENT.name}-Update-SNAPSHOT.zip" /> </else> </if> @@ -918,10 +974,10 @@ /> </sequential> </for> - = + <for param=3D"updateZip"> <path> - <fileset dir=3D"${WORKINGDIR}/@{COMPONENT}" includes=3D"**/JBossTool= s*Update*.zip" /> + <fileset dir=3D"${WORKINGDIR}/@{COMPONENT}" includes=3D"**/jbosstool= s*Update*.zip" /> </path> <sequential> <propertyregex property=3D"updateZip" @@ -1037,7 +1093,7 @@ <equals arg1=3D"${update.site.path}" arg2=3D"site" /> <then> <var name=3D"destinationZip" - value=3D"${WORKINGDIR}/${update.site.path}/target/JBossTools-ALL-= Update-SNAPSHOT.zip" + value=3D"${WORKINGDIR}/${update.site.path}/target/jbosstools-ALL-= Update-SNAPSHOT.zip" /> </then> <else> @@ -1052,7 +1108,7 @@ </else> </if> <var name=3D"destinationZip" - value=3D"${WORKINGDIR}/${update.site.path}/target/JBossTools-${CO= MPONENT.name}-Update-SNAPSHOT.zip" + value=3D"${WORKINGDIR}/${update.site.path}/target/jbosstools-${CO= MPONENT.name}-Update-SNAPSHOT.zip" /> </else> </if> @@ -1126,7 +1182,7 @@ <fail>Overall update site zip contains no features!</fail> </then> <else> - <echo level=3D"info">Update site zip for ${COMPONENTS.to.build} cont= ains no features!</echo> + <echo level=3D"info"> [ERROR] Update site zip for ${COMPONENTS.to.bu= ild} contains no features!</echo> </else> </if> </else> @@ -1194,10 +1250,26 @@ </echo> = <mkdir dir=3D"${updateSiteJarDir}/../features" /> + <if> + <!-- special case: for tests component, we WANT test features; for ever= yone else, test features shouldn't be on the site --> + <equals arg1=3D"${COMPONENT}" arg2=3D"tests" /> + <then> + <path id=3D"featureJars"> + <fileset dir=3D"${updateSiteJarDir}/../features" includes=3D"**/targe= t/*.jar" /> + </path> + </then> + <else> + <path id=3D"featureJars"> + <fileset dir=3D"${updateSiteJarDir}/../features" + includes=3D"**/target/*.jar" + excludes=3D"**/*test*" + id=3D"" + /> + </path> + </else> + </if> <for param=3D"featureJar"> - <path> - <fileset dir=3D"${updateSiteJarDir}/../features" includes=3D"**/target= /*.jar" excludes=3D"**/*test*" /> - </path> + <path refid=3D"featureJars" /> <sequential> <var name=3D"feature.jarfile" unset=3D"true" /> <var name=3D"feature.id" unset=3D"true" /> Added: branches/3.2.helios/build/jbds.product =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/build/jbds.product (rev 0) +++ branches/3.2.helios/build/jbds.product 2010-05-27 21:47:23 UTC (rev 223= 95) @@ -0,0 +1,37 @@ +<?xml version=3D"1.0" encoding=3D"UTF-8"?> +<?pde version=3D"3.5"?> + +<product name=3D"JBoss Devloper Studio" uid=3D"com.jboss.developer.studio"= id=3D"org.eclipse.platform.ide" application=3D"org.eclipse.ui.ide.workbenc= h" version=3D"3.1.0" useFeatures=3D"true" includeLaunchers=3D"true"> + + + <configIni use=3D"default"> + </configIni> + + <launcherArgs> + <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.sm= allFonts</vmArgsMac> + </launcherArgs> + + <windowImages/> + + + <launcher name=3D"jbds"> + <solaris/> + <win useIco=3D"false"> + <bmp/> + </win> + </launcher> + + + <vm> + <linux>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.inter= nal.debug.ui.launcher.StandardVMType/J2SE-1.5</linux> + <macos>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.inter= nal.debug.ui.launcher.StandardVMType/J2SE-1.5</macos> + <solaris>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.int= ernal.debug.ui.launcher.StandardVMType/J2SE-1.5</solaris> + <windows>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.int= ernal.debug.ui.launcher.StandardVMType/J2SE-1.5</windows> + </vm> + + + <plugins> + </plugins> + + +</product> Added: branches/3.2.helios/build/jbds4.target =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/build/jbds4.target (rev 0) +++ branches/3.2.helios/build/jbds4.target 2010-05-27 21:47:23 UTC (rev 223= 95) @@ -0,0 +1,91 @@ +<?xml version=3D"1.0" encoding=3D"UTF-8" standalone=3D"no"?> +<?pde version=3D"3.6"?> + +<target name=3D"JBDS 4 / Eclipse 3.6 / Web Tools 3.2"> +<locations> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.platform.ide" version=3D"3.6.0.I20100520-1744"/> +<unit id=3D"org.eclipse.platform.sdk" version=3D"3.6.0.I20100520-1744"/> +<unit id=3D"org.eclipse.sdk.ide" version=3D"3.6.0.I20100520-1744"/> +<unit id=3D"org.eclipse.releng.tools.feature.group" version=3D"3.3.0.v2010= 0427-44A77w31211614"/> +<unit id=3D"org.eclipse.swt.tools" version=3D"3.6.0.v3611d"/> +<repository location=3D"http://download.eclipse.org/eclipse/updates/3.6mil= estones/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.birt.integration.wtp.feature.group" version=3D"2.6= .0.v20100525-2205-35-7w3121163603316"/> +<repository location=3D"http://download.eclipse.org/birt/update-site/2.6-i= nterim/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.emf.sdk.feature.group" version=3D"2.6.0.v20100517-= 1331"/> +<unit id=3D"org.eclipse.gef.sdk.feature.group" version=3D"3.6.0.v20100429-= 2050-7G7R-A5WNaPQIcSWKMfdROUWaQLI"/> +<unit id=3D"org.eclipse.zest.sdk.feature.group" version=3D"1.2.0.v20100429= -2050-679-8COKLDAJPWQNSXWPTedQT8YP"/> +<unit id=3D"org.eclipse.xsd.sdk.feature.group" version=3D"2.6.0.v20100503-= 1402"/> +<unit id=3D"org.eclipse.tptp.monitoring.runtime.feature.group" version=3D"= 4.5.0.v201005032111-7T7X-7r2VNos_vYhrZgcqiTMM"/> +<unit id=3D"org.eclipse.tptp.platform.runtime.feature.group" version=3D"4.= 7.0.v201005032111-7u84-8ksiMskubQ6UTA7XS3tcLX0"/> +<unit id=3D"org.eclipse.tptp.wtp.feature.group" version=3D"4.5.0.v20100503= 2111-54-78I8G0BlG8C88S8WCW88"/> +<unit id=3D"org.eclipse.tptp.birt.feature.group" version=3D"4.5.0.v2010050= 32111-53-78A8A09t84644E4G6G44"/> +<unit id=3D"org.eclipse.tptp.test.runtime.feature.group" version=3D"4.5.0.= v201005032111-7H7I-7VrO5DXI-B6opYKPuD-96gb"/> +<unit id=3D"org.eclipse.tptp.trace.runtime.feature.group" version=3D"4.4.0= .v201005032111-7H7C-7XbL_J3E9NJOSVeYeWM94"/> +<unit id=3D"org.eclipse.jst.server_adapters.feature.feature.group" version= =3D"3.2.0.v201004210628-208Z7w31211419"/> +<unit id=3D"org.eclipse.wst.server_adapters.feature.feature.group" version= =3D"3.2.0.v201004210628-51EoAkF77g8HBSc"/> +<repository location=3D"http://download.eclipse.org/releases/helios"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.maven.ide.eclipse.sdk.feature.feature.group" version=3D"0.= 10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.wtp.feature.feature.group" version=3D"0.= 10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.subclipse.feature.feature.group" version= =3D"0.10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.cvs.feature.feature.group" version=3D"0.= 10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.scm.feature.feature.group" version=3D"0.= 10.0.20100209-0800"/> +<unit id=3D"org.maven.ide.eclipse.temporary.mojos.feature.feature.group" v= ersion=3D"0.10.0.20100209-0800"/> +<repository location=3D"http://m2eclipse.sonatype.org/sites/m2e-extras/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.maven.ide.eclipse.feature.feature.group" version=3D"0.10.0= .20100209-0800"/> +<repository location=3D"http://m2eclipse.sonatype.org/sites/m2e"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.tmatesoft.svnkit.feature.group" version=3D"1.3.3.6648"/> +<unit id=3D"com.sun.jna.feature.group" version=3D"3.2.3"/> +<repository location=3D"http://eclipse.svnkit.com/1.3.x/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.polarion.eclipse.team.svn.connector.svnkit15.feature.group= " version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl15.feature.group= " version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl15.win32.feature= .group" version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.feature.group" version= =3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.svnkit16.feature.group= " version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl16.win32.feature= .group" version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl.feature.group" = version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl16.feature.group= " version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.javahl.win32.feature.g= roup" version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.svnkit.feature.group" = version=3D"2.2.2.I20100512-1900"/> +<unit id=3D"org.polarion.eclipse.team.svn.connector.source.feature.group" = version=3D"2.2.2.I20100512-1900"/> +<repository location=3D"http://www.polarion.org/projects/subversive/downlo= ad/eclipse/2.0/update-site/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.team.svn.mylyn.feature.group" version=3D"0.7.9.I20= 100512-1900"/> +<unit id=3D"org.eclipse.team.svn.source.feature.group" version=3D"0.7.9.I2= 0100512-1900"/> +<unit id=3D"org.eclipse.team.svn.feature.group" version=3D"0.7.9.I20100512= -1900"/> +<unit id=3D"org.eclipse.team.svn.resource.ignore.rules.jdt.feature.group" = version=3D"0.7.9.I20100512-1900"/> +<unit id=3D"org.eclipse.team.svn.revision.graph.feature.group" version=3D"= 0.7.9.I20100512-1900"/> +<unit id=3D"org.eclipse.team.svn.nl1.feature.group" version=3D"0.7.9.I2010= 0512-1900"/> +<repository location=3D"http://download.eclipse.org/technology/subversive/= 0.7/update-site/"/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.ecf.core.source.feature.group" version=3D"3.2.0.v2= 0100219-1253"/> +<unit id=3D"org.eclipse.ecf.core.featurepatch.source.feature.group" versio= n=3D"3.2.0.v20100219-1253"/> +<unit id=3D"org.eclipse.ecf.core.feature.group" version=3D"3.2.0.v20100219= -1253"/> +<unit id=3D"org.eclipse.ecf.core.featurepatch.feature.group" version=3D"3.= 2.0.v20100219-1253"/> +<repository location=3D"http://download.eclipse.org/rt/ecf/3.2/3.6/site.p2= "/> +</location> +<location includeAllPlatforms=3D"false" includeMode=3D"planner" type=3D"In= stallableUnit"> +<unit id=3D"org.eclipse.swtbot.eclipse.feature.group" version=3D"2.0.0.568= -dev-e36"/> +<unit id=3D"org.eclipse.swtbot.eclipse.gef.feature.group" version=3D"2.0.0= .568-dev-e36"/> +<unit id=3D"org.eclipse.swtbot.ide.feature.group" version=3D"2.0.0.568-dev= -e36"/> +<unit id=3D"org.eclipse.swtbot.eclipse.test.junit4.feature.group" version= =3D"2.0.0.568-dev-e36"/> +<unit id=3D"org.eclipse.swtbot.feature.group" version=3D"2.0.0.568-dev-e36= "/> +<repository location=3D"http://download.eclipse.org/technology/swtbot/heli= os/dev-build/update-site"/> +</location> +</locations> +<targetJRE path=3D"org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt= .internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> +</target> Added: branches/3.2.helios/build/publish.sh =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/build/publish.sh (rev 0) +++ branches/3.2.helios/build/publish.sh 2010-05-27 21:47:23 UTC (rev 22395) @@ -0,0 +1,30 @@ +#!/bin/bash +# Hudson script used to publish Tycho-built p2 update sites + +# define target zip filename date and hudson build id marked for clarity a= nd publication +ZIPNAME=3D${JOB_NAME}-Update-H${BUILD_NUMBER}-${BUILD_ID}.zip + +# define target zip filename for inclusion in uberbuilder's bucky aggregat= or +SNAPNAME=3D${JOB_NAME}-Update-SNAPSHOT.zip + +rm -fr ${WORKSPACE}/site; mkdir -p ${WORKSPACE}/site/${JOB_NAME} +if [[ -f ${WORKSPACE}/*/site/target/site.zip ]]; then = + # copy into workspace for archiving + rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${JOB_NAM= E}/${ZIPNAME} + # copy into workspace for access by bucky aggregator + rsync -aq ${WORKSPACE}/*/site/target/site.zip ${WORKSPACE}/site/${SNAPNAM= E} +fi + +# if zips exist produced & renamed by ant script, copy them too +if [[ -f ${WORKSPACE}/*/*/site/target/*Update*.zip ]]; then + rsync -aq ${WORKSPACE}/*/*/site/target/*Update*.zip ${WORKSPACE}/site/${J= OB_NAME}/ +fi + +# publish to download.jboss.org +if [[ $DESTINATION =3D=3D "" ]]; then DESTINATION=3D"tools(a)filemgmt.jbos= s.org:/downloads_htdocs/tools"; fi +if [[ -d ${WORKSPACE}/site/${JOB_NAME} ]]; then + rsync -arzq --delete ${WORKSPACE}/site/${JOB_NAME} $DESTINATION/builds/ni= ghtly/3.2.helios/ +fi +if [[ -d ${WORKSPACE}/site/${SNAPNAME} ]]; then + rsync -arzq --delete ${WORKSPACE}/site/${SNAPNAME} $DESTINATION/builds/ni= ghtly/3.2.helios/ +fi \ No newline at end of file --===============0152714198848630783==-- From jbosstools-commits at lists.jboss.org Thu May 27 19:22:44 2010 Content-Type: multipart/mixed; boundary="===============4989318810798595917==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22396 - in trunk/jst/tests: org.jboss.tools.jst.ui.firstrun.bot.test and 1 other directory. Date: Thu, 27 May 2010 19:22:43 -0400 Message-ID: <201005272322.o4RNMhcE011679@svn01.web.mwc.hst.phx2.redhat.com> --===============4989318810798595917== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-27 19:22:43 -0400 (Thu, 27 May 2010) New Revision: 22396 Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests revert plug-ins: -o.j.t.jst.ui.bot.test -o.j.t.jst.ui.firstrun.bot.test to eclipse-plugin or test execution fails because there are no tests inside= this plug-ins = Modified: trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml 2010-05-27 21:4= 7:23 UTC (rev 22395) +++ trunk/jst/tests/org.jboss.tools.jst.ui.bot.test/pom.xml 2010-05-27 23:2= 2:43 UTC (rev 22396) @@ -10,5 +10,5 @@ <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.jst.ui.bot.test</artifactId> = <version>3.1.0-SNAPSHOT</version> - <packaging>eclipse-test-plugin</packaging> + <packaging>eclipse-plugin</packaging> </project> Modified: trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml 2010-0= 5-27 21:47:23 UTC (rev 22395) +++ trunk/jst/tests/org.jboss.tools.jst.ui.firstrun.bot.test/pom.xml 2010-0= 5-27 23:22:43 UTC (rev 22396) @@ -10,5 +10,5 @@ <groupId>org.jboss.tools</groupId> <artifactId>org.jboss.tools.jst.ui.firstrun.bot.test</artifactId> = <version>3.1.0-SNAPSHOT</version> - <packaging>eclipse-test-plugin</packaging> + <packaging>eclipse-plugin</packaging> </project> --===============4989318810798595917==-- From jbosstools-commits at lists.jboss.org Thu May 27 19:25:24 2010 Content-Type: multipart/mixed; boundary="===============8468191001261042961==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22397 - in trunk/jst: plugins/org.jboss.tools.jst.web.kb/META-INF and 16 other directories. Date: Thu, 27 May 2010 19:25:23 -0400 Message-ID: <201005272325.o4RNPNVR012084@svn01.web.mwc.hst.phx2.redhat.com> --===============8468191001261042961== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-27 19:25:20 -0400 (Thu, 27 May 2010) New Revision: 22397 Removed: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/META-INF/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/WEB-INF/classes/demo/ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/WEB-INF/lib/common-annotations.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/WEB-INF/lib/commons-beanutils.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/WEB-INF/lib/commons-collections.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/WEB-INF/lib/commons-digester.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/WEB-INF/lib/commons-logging.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/WEB-INF/lib/jsf-api.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/WEB-INF/lib/jstl.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/WEB-INF/lib/standard.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/index.jsp trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/pages/hello.jsp trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/ant/ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF trunk/jst/plugins/org.jboss.tools.jst.web.kb/build.properties trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.css.test/build.properties trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.jsp.test/build.properties trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.kb.test/build.properties trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.pr= oject trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/Web= Content/WEB-INF/lib/jsf-impl.jar trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/= web/kb/test/KbModelTest.java trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.test/build.properties trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.web.ui.test/build.properties Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests tycho related manifest errors fixed to let it find tests in test plug-ins test project adjusted to have only resources relevant for test Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2010-= 05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/META-INF/MANIFEST.MF 2010-= 05-27 23:25:20 UTC (rev 22397) @@ -4,7 +4,6 @@ Bundle-SymbolicName: org.jboss.tools.jst.web.kb;singleton:=3Dtrue Bundle-Localization: plugin Bundle-Version: 3.1.0.qualifier -Bundle-ClassPath: webKb.jar Bundle-Activator: org.jboss.tools.jst.web.kb.WebKbPlugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/build.properties 2010-05-2= 7 23:22:43 UTC (rev 22396) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/build.properties 2010-05-2= 7 23:25:20 UTC (rev 22397) @@ -1,11 +1,11 @@ bin.includes =3D plugin.xml,\ META-INF/,\ plugin.properties,\ - webKb.jar,\ + .,\ about.html,\ schema/,\ taglibs/ -source.webKb.jar =3D src/,\ - resources/ -output.webKb.jar =3D bin/ -jars.compile.order =3D webKb.jar +source.. =3D src/,\ + resources/ +output.. =3D bin/ +jars.compile.order =3D . Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF 2010-= 05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/META-INF/MANIFEST.MF 2010-= 05-27 23:25:20 UTC (rev 22397) @@ -4,7 +4,6 @@ Bundle-SymbolicName: org.jboss.tools.jst.css.test;singleton:=3Dtrue Bundle-Version: 3.1.0.qualifier Bundle-Activator: org.jboss.tools.jst.css.test.CSSTestPlugin -Bundle-ClassPath: css-test.jar Require-Bundle: org.eclipse.core.runtime, org.junit, org.jboss.tools.tests, Modified: trunk/jst/tests/org.jboss.tools.jst.css.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.css.test/build.properties 2010-05-2= 7 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.css.test/build.properties 2010-05-2= 7 23:25:20 UTC (rev 22397) @@ -1,7 +1,6 @@ bin.includes =3D META-INF/,\ - css-test.jar,\ plugin.properties,\ resources/ -source.css-test.jar =3D src/ -jars.compile.order =3D css-test.jar -output.css-test.jar =3D bin/ +jars.compile.order =3D . +source.. =3D src/ +output.. =3D bin/ Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2010-= 05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2010-= 05-27 23:25:20 UTC (rev 22397) @@ -15,11 +15,11 @@ org.jboss.tools.jst.jsp, org.jboss.tools.common.text.ext, org.jboss.tools.jst.web, - org.jboss.tools.common.text.xml;bundle-version=3D"2.0.0" + org.jboss.tools.common.text.xml;bundle-version=3D"2.0.0", + org.jboss.tools.jst.web.kb;bundle-version=3D"3.1.0" Export-Package: = org.jboss.tools.jst.jsp.test, org.jboss.tools.jst.jsp.test.ca -Bundle-ClassPath: jst-jsp-test.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/build.properties 2010-05-2= 7 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/build.properties 2010-05-2= 7 23:25:20 UTC (rev 22397) @@ -1,5 +1,5 @@ bin.includes =3D META-INF/,\ projects/,\ - jst-jsp-test.jar,\ + .,\ plugin.properties -source.jst-jsp-test.jar =3D src/ +source.. =3D src/ Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST= .MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 20= 10-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 20= 10-05-27 23:25:20 UTC (rev 22397) @@ -15,4 +15,3 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.jst.web.kb.test -Bundle-ClassPath: jst-web-kb-tests.jar Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/build.properties 2010-0= 5-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/build.properties 2010-0= 5-27 23:25:20 UTC (rev 22397) @@ -1,11 +1,11 @@ output.. =3D bin/ bin.includes =3D META-INF/,\ projects/,\ - jst-web-kb-tests.jar,\ + .,\ plugin.properties src.includes =3D src/,\ projects/,\ build.properties,\ META-INF/ -source.jst-web-kb-tests.jar =3D src/ +source.. =3D src/ additional.bundles =3D org.jboss.tools.common.model Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMo= del/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.p= roject 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/.p= roject 2010-05-27 23:25:20 UTC (rev 22397) @@ -6,11 +6,6 @@ </projects> <buildSpec> <buildCommand> - <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> <name>org.eclipse.wst.common.project.facet.core.builder</name> <arguments> </arguments> @@ -21,16 +16,6 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.jboss.tools.common.verification.verifybuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> <name>org.jboss.tools.jst.web.kb.kbbuilder</name> <arguments> </arguments> @@ -42,7 +27,6 @@ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> <nature>org.jboss.tools.jsf.jsfnature</nature> <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.wst.jsdt.core.jsNature</nature> <nature>org.jboss.tools.jst.web.kb.kbnature</nature> </natures> </projectDescription> Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMod= el/WebContent/WEB-INF/lib/common-annotations.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMod= el/WebContent/WEB-INF/lib/commons-beanutils.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMod= el/WebContent/WEB-INF/lib/commons-collections.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMod= el/WebContent/WEB-INF/lib/commons-digester.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMod= el/WebContent/WEB-INF/lib/commons-logging.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMod= el/WebContent/WEB-INF/lib/jsf-api.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMo= del/WebContent/WEB-INF/lib/jsf-impl.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMod= el/WebContent/WEB-INF/lib/jstl.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMod= el/WebContent/WEB-INF/lib/standard.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMod= el/WebContent/index.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/We= bContent/index.jsp 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/We= bContent/index.jsp 2010-05-27 23:25:20 UTC (rev 22397) @@ -1,7 +0,0 @@ -<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> - -<html> - <body> - <jsp:forward page=3D"/pages/inputUserName.jsf" /> - </body> -</html> \ No newline at end of file Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbMod= el/WebContent/pages/hello.jsp =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/We= bContent/pages/hello.jsp 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/We= bContent/pages/hello.jsp 2010-05-27 23:25:20 UTC (rev 22397) @@ -1,20 +0,0 @@ -<%@ taglib uri=3D"http://java.sun.com/jsf/core" prefix=3D"f"%> -<%@ taglib uri=3D"http://java.sun.com/jsf/html" prefix=3D"h"%> - -<f:loadBundle var=3D"Message" basename=3D"demo.Messages" /> - -<html> - <head> - <title>Hello! - - - - -

    - , - ! -

    -     - - - \ No newline at end of file Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/too= ls/jst/web/kb/test/KbModelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst= /web/kb/test/KbModelTest.java 2010-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst= /web/kb/test/KbModelTest.java 2010-05-27 23:25:20 UTC (rev 22397) @@ -55,47 +55,14 @@ return kbProject; } = - public void testXMLScanner() { + public void testTldXMLScanner() { IKbProject kbProject =3D getKbProject(); = IFile f =3D project.getFile("WebContent/WEB-INF/faces-config.xml"); assertNotNull(f); XMLScanner scanner =3D new XMLScanner(); List ls =3D null; = - try { - LoadedDeclarations ds =3D scanner.parse(f, kbProject); - ls =3D ds.getLibraries(); - } catch (ScannerException e) { - JUnitUtils.fail("Error in xml scanner",e); - } - assertEquals(1, ls.size()); - assertTrue(ls.get(0).getComponents().length > 0); - ls =3D null; - f =3D project.getFile("WebContent/facelet-taglib.xml"); - assertNotNull(f); - try { - LoadedDeclarations ds =3D scanner.parse(f, kbProject); - ls =3D ds.getLibraries(); - } catch (ScannerException e) { - JUnitUtils.fail("Error in xml scanner",e); - } - assertEquals(1, ls.size()); - assertTrue(ls.get(0).getComponents().length > 0); - = - ls =3D null; - f =3D project.getFile("WebContent/facelet-taglib2.xml"); - assertNotNull(f); - try { - LoadedDeclarations ds =3D scanner.parse(f, kbProject); - ls =3D ds.getLibraries(); - } catch (ScannerException e) { - JUnitUtils.fail("Error in xml scanner",e); - } - assertEquals(1, ls.size()); - assertTrue(ls.get(0).getComponents().length > 0); - - ls =3D null; f =3D project.getFile("WebContent/WEB-INF/taglib2.tld"); assertNotNull(f); try { @@ -113,15 +80,15 @@ // } } = - public void testKbProjectObjects() { + public void toDoTestKbProjectObjects() { = } = - public void testXMLSerialization() { + public void toDoXMLSerialization() { = } = - public void testCleanBuild() { + public void toDoCleanBuild() { = } = Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2010-= 05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2010-= 05-27 23:25:20 UTC (rev 22397) @@ -9,6 +9,5 @@ Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.jst.web.test -Bundle-ClassPath: jst-web-tests.jar Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.test/build.properties 2010-05-2= 7 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/build.properties 2010-05-2= 7 23:25:20 UTC (rev 22397) @@ -1,10 +1,10 @@ output.. =3D bin/ bin.includes =3D META-INF/,\ projects/,\ - jst-web-tests.jar,\ + .,\ plugin.properties src.includes =3D src/,\ projects/,\ build.properties,\ META-INF/ -source.jst-web-tests.jar =3D src/ +source.. =3D src/ Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST= .MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 20= 10-05-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 20= 10-05-27 23:25:20 UTC (rev 22397) @@ -12,6 +12,5 @@ org.jboss.tools.tests, org.eclipse.ui.ide Export-Package: org.jboss.tools.jst.web.ui.test -Bundle-ClassPath: jst-web-ui.jar Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jst/tests/org.jboss.tools.jst.web.ui.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.ui.test/build.properties 2010-0= 5-27 23:22:43 UTC (rev 22396) +++ trunk/jst/tests/org.jboss.tools.jst.web.ui.test/build.properties 2010-0= 5-27 23:25:20 UTC (rev 22397) @@ -1,6 +1,6 @@ output.. =3D bin/ bin.includes =3D META-INF/,\ - jst-web-ui.jar,\ + .,\ plugin.properties,\ projects/ -source.jst-web-ui.jar =3D src/ +source.. =3D src/ --===============8468191001261042961==-- From jbosstools-commits at lists.jboss.org Thu May 27 19:30:06 2010 Content-Type: multipart/mixed; boundary="===============0581661844746829119==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22398 - trunk/jsf/tests/org.jboss.tools.jsf.test/projects. Date: Thu, 27 May 2010 19:30:06 -0400 Message-ID: <201005272330.o4RNU6gf012303@svn01.web.mwc.hst.phx2.redhat.com> --===============0581661844746829119== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-27 19:30:05 -0400 (Thu, 27 May 2010) New Revision: 22398 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel/ Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests test project for JSF KbBuilder Copied: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/TestKbModel (from= rev 22397, trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKb= Model) --===============0581661844746829119==-- From jbosstools-commits at lists.jboss.org Thu May 27 19:33:06 2010 Content-Type: multipart/mixed; boundary="===============7592958313681541552==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22399 - in trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf: kb and 1 other directories. Date: Thu, 27 May 2010 19:33:05 -0400 Message-ID: <201005272333.o4RNX5SM012748@svn01.web.mwc.hst.phx2.redhat.com> --===============7592958313681541552== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-27 19:33:05 -0400 (Thu, 27 May 2010) New Revision: 22399 Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test/ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test= /FaceletsKbModelTest.java Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests part of JSF related tests are moved to jsf tests to fix test errors in tycho Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/= test/FaceletsKbModelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/tes= t/FaceletsKbModelTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/tes= t/FaceletsKbModelTest.java 2010-05-27 23:33:05 UTC (rev 22399) @@ -0,0 +1,104 @@ +/*************************************************************************= ****** + * Copyright (c) 2007 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ = +package org.jboss.tools.jsf.kb.test; + +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.jboss.tools.jst.web.kb.IKbProject; +import org.jboss.tools.jst.web.kb.internal.scanner.LoadedDeclarations; +import org.jboss.tools.jst.web.kb.internal.scanner.ScannerException; +import org.jboss.tools.jst.web.kb.internal.scanner.XMLScanner; +import org.jboss.tools.jst.web.kb.taglib.ITagLibrary; +import org.jboss.tools.test.util.JUnitUtils; +import org.jboss.tools.test.util.TestProjectProvider; + +import junit.framework.TestCase; + +public class FaceletsKbModelTest extends TestCase { + + TestProjectProvider provider =3D null; + IProject project =3D null; + boolean makeCopy =3D true; + + public FaceletsKbModelTest() { + super("Kb Model Test"); + } + + public void setUp() throws Exception { + provider =3D new TestProjectProvider("org.jboss.tools.jsf.kb.test", + null,"TestKbModel" ,true); + project =3D provider.getProject(); + project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()= ); + this.project.build(IncrementalProjectBuilder.FULL_BUILD, null); + } + + private IKbProject getKbProject() { + IKbProject kbProject =3D null; + try { + kbProject =3D (IKbProject)project.getNature(IKbProject.NATURE_ID); + } catch (Exception e) { + JUnitUtils.fail("Cannot get seam nature.",e); + } + return kbProject; + } + + public void testTldXMLScanner() { + IKbProject kbProject =3D getKbProject(); + = + IFile f =3D project.getFile("WebContent/WEB-INF/faces-config.xml"); + assertNotNull(f); + XMLScanner scanner =3D new XMLScanner(); + List ls =3D null; = + try { + LoadedDeclarations ds =3D scanner.parse(f, kbProject); + ls =3D ds.getLibraries(); + } catch (ScannerException e) { + JUnitUtils.fail("Error in xml scanner",e); + } + assertEquals(1, ls.size()); + assertTrue(ls.get(0).getComponents().length > 0); + + ls =3D null; + f =3D project.getFile("WebContent/facelet-taglib.xml"); + assertNotNull(f); + try { + LoadedDeclarations ds =3D scanner.parse(f, kbProject); + ls =3D ds.getLibraries(); + } catch (ScannerException e) { + JUnitUtils.fail("Error in xml scanner",e); + } + assertEquals(1, ls.size()); + assertTrue(ls.get(0).getComponents().length > 0); + = + ls =3D null; + f =3D project.getFile("WebContent/facelet-taglib2.xml"); + assertNotNull(f); + try { + LoadedDeclarations ds =3D scanner.parse(f, kbProject); + ls =3D ds.getLibraries(); + } catch (ScannerException e) { + JUnitUtils.fail("Error in xml scanner",e); + } + assertEquals(1, ls.size()); + assertTrue(ls.get(0).getComponents().length > 0); + } + + protected void tearDown() throws Exception { + if(provider !=3D null) { + provider.dispose(); + } + } +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss= /tools/jsf/kb/test/FaceletsKbModelTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============7592958313681541552==-- From jbosstools-commits at lists.jboss.org Thu May 27 19:36:54 2010 Content-Type: multipart/mixed; boundary="===============0216902867416686227==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22400 - trunk/jst/tests/org.jboss.tools.ui.bot.ext. Date: Thu, 27 May 2010 19:36:54 -0400 Message-ID: <201005272336.o4RNashR013198@svn01.web.mwc.hst.phx2.redhat.com> --===============0216902867416686227== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-27 19:36:54 -0400 (Thu, 27 May 2010) New Revision: 22400 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/pom.xml Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests revert plug-in -o.j.t.jst.ui.bot.ext to eclipse-plugin or test execution fa= ils because there are no tests inside this plug-ins = Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext/pom.xml 2010-05-27 23:33:05 = UTC (rev 22399) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext/pom.xml 2010-05-27 23:36:54 = UTC (rev 22400) @@ -10,5 +10,5 @@ org.jboss.tools org.jboss.tools.ui.bot.ext = 3.1.0-SNAPSHOT - eclipse-test-plugin + eclipse-plugin --===============0216902867416686227==-- From jbosstools-commits at lists.jboss.org Thu May 27 20:03:40 2010 Content-Type: multipart/mixed; boundary="===============5519795340118119242==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22401 - in trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf: test and 1 other directory. Date: Thu, 27 May 2010 20:03:40 -0400 Message-ID: <201005280003.o4S03eZ5022212@svn01.web.mwc.hst.phx2.redhat.com> --===============5519795340118119242== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-27 20:03:39 -0400 (Thu, 27 May 2010) New Revision: 22401 Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/test= /FaceletsKbModelTest.java trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/Js= fAllTests.java Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests include JSF KB test into JSF test suite Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/= kb/test/FaceletsKbModelTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/tes= t/FaceletsKbModelTest.java 2010-05-27 23:36:54 UTC (rev 22400) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/kb/tes= t/FaceletsKbModelTest.java 2010-05-28 00:03:39 UTC (rev 22401) @@ -38,7 +38,7 @@ } = public void setUp() throws Exception { - provider =3D new TestProjectProvider("org.jboss.tools.jsf.kb.test", + provider =3D new TestProjectProvider("org.jboss.tools.jsf.test", null,"TestKbModel" ,true); project =3D provider.getProject(); project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()= ); Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/= test/JsfAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/J= sfAllTests.java 2010-05-27 23:36:54 UTC (rev 22400) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/J= sfAllTests.java 2010-05-28 00:03:39 UTC (rev 22401) @@ -15,6 +15,7 @@ import junit.framework.TestSuite; = import org.eclipse.jdt.internal.core.JavaModelManager; +import org.jboss.tools.jsf.kb.test.FaceletsKbModelTest; import org.jboss.tools.jsf.model.pv.test.JSFPromptingProviderTest; import org.jboss.tools.jsf.test.refactoring.ELVariableRefactoringTest; import org.jboss.tools.jsf.test.validation.JSF2ComponentsValidatorTest; @@ -29,6 +30,7 @@ old.addTestSuite(JSFModelTest.class); old.addTestSuite(ModelFormat_2_0_0_Test.class); old.addTestSuite(JSFBeansTest.class); + old.addTestSuite(FaceletsKbModelTest.class); suite.addTest(new ProjectImportTestSetup(old, "org.jboss.tools.jsf.test", "projects/JSFKickStartOldFormat", //$NON-N= LS-1$ //$NON-NLS-2$ "JSFKickStartOldFormat")); //$NON-NLS-1$ --===============5519795340118119242==-- From jbosstools-commits at lists.jboss.org Thu May 27 20:34:33 2010 Content-Type: multipart/mixed; boundary="===============0720822468279990393==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22402 - trunk/documentation/guides/JBDS_Release_Notes/en-US. Date: Thu, 27 May 2010 20:34:33 -0400 Message-ID: <201005280034.o4S0YXA1025751@svn01.web.mwc.hst.phx2.redhat.com> --===============0720822468279990393== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: irooskov(a)redhat.com Date: 2010-05-27 20:34:33 -0400 (Thu, 27 May 2010) New Revision: 22402 Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml Log: updated release notes with features recommended for inclusion by max Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-28 00:03:39 UTC (rev 22401) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 20= 10-05-28 00:34:33 UTC (rev 22402) @@ -174,7 +174,7 @@ - JBDS-1228= : The JBoss Developer Studio installation wizard would display inco= rrect step numbering, seeming to jump sporadically. This occured because st= eps the installer takes that are invisible to the user were still included = in the displayed step numbering on each screen. In this release the step nu= mbering has been corrected to count only the steps the user participates in. + JBDS-1228= : The JBoss Developer Studio installation wizard would display inco= rrect step numbering, seeming to jump sporadically. This occurred because s= teps the installer takes that are invisible to the user were still included= in the displayed step numbering on each screen. In this release the step n= umbering has been corrected to count only the steps the user participates i= n. @@ -206,6 +206,11 @@ JBDS-1155= : A regression existed in the Eclipse 3.5.2 Web Tools Platform (WTP= ) 3.1.2. The bug would break EAR deployments that used classpath variables = by deploying dependent artifacts to <root_ear>/lib/lib/lib<= /filename> instead of <root_ear>/lib. The issue = has been corrected with these updated packages so that the regression no lo= nger exists and EAR deployments function correctly. + + = + Though this bug is fixed, a known issue exists () that prohibits WTP updates in this release. + + Modified: trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.= xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 20= 10-05-28 00:03:39 UTC (rev 22401) +++ trunk/documentation/guides/JBDS_Release_Notes/en-US/Known_Issues.xml 20= 10-05-28 00:34:33 UTC (rev 22402) @@ -12,9 +12,22 @@ - + JBDS-12= 22: A bug exists in the JBoss Developer Studio that causes styleshe= ets to not render correctly in the JBoss Enterprise Application Platform 5 = and a org.ajax4jsf.resource.ResourceNotFoundException: Stati= c resource not found for path <resource name> excepti= on when using the JBoss Enterprise Portal Platform 5 to load a JSF page thr= ough a Portlet. These errors are caused by the code to load the style sheet= being: <a:loadStyle src=3D"resource:///stylesheet/theme.xcss"/>= ; instead of <a:loadStyle src=3D"/stylesheet/theme.xcss"/&g= t;. + + The current workaround for this issue is to manually remove the cod= e resource:// from the beginning of the stylesheet location. + + + + This issue does not present in the JBoss Enterprise Application Pl= atform 4.3 because of a bug that exists in it that hides this issue. + + + + + JBDS-12= 07:An issue exists that prohibits updates related to the Web Tools = Platform appearing on the JBoss Developer Studio site. + + --===============0720822468279990393==-- From jbosstools-commits at lists.jboss.org Fri May 28 05:06:55 2010 Content-Type: multipart/mixed; boundary="===============6360994335677841376==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22403 - in branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.core.test: META-INF and 9 other directories. Date: Fri, 28 May 2010 05:06:55 -0400 Message-ID: <201005280906.o4S96tGI010252@svn01.web.mwc.hst.phx2.redhat.com> --===============6360994335677841376== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgeraskov Date: 2010-05-28 05:06:52 -0400 (Fri, 28 May 2010) New Revision: 22403 Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/.classpath branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/.project branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/.settings/ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/.settings/org.eclipse.jdt.core.prefs branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/.settings/org.eclipse.jpt.core.prefs branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/.settings/org.eclipse.wst.common.compo= nent branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/.settings/org.eclipse.wst.common.proje= ct.facet.core.prefs.xml branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/.settings/org.eclipse.wst.common.proje= ct.facet.core.xml branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/.settings/org.hibernate.eclipse.consol= e.prefs branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/lib/ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/lib/ejb3-persistence.jar branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/lib/hibernate-annotations.jar branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/lib/hibernate3.jar branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/lib/postgresql-8.4-701.jdbc3.jar branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/src/ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/src/META-INF/ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/src/META-INF/MANIFEST.MF branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/src/META-INF/persistence.xml branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/src/entity/ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/src/entity/ManyToMany1.java branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/src/entity/ManyToMany2.java branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/src/ns/ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/src/ns/NamingStrategy.java branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/res/testHibernateJpaProject/testHibernateJpaProject.launch branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJpaAllTests.j= ava branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJpaModelTests= .java Removed: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJPACoreTests.= java Modified: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.c= ore.test/META-INF/MANIFEST.MF Log: Update jpa tests Modified: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernat= e.jpt.core.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/META-INF/MANIFEST.MF 2010-05-28 00:34:33 UTC (rev 22402) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/META-INF/MANIFEST.MF 2010-05-28 09:06:52 UTC (rev 22403) @@ -13,7 +13,9 @@ org.eclipse.jpt.db, org.eclipse.jdt.core, org.hibernate.eclipse.console.test, - org.jboss.tools.hibernate.jpt.core + org.jboss.tools.hibernate.jpt.core, + org.jboss.tools.tests;bundle-version=3D"2.0.0", + org.hibernate.eclipse;bundle-version=3D"3.3.0" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.hibernate.jpt.core.test Bundle-Activator: org.jboss.tools.hibernate.jpt.core.test.HibernateJPTuiTe= stPlugin Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/.classpath =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.classpath (r= ev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.classpath 2010-05-28 09:06:52 UTC (r= ev 22403) @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/.project =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.project (rev= 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.project 2010-05-28 09:06:52 UTC (rev= 22403) @@ -0,0 +1,36 @@ + + + testHibernateJpaProject + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + org.hibernate.eclipse.console.hibernateBuilder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.jdt.core.javanature + org.hibernate.eclipse.console.hibernateNature + + Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/.settings/org.eclipse.jdt.core.pre= fs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.settings/org.eclipse.jdt.core.prefs = (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.settings/org.eclipse.jdt.core.prefs = 2010-05-28 09:06:52 UTC (rev 22403) @@ -0,0 +1,8 @@ +#Mon May 10 13:11:51 EEST 2010 +eclipse.preferences.version=3D1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5 +org.eclipse.jdt.core.compiler.compliance=3D1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=3Derror +org.eclipse.jdt.core.compiler.problem.enumIdentifier=3Derror +org.eclipse.jdt.core.compiler.source=3D1.5 Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/.settings/org.eclipse.jpt.core.pre= fs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.settings/org.eclipse.jpt.core.prefs = (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.settings/org.eclipse.jpt.core.prefs = 2010-05-28 09:06:52 UTC (rev 22403) @@ -0,0 +1,3 @@ +#Mon May 10 13:11:52 EEST 2010 +eclipse.preferences.version=3D1 +org.eclipse.jpt.core.platform=3Dhibernate Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/.settings/org.eclipse.wst.common.c= omponent =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.settings/org.eclipse.wst.common.comp= onent (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.settings/org.eclipse.wst.common.comp= onent 2010-05-28 09:06:52 UTC (rev 22403) @@ -0,0 +1,6 @@ + + + + + + Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/.settings/org.eclipse.wst.common.p= roject.facet.core.prefs.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.settings/org.eclipse.wst.common.proj= ect.facet.core.prefs.xml (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.settings/org.eclipse.wst.common.proj= ect.facet.core.prefs.xml 2010-05-28 09:06:52 UTC (rev 22403) @@ -0,0 +1,7 @@ + + + + + + + Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/.settings/org.eclipse.wst.common.p= roject.facet.core.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.settings/org.eclipse.wst.common.proj= ect.facet.core.xml (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.settings/org.eclipse.wst.common.proj= ect.facet.core.xml 2010-05-28 09:06:52 UTC (rev 22403) @@ -0,0 +1,9 @@ + + + + + + + + + Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/.settings/org.hibernate.eclipse.co= nsole.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.settings/org.hibernate.eclipse.conso= le.prefs (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/.settings/org.hibernate.eclipse.conso= le.prefs 2010-05-28 09:06:52 UTC (rev 22403) @@ -0,0 +1,4 @@ +#Mon May 10 13:11:52 EEST 2010 +default.configuration=3DtestHibernateJpaProject +eclipse.preferences.version=3D1 +hibernate3.enabled=3Dtrue Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/lib/ejb3-persistence.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/3.2.helios/hibernatetools/tests/org.jboss.too= ls.hibernate.jpt.core.test/res/testHibernateJpaProject/lib/ejb3-persistence= .jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/lib/hibernate-annotations.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/3.2.helios/hibernatetools/tests/org.jboss.too= ls.hibernate.jpt.core.test/res/testHibernateJpaProject/lib/hibernate-annota= tions.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/lib/hibernate3.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/3.2.helios/hibernatetools/tests/org.jboss.too= ls.hibernate.jpt.core.test/res/testHibernateJpaProject/lib/hibernate3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/lib/postgresql-8.4-701.jdbc3.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: branches/3.2.helios/hibernatetools/tests/org.jboss.too= ls.hibernate.jpt.core.test/res/testHibernateJpaProject/lib/postgresql-8.4-7= 01.jdbc3.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/src/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/src/META-INF/MANIFEST.MF = (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/src/META-INF/MANIFEST.MF 2010-05-28 0= 9:06:52 UTC (rev 22403) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: = + Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/src/META-INF/persistence.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/src/META-INF/persistence.xml = (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/src/META-INF/persistence.xml 2010-05-= 28 09:06:52 UTC (rev 22403) @@ -0,0 +1,7 @@ + + + + entity.ManyToMany2 + entity.ManyToMany1 + + Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/src/entity/ManyToMany1.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/src/entity/ManyToMany1.java = (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/src/entity/ManyToMany1.java 2010-05-2= 8 09:06:52 UTC (rev 22403) @@ -0,0 +1,20 @@ +package entity; + +import java.io.Serializable; +import java.util.Set; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToMany; + +(a)Entity +public class ManyToMany1 implements Serializable { + = + @Id + private int id1; = + = + private String justData1; + + @ManyToMany(mappedBy =3D "mtm1") + private Set mtm2; +} \ No newline at end of file Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/src/entity/ManyToMany2.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/src/entity/ManyToMany2.java = (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/src/entity/ManyToMany2.java 2010-05-2= 8 09:06:52 UTC (rev 22403) @@ -0,0 +1,29 @@ +package entity; + +import java.io.Serializable; +import java.util.Set; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.ManyToMany; +import javax.persistence.Column; +import javax.persistence.Table; +import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.NamedQuery; + +(a)Entity +(a)Table(name =3D "ManyToMany22") +(a)NamedQuery(name =3D "my_query", query =3D "select all from my_table") +public class ManyToMany2 implements Serializable { + = + @Id + @Column(name =3D "id") + @GenericGenerator(name =3D "my_generator", strategy =3D "hilo") + private int id2; + = + @Column(name =3D "justData") + private String justData2; + + @ManyToMany + private Set mtm1; +} \ No newline at end of file Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/src/ns/NamingStrategy.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/src/ns/NamingStrategy.java = (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/src/ns/NamingStrategy.java 2010-05-28= 09:06:52 UTC (rev 22403) @@ -0,0 +1,69 @@ +package ns; + +import org.hibernate.cfg.DefaultNamingStrategy; + +public class NamingStrategy extends DefaultNamingStrategy{ + = + private static final long serialVersionUID =3D 1L; + = + private static final String CT_PREFIX =3D "ctn_"; + = + private static final String TN_PREFIX =3D "tn_"; + = + private static final String PC_PREFIX =3D "pc_"; + = + private static final String CN_PREFIX =3D "cn_"; + = + private static final String FK_PREFIX =3D "fk_"; + = + private static final String COL_PREFIX =3D "col_"; + = + private static final String JKCN_PREFIX =3D "jkcn_"; + = + @Override + public String classToTableName(String className) { + return CT_PREFIX + unqualify(className); + } + = + public String propertyToColumnName(String propertyName) { + return PC_PREFIX + unqualify(propertyName); + } + = + @Override + public String tableName(String tableName) { + return TN_PREFIX + tableName; + } + = + @Override + public String collectionTableName(String ownerEntity, + String ownerEntityTable, String associatedEntity, + String associatedEntityTable, String propertyName) { + return COL_PREFIX + unqualify(ownerEntity) + "_"+ associatedEntity+ "_" + + associatedEntityTable + "_" + unqualify( associatedEntity ) + + "_" +propertyName; + } + = + @Override + public String columnName(String columnName) { + return CN_PREFIX + columnName; + } + = + @Override + public String joinKeyColumnName(String joinedColumn, String joinedTable) { + return JKCN_PREFIX + joinedColumn + '_' + joinedTable; + } + = + @Override + public String foreignKeyColumnName(String propertyName, + String propertyEntityName, String propertyTableName, + String referencedColumnName) { + return FK_PREFIX + propertyName + "_"+ unqualify(propertyEntityName) + + "_" + propertyTableName + "_" + referencedColumnName; + } + = + private String unqualify(String s) { + if (s !=3D null) return s;//.replaceAll("\\.", ""); + return "null"; + } + +} Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/res/testHibernateJpaProject/testHibernateJpaProject.launch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/testHibernateJpaProject.launch = (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/res/testHibernateJpaProject/testHibernateJpaProject.launch 2010-0= 5-28 09:06:52 UTC (rev 22403) @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + Deleted: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate= .jpt.core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJPACore= Tests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJPACoreTests= .java 2010-05-28 00:34:33 UTC (rev 22402) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJPACoreTests= .java 2010-05-28 09:06:52 UTC (rev 22403) @@ -1,448 +0,0 @@ -/*************************************************************************= ****** - * Copyright (c) 2007-2009 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 - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - *************************************************************************= *****/ -package org.jboss.tools.hibernate.jpt.core.test; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - -import junit.framework.TestCase; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.emf.common.util.EList; -import org.eclipse.emf.ecore.InternalEObject; -import org.eclipse.emf.ecore.util.EObjectContainmentEList; -import org.eclipse.jpt.core.JpaAnnotationProvider; -import org.eclipse.jpt.core.JpaFile; -import org.eclipse.jpt.core.JpaPlatform; -import org.eclipse.jpt.core.JpaProject; -import org.eclipse.jpt.core.JptCorePlugin; -import org.eclipse.jpt.core.context.persistence.Persistence; -import org.eclipse.jpt.core.context.persistence.PersistenceUnit; -import org.eclipse.jpt.core.internal.platform.GenericJpaAnnotationProvider; -import org.eclipse.jpt.core.internal.utility.jdt.JDTFieldAttribute; -import org.eclipse.jpt.core.resource.java.JavaResourceCompilationUnit; -import org.eclipse.jpt.core.resource.java.JavaResourcePersistentAttribute; -import org.eclipse.jpt.core.resource.java.JavaResourcePersistentType; -import org.eclipse.jpt.core.resource.persistence.PersistenceFactory; -import org.eclipse.jpt.core.resource.persistence.PersistencePackage; -import org.eclipse.jpt.core.resource.persistence.XmlJarFileRef; -import org.eclipse.jpt.core.resource.persistence.XmlJavaClassRef; -import org.eclipse.jpt.core.resource.persistence.XmlMappingFileRef; -import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnit; -import org.eclipse.jpt.core.resource.persistence.XmlPersistenceUnitTransac= tionType; -import org.eclipse.jpt.utility.CommandExecutor; -import org.eclipse.jpt.utility.CommandExecutor.Default; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.IProjectFacet; -import org.eclipse.wst.common.project.facet.core.events.IProjectFacetActio= nEvent; -import org.eclipse.wst.common.project.facet.core.events.IFacetedProjectEve= nt.Type; -import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaPlatform; -import org.jboss.tools.hibernate.jpt.core.internal.HibernateJpaPlatformFac= tory; -import org.jboss.tools.hibernate.jpt.core.internal.JPAPostInstallFasetList= ener; -import org.jboss.tools.hibernate.jpt.core.internal.context.basic.Hibernate; -import org.jboss.tools.hibernate.jpt.core.internal.resource.java.GenericGe= neratorAnnotationImpl; -import org.jmock.Expectations; -import org.jmock.Mockery; -import org.jmock.lib.legacy.ClassImposteriser; - -/** - * JUnit plugin test class for core Hibernate JPA platform - * (org.jboss.tools.hibernate.jpt.core) - * = - * @author Vitali Yemialyanchyk - */ -public class HibernateJPACoreTests extends TestCase { - - /** - * annotated class name - */ - public static final String className =3D "TestPTR"; //$NON-NLS-1$ - /** - * annotated package name - */ - public static final String packageName =3D "org.test"; //$NON-NLS-1$ - /** - * fully qualified name of annotated class - */ - public static final String classFullName =3D packageName + "." + classNam= e; //$NON-NLS-1$ - /** - * annotated java file name - */ - public static final String javaFileName =3D className + ".java"; //$NON-N= LS-1$ - /** - * content of annotated java file - */ - public static final String strJava =3D "package " + packageName + ";\n" += //$NON-NLS-1$ //$NON-NLS-2$ - "import javax.persistence.*;\n" + //$NON-NLS-1$ - "import org.hibernate.annotations.GenericGenerator;\n" + //$NON-NLS-1$ - "@Entity\n" + //$NON-NLS-1$ - "@NamedQueries( { @NamedQuery(name =3D \"arName\", query =3D \"From " += //$NON-NLS-1$ - className + " \") })\n" + //$NON-NLS-1$ - "public class " + className + " {\n" + //$NON-NLS-1$ //$NON-NLS-2$ - "@Id\n" + //$NON-NLS-1$ - "@GeneratedValue(generator=3D\"wrongGenerator\")\n" + //$NON-NLS-1$ - "private Short id_Article;\n" + //$NON-NLS-1$ - "@GenericGenerator(name=3D\"rightGenerator\", strategy=3D\"hilo\")\n" += //$NON-NLS-1$ - "@GeneratedValue(generator=3D\"rightGenerator\")\n" + //$NON-NLS-1$ - "private Short id_Article2;\n" + //$NON-NLS-1$ - "public Short getId_Article(){return id_Article;}\n" + //$NON-NLS-1$ - "public Short getId_Article2(){return id_Article2;}\n" + //$NON-NLS-1$ - "}\n"; //$NON-NLS-1$ - /** - * content of .classpath file - */ - public static final String strClassPath =3D "\n" + //$NON-NLS-1$ - "\n" + //$NON-NLS-1$ - "\n" + //$NON-NLS-1$ - "\n" + //$NON-NLS-1$ - "\n" + //$NON-NLS-1$ - "\n" + //$NON-NLS-1$ - "\n"; //$NON-NLS-1$ - - = - public Mockery context =3D new Mockery() { - { - setImposteriser(ClassImposteriser.INSTANCE); - } - }; - - /** - * mock input stream to simulate javaFileName file reading - */ - public static class MockJavaInputStream extends InputStream { - - protected int pointer =3D 0; - - @Override - public int read() throws IOException { - if (pointer < strJava.getBytes().length) { - return strJava.getBytes()[pointer++]; - } - return -1; - } - } - - /** - * mock input stream to simulate .classpath file reading - */ - public static class MockClassPathInputStream extends InputStream { - - protected int pointer =3D 0; - - @Override - public int read() throws IOException { - if (pointer < strClassPath.getBytes().length) { - return strClassPath.getBytes()[pointer++]; - } - return -1; - } - } - - /** - * The general goal of this test is cover org.jboss.tools.hibernate.jpt.c= ore - * plugin functionality, it doesn't test org.eclipse.jdt functionality, - * so here all org.eclipse.jdt internal objects substituted with mock val= ues. = - * = - * @throws CoreException - * @throws IOException - */ - public void testMockJPTCore() throws CoreException, IOException { - - // define/prepare mock objects for testing - final HibernateJpaPlatformFactory hibernateJpaPlatformFactory =3D new Hi= bernateJpaPlatformFactory(); - final JpaPlatform jpaPlatform =3D hibernateJpaPlatformFactory.buildJpaPl= atform("hibernate"); //$NON-NLS-1$ - final String hibernatePlatformId =3D jpaPlatform.getId(); - assertTrue(HibernateJpaPlatform.ID.equals(hibernatePlatformId)); - // - final JpaProject jpaProject =3D context.mock(JpaProject.class); - final IProject project =3D context.mock(IProject.class); - final IFile file =3D context.mock(IFile.class); - final Persistence persistence =3D context.mock(Persistence.class); - final XmlPersistenceUnit xmlPersistenceUnit =3D context - .mock(XmlPersistenceUnit.class); - final InternalEObject owner =3D xmlPersistenceUnit; - // setup expectations to mock model notifications during - // EList classes - value insertion = - context.checking(new Expectations() { - { - oneOf(owner).eNotificationRequired(); - will(returnValue(false)); - - oneOf(owner).eInternalResource(); - will(returnValue(null)); - } - }); - final String testClassName =3D classFullName; - final EList classes =3D new EObjectContainmentEList( - XmlJavaClassRef.class, owner, - PersistencePackage.XML_PERSISTENCE_UNIT__CLASSES); - final XmlJavaClassRef xmlJavaClassRef1 =3D PersistenceFactory.eINSTANCE - .createXmlJavaClassRef(); - xmlJavaClassRef1.setJavaClass(testClassName); - // insert testClass into classes list - classes.add(xmlJavaClassRef1); - final EList mappingFiles =3D new EObjectContainmentEL= ist( - XmlMappingFileRef.class, xmlPersistenceUnit, - PersistencePackage.XML_PERSISTENCE_UNIT__MAPPING_FILES); - // - final EList jarFiles =3D new EObjectContainmentEList( - XmlJarFileRef.class, xmlPersistenceUnit, = - PersistencePackage.XML_PERSISTENCE_UNIT__JAR_FILES); - // - final JavaResourcePersistentType javaResourcePersistentType =3D context - .mock(JavaResourcePersistentType.class); - // - final List resourceAttributesList2 =3D = new ArrayList(); - final JDTFieldAttribute jdtFieldAttribute =3D new JDTFieldAttribute(null, - "", 1, null, null); //$NON-NLS-1$ - //final JavaResourcePersistentAttribute jrpa1 =3D new JavaResourcePersis= tentAttributeImpl( - // javaResourcePersistentType, jdtFieldAttribute); - //resourceAttributesList2.add(jrpa1); - // - final GenericGeneratorAnnotationImpl genericGeneratorAnnotation =3D new = GenericGeneratorAnnotationImpl( - javaResourcePersistentType, null, null, null); - // - final InputStream classPathIStream =3D new MockClassPathInputStream(); - final InputStream javaIStream =3D new MockJavaInputStream(); - // - final IPath pathProject =3D new Path(""); //$NON-NLS-1$ - // - final IPath pathJavaFile =3D new Path(javaFileName); - // - final CommandExecutor commandExecutor =3D Default.INSTANCE; - // define/check jpaPlatform.buildJpaFile expectations - context.checking(new Expectations() { - { - - allowing(jpaProject).getJpaPlatform(); - will(returnValue(jpaPlatform)); - - oneOf(file).getProject(); - will(returnValue(project)); - - allowing(project).getType(); - will(returnValue(IResource.PROJECT)); - - oneOf(file).getFullPath(); - will(returnValue(pathProject)); - - allowing(project).hasNature("org.eclipse.jdt.core.javanature"); //$NON= -NLS-1$ - will(returnValue(true)); - - oneOf(project).getFile(with(".classpath")); //$NON-NLS-1$ - will(returnValue(file)); - - oneOf(file).exists(); - will(returnValue(true)); - - oneOf(file).getContents(true); - will(returnValue(classPathIStream)); - - allowing(project).getFullPath(); - will(returnValue(pathProject)); - - allowing(project).getName(); - will(returnValue("IProj")); //$NON-NLS-1$ - - allowing(jpaProject).getModifySharedDocumentCommandExecutor(); - will(returnValue(commandExecutor)); - - oneOf(file).getParent(); - will(returnValue(project)); - - allowing(file).getName(); - will(returnValue(javaFileName)); - - oneOf(project).getWorkingLocation("org.eclipse.jdt.core"); //$NON-NLS-= 1$ - will(returnValue(null)); - - oneOf(project).getFile(new Path(javaFileName)); - will(returnValue(file)); - - oneOf(file).getCharset(); - will(returnValue(null)); - - oneOf(file).getLocation(); - will(returnValue(pathJavaFile)); - - oneOf(file).getContents(); - will(returnValue(javaIStream)); - - oneOf(file).getContents(true); - will(returnValue(javaIStream)); - - oneOf(project).getDefaultCharset(); - will(returnValue(null)); - } - }); - // setup JptCorePlugin preferences: - // a) setup hibernate as default jpa platform = - JptCorePlugin.setDefaultJpaPlatformId(hibernatePlatformId); - // b) setup hibernate as jpa platform for project - JptCorePlugin.setJpaPlatformId(project, hibernatePlatformId); - // FIRST TEST: - // try to build jpa file using hibernate jpa platform - final JpaFile jpaFile =3D jpaPlatform.buildJpaFile(jpaProject, file); - // - // define/prepare mock objects for further testing - final JavaResourceCompilationUnit javaResourceCompilationUnit =3D context - .mock(JavaResourceCompilationUnit.class); - final JpaAnnotationProvider jpaAnnotationProvider =3D jpaPlatform.getAnn= otationProvider(); - new GenericJpaAnnotationProvider(); - // - final IProjectFacetActionEvent projectFacetActionEvent =3D context - .mock(IProjectFacetActionEvent.class); - final IFacetedProject facetedProject =3D context - .mock(IFacetedProject.class); - final IProjectFacet projectFacet =3D context.mock(IProjectFacet.class); - // define/check jpaPlatform.getJpaFactory().buildPersistenceUnit, - // pu.update and jpaPostInstallFasetListener.handleEvent expectations - context.checking(new Expectations() { - { - allowing(xmlPersistenceUnit).getName(); - will(returnValue(className)); - - oneOf(xmlPersistenceUnit).setName(className); - - allowing(xmlPersistenceUnit).getClasses(); - will(returnValue(classes)); - - allowing(persistence).getJpaProject(); - will(returnValue(jpaProject)); - - allowing(jpaProject).getJavaResourcePersistentType(classFullName); - will(returnValue(javaResourcePersistentType)); - - allowing(jpaProject).getJavaResourcePersistentType(null); - will(returnValue(null)); - - allowing(javaResourcePersistentType).getSupportingAnnotation( - Hibernate.GENERIC_GENERATOR); - will(returnValue(genericGeneratorAnnotation)); - - allowing(javaResourcePersistentType) - .getSuperclassQualifiedName(); - will(returnValue(null)); - - allowing(javaResourcePersistentType).getAccess(); - will(returnValue(org.eclipse.jpt.core.resource.java.AccessType.PROPERT= Y)); - - allowing(javaResourcePersistentType).getQualifiedName(); - will(returnValue(classFullName)); - - allowing(javaResourcePersistentType).getMappingAnnotation(); - will(returnValue(null)); - - allowing(javaResourcePersistentType).persistableProperties(); - will(returnValue(resourceAttributesList2.iterator())); - - allowing(xmlPersistenceUnit).getMappingFiles(); - will(returnValue(mappingFiles)); - - allowing(jpaProject).getDefaultOrmXmlResource(); - will(returnValue(null)); - - allowing(xmlPersistenceUnit).getProperties(); - will(returnValue(null)); - - allowing(xmlPersistenceUnit).getJarFiles(); - will(returnValue(jarFiles)); - - allowing(xmlPersistenceUnit).getTransactionType(); - will(returnValue(XmlPersistenceUnitTransactionType.JTA)); - - allowing(xmlPersistenceUnit).getDescription(); - will(returnValue("description")); //$NON-NLS-1$ - - allowing(xmlPersistenceUnit).getProvider(); - will(returnValue("provider")); //$NON-NLS-1$ - - allowing(xmlPersistenceUnit).getJtaDataSource(); - will(returnValue("jtaDataSource")); //$NON-NLS-1$ - - allowing(xmlPersistenceUnit).getNonJtaDataSource(); - will(returnValue("nonJtaDataSource")); //$NON-NLS-1$ - - allowing(xmlPersistenceUnit).getExcludeUnlistedClasses(); - will(returnValue(true)); - - oneOf(xmlPersistenceUnit).setTransactionType( - XmlPersistenceUnitTransactionType.JTA); - - oneOf(xmlPersistenceUnit).setDescription("description"); //$NON-NLS-1$ - - oneOf(xmlPersistenceUnit).setProvider("provider"); //$NON-NLS-1$ - - oneOf(xmlPersistenceUnit).setJtaDataSource("jtaDataSource"); //$NON-NL= S-1$ - - oneOf(xmlPersistenceUnit).setNonJtaDataSource( - "nonJtaDataSource"); //$NON-NLS-1$ - - - oneOf(javaResourcePersistentType).getFile(); - will(returnValue(file)); - - oneOf(jpaProject).getJpaFile(file); - will(returnValue(jpaFile)); - - oneOf(xmlPersistenceUnit).setExcludeUnlistedClasses(true); - - allowing(jpaProject).getDefaultSchema(); - will(returnValue("schemaName")); //$NON-NLS-1$ - - allowing(jpaProject).getDefaultCatalog(); - will(returnValue("catalogName")); //$NON-NLS-1$ - - oneOf(projectFacetActionEvent).getType(); - will(returnValue(Type.POST_INSTALL)); - - oneOf(projectFacetActionEvent).getProject(); - will(returnValue(facetedProject)); - - oneOf(facetedProject).getProject(); - will(returnValue(project)); - - oneOf(projectFacetActionEvent).getProjectFacet(); - will(returnValue(projectFacet)); - - oneOf(projectFacet).getId(); - will(returnValue(JptCorePlugin.FACET_ID)); - } - }); - // SECOND TEST: - // build pu via hibernate jpa factory - PersistenceUnit pu =3D jpaPlatform.getJpaFactory().buildPersistenceUnit( - persistence, xmlPersistenceUnit); - // THIRD TEST: - // update persistence unit and check number of class refs - int classRefSizeOld =3D pu.classRefsSize(); - pu.update(xmlPersistenceUnit); - int classRefSizeNew =3D pu.classRefsSize(); - // check is the old number of ref classes remain the same after - // pu.update call - should be the same - assertTrue(classRefSizeOld =3D=3D classRefSizeNew); - // FOURTH TEST: - // check for handleEvent of JPAPostInstallFasetListener - JPAPostInstallFasetListener jpaPostInstallFasetListener =3D new JPAPostI= nstallFasetListener(); - jpaPostInstallFasetListener.handleEvent(projectFacetActionEvent); - // GENERAL TEST: - // check for all expectations - context.assertIsSatisfied(); - } - -} Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJpaAllTes= ts.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJpaAllTests.= java (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJpaAllTests.= java 2010-05-28 09:06:52 UTC (rev 22403) @@ -0,0 +1,30 @@ +/*************************************************************************= ****** + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ +package org.jboss.tools.hibernate.jpt.core.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateJpaAllTests { + = + public static Test suite() { + TestSuite suite =3D new TestSuite( + "Test for org.jboss.tools.hibernate.jpt.core.test"); //$NON-NLS-1$ + suite.addTestSuite(HibernateJpaModelTests.class); + suite.addTestSuite(HibernateJpaModelTests.class); + return suite; + } + +} Added: branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.j= pt.core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJpaModelT= ests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJpaModelTest= s.java (rev 0) +++ branches/3.2.helios/hibernatetools/tests/org.jboss.tools.hibernate.jpt.= core.test/src/org/jboss/tools/hibernate/jpt/core/test/HibernateJpaModelTest= s.java 2010-05-28 09:06:52 UTC (rev 22403) @@ -0,0 +1,244 @@ +/*************************************************************************= ****** + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ************************************************************************= ******/ +package org.jboss.tools.hibernate.jpt.core.test; + +import java.util.ArrayList; +import java.util.List; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Platform; +import org.eclipse.jpt.core.JpaProject; +import org.eclipse.jpt.core.context.JpaRootContextNode; +import org.eclipse.jpt.core.context.java.JavaJoinTable; +import org.eclipse.jpt.core.context.java.JavaJoinTableJoiningStrategy; +import org.eclipse.jpt.core.context.java.JavaPersistentAttribute; +import org.eclipse.jpt.core.context.java.JavaPersistentType; +import org.eclipse.jpt.core.context.java.JavaTypeMapping; +import org.eclipse.jpt.core.context.persistence.ClassRef; +import org.eclipse.jpt.core.context.persistence.Persistence; +import org.eclipse.jpt.utility.internal.CollectionTools; +import org.hibernate.console.ConsoleConfiguration; +import org.hibernate.console.KnownConfigurations; +import org.jboss.tools.hibernate.jpt.core.internal.context.HibernatePersis= tenceUnit; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaBasicMapping; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaColumn; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaEntity; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaIdMapping; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaJoinTable; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaManyToManyMapping; +import org.jboss.tools.hibernate.jpt.core.internal.context.java.HibernateJ= avaTable; +import org.jboss.tools.test.util.ResourcesUtils; + +/** + * @author Dmitry Geraskov + * + */ +public class HibernateJpaModelTests extends TestCase { + = + private static final String PROJECT_NAME =3D "testHibernateJpaProject"; + private static final String PROJECT_PATH =3D "res/" + PROJECT_NAME; + = + IProject project =3D null; + JpaProject jpaProject =3D null; + + public void setUp() throws Exception { + project =3D ResourcesUtils.importProject(Platform.getBundle("org.jboss.t= ools.hibernate.jpt.core.test"), + PROJECT_PATH, new NullProgressMonitor()); + project.refreshLocal(IResource.DEPTH_INFINITE, null); + jpaProject =3D (JpaProject) project.getAdapter(JpaProject.class); + } + = + public void testDefaultMapping(){ + assertNotNull(jpaProject); + JpaRootContextNode rootContextNode =3D jpaProject.getRootContextNode(); + Persistence p =3D rootContextNode.getPersistenceXml().getPersistence(); + assertTrue(p.persistenceUnits().hasNext()); + assertTrue(p.persistenceUnits().next() instanceof HibernatePersistenceUn= it); + HibernatePersistenceUnit hpu =3D (HibernatePersistenceUnit) p.persistenc= eUnits().next(); + List crs =3D CollectionTools.list(hpu.classRefs()); + assertTrue(crs.size() =3D=3D 2); + if (crs.get(0).isFor("entity.ManyToMany1")){ + checkManyToMany1(crs.get(0)); + checkManyToMany2(crs.get(1)); + } else { + checkManyToMany1(crs.get(1)); + checkManyToMany2(crs.get(0)); + } + } + = + public void testNamigStrategyMapping(){ + ConsoleConfiguration cc =3D KnownConfigurations.getInstance().find(PROJE= CT_NAME); + assertNotNull("Console configuration not foun for project " + PROJECT_NA= ME, cc); + cc.build(); + assertNotNull("Console configuration build problem", cc.getConfiguration= ()); + assertNotNull("Naming Strategy not found", cc.getConfiguration().getNami= ngStrategy()); + assertEquals("ns.NamingStrategy", cc.getConfiguration().getNamingStrateg= y().getClass().getName()); + = + jpaProject =3D (JpaProject) project.getAdapter(JpaProject.class); + assertNotNull(jpaProject); + JpaRootContextNode rootContextNode =3D jpaProject.getRootContextNode(); + Persistence p =3D rootContextNode.getPersistenceXml().getPersistence(); + assertTrue(p.persistenceUnits().hasNext()); + assertTrue(p.persistenceUnits().next() instanceof HibernatePersistenceUn= it); + HibernatePersistenceUnit hpu =3D (HibernatePersistenceUnit) p.persistenc= eUnits().next(); + List crs =3D CollectionTools.list(hpu.classRefs()); + assertTrue(crs.size() =3D=3D 2); + if (crs.get(0).isFor("entity.ManyToMany1")){ + checkManyToManyNS1(crs.get(0)); + checkManyToManyNS2(crs.get(1)); + } else { + checkManyToManyNS1(crs.get(1)); + checkManyToManyNS2(crs.get(0)); + } + cc.reset(); + } + = + public void checkManyToMany1(ClassRef crs){ + JavaPersistentType javaPersistentType =3D crs.getJavaPersistentType(); + JavaTypeMapping mapping =3D javaPersistentType.getMapping(); + assertTrue(mapping instanceof HibernateJavaEntity); + HibernateJavaEntity entity =3D (HibernateJavaEntity) mapping; + HibernateJavaTable table =3D entity.getTable(); + assertEquals("ManyToMany1", table.getDBTableName()); + = + ArrayList attrs =3D CollectionTools.list(javaPe= rsistentType.attributes()); + assertTrue(attrs.size() =3D=3D 3); + = + //id + assertTrue(attrs.get(0).getMapping() instanceof HibernateJavaIdMapping); + HibernateJavaIdMapping hjidm =3D (HibernateJavaIdMapping)attrs.get(0).ge= tMapping(); + HibernateJavaColumn hjc =3D (HibernateJavaColumn)hjidm.getColumn(); + assertEquals("id1", hjc.getDBColumnName()); + = + //justData + assertTrue(attrs.get(1).getMapping() instanceof HibernateJavaBasicMappin= g); + HibernateJavaBasicMapping hjbm =3D (HibernateJavaBasicMapping)attrs.get(= 1).getMapping(); + hjc =3D (HibernateJavaColumn)hjbm.getColumn(); + assertEquals("justData1", hjc.getDBColumnName()); + = + //mtm + assertTrue(attrs.get(2).getMapping() instanceof HibernateJavaManyToManyM= apping); + HibernateJavaManyToManyMapping hjmtmm =3D (HibernateJavaManyToManyMappin= g)attrs.get(2).getMapping(); + assertEquals("entity.ManyToMany2", hjmtmm.getTargetEntity()); + } + = + public void checkManyToMany2(ClassRef crs){ + JavaPersistentType javaPersistentType =3D crs.getJavaPersistentType(); + JavaTypeMapping mapping =3D javaPersistentType.getMapping(); + assertTrue(mapping instanceof HibernateJavaEntity); + HibernateJavaEntity entity =3D (HibernateJavaEntity) mapping; + HibernateJavaTable table =3D entity.getTable(); + assertEquals("ManyToMany22", table.getDBTableName()); + = + ArrayList attrs =3D CollectionTools.list(javaPe= rsistentType.attributes()); + assertTrue(attrs.size() =3D=3D 3); + //id + assertTrue(attrs.get(0).getMapping() instanceof HibernateJavaIdMapping); + HibernateJavaIdMapping hjidm =3D (HibernateJavaIdMapping)attrs.get(0).ge= tMapping(); + HibernateJavaColumn hjc =3D (HibernateJavaColumn)hjidm.getColumn(); + assertEquals("id", hjc.getDBColumnName()); + = + //justData + assertTrue(attrs.get(1).getMapping() instanceof HibernateJavaBasicMappin= g); + HibernateJavaBasicMapping hjbm =3D (HibernateJavaBasicMapping)attrs.get(= 1).getMapping(); + hjc =3D (HibernateJavaColumn)hjbm.getColumn(); + assertEquals("justData", hjc.getDBColumnName()); + = + //mtm + assertTrue(attrs.get(2).getMapping() instanceof HibernateJavaManyToManyM= apping); + HibernateJavaManyToManyMapping hjmtmm =3D (HibernateJavaManyToManyMappin= g)attrs.get(2).getMapping(); + assertEquals("entity.ManyToMany1", hjmtmm.getTargetEntity()); + JavaJoinTableJoiningStrategy jtJoiningStrategy =3D hjmtmm.getRelationshi= pReference().getJoinTableJoiningStrategy(); + JavaJoinTable joinTable =3D jtJoiningStrategy.getJoinTable(); + assertTrue(joinTable instanceof HibernateJavaJoinTable); + HibernateJavaJoinTable hjjt =3D (HibernateJavaJoinTable)joinTable; + assertEquals("ManyToMany22_ManyToMany1", hjjt.getDBTableName()); + } + = + public void checkManyToManyNS1(ClassRef crs){ + JavaPersistentType javaPersistentType =3D crs.getJavaPersistentType(); + JavaTypeMapping mapping =3D javaPersistentType.getMapping(); + assertTrue(mapping instanceof HibernateJavaEntity); + HibernateJavaEntity entity =3D (HibernateJavaEntity) mapping; + HibernateJavaTable table =3D entity.getTable(); + assertEquals("ctn_ManyToMany1", table.getDBTableName()); + = + ArrayList attrs =3D CollectionTools.list(javaPe= rsistentType.attributes()); + assertTrue(attrs.size() =3D=3D 3); + = + //id + assertTrue(attrs.get(0).getMapping() instanceof HibernateJavaIdMapping); + HibernateJavaIdMapping hjidm =3D (HibernateJavaIdMapping)attrs.get(0).ge= tMapping(); + HibernateJavaColumn hjc =3D (HibernateJavaColumn)hjidm.getColumn(); + assertEquals("pc_id1", hjc.getDBColumnName()); + = + //justData + assertTrue(attrs.get(1).getMapping() instanceof HibernateJavaBasicMappin= g); + HibernateJavaBasicMapping hjbm =3D (HibernateJavaBasicMapping)attrs.get(= 1).getMapping(); + hjc =3D (HibernateJavaColumn)hjbm.getColumn(); + assertEquals("pc_justData1", hjc.getDBColumnName()); + = + //mtm + assertTrue(attrs.get(2).getMapping() instanceof HibernateJavaManyToManyM= apping); + HibernateJavaManyToManyMapping hjmtmm =3D (HibernateJavaManyToManyMappin= g)attrs.get(2).getMapping(); + assertEquals("entity.ManyToMany2", hjmtmm.getTargetEntity()); + } + = + public void checkManyToManyNS2(ClassRef crs){ + JavaPersistentType javaPersistentType =3D crs.getJavaPersistentType(); + JavaTypeMapping mapping =3D javaPersistentType.getMapping(); + assertTrue(mapping instanceof HibernateJavaEntity); + HibernateJavaEntity entity =3D (HibernateJavaEntity) mapping; + HibernateJavaTable table =3D entity.getTable(); + assertEquals("tn_ManyToMany22", table.getDBTableName()); + = + ArrayList attrs =3D CollectionTools.list(javaPe= rsistentType.attributes()); + assertTrue(attrs.size() =3D=3D 3); + //id + assertTrue(attrs.get(0).getMapping() instanceof HibernateJavaIdMapping); + HibernateJavaIdMapping hjidm =3D (HibernateJavaIdMapping)attrs.get(0).ge= tMapping(); + HibernateJavaColumn hjc =3D (HibernateJavaColumn)hjidm.getColumn(); + assertEquals("cn_id", hjc.getDBColumnName()); + = + //justData + assertTrue(attrs.get(1).getMapping() instanceof HibernateJavaBasicMappin= g); + HibernateJavaBasicMapping hjbm =3D (HibernateJavaBasicMapping)attrs.get(= 1).getMapping(); + hjc =3D (HibernateJavaColumn)hjbm.getColumn(); + assertEquals("cn_justData", hjc.getDBColumnName()); + = + //mtm + assertTrue(attrs.get(2).getMapping() instanceof HibernateJavaManyToManyM= apping); + HibernateJavaManyToManyMapping hjmtmm =3D (HibernateJavaManyToManyMappin= g)attrs.get(2).getMapping(); + assertEquals("entity.ManyToMany1", hjmtmm.getTargetEntity()); + JavaJoinTableJoiningStrategy jtJoiningStrategy =3D hjmtmm.getRelationshi= pReference().getJoinTableJoiningStrategy(); + JavaJoinTable joinTable =3D jtJoiningStrategy.getJoinTable(); + assertTrue(joinTable instanceof HibernateJavaJoinTable); + HibernateJavaJoinTable hjjt =3D (HibernateJavaJoinTable)joinTable; + hjjt.getDbTable(); + assertEquals("col_entity.ManyToMany2_entity.ManyToMany1_ManyToMany1_enti= ty.ManyToMany1_mtm1", hjjt.getDBTableName()); + } + = + protected void tearDown() throws Exception { + if(project !=3D null) { + boolean saveAutoBuild =3D ResourcesUtils.setBuildAutomatically(false); + try { + project.delete(true,true, null); + } finally { + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } + } + } + +} --===============6360994335677841376==-- From jbosstools-commits at lists.jboss.org Fri May 28 05:53:30 2010 Content-Type: multipart/mixed; boundary="===============8641552503214132121==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22404 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation and 3 other directories. Date: Fri, 28 May 2010 05:53:30 -0400 Message-ID: <201005280953.o4S9rUiY015906@svn01.web.mwc.hst.phx2.redhat.com> --===============8641552503214132121== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-28 05:53:29 -0400 (Fri, 28 May 2010) New Revision: 22404 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/inject/Animal.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/inject/FarmBroken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/va= lidation/inject/Sheep.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pref= erences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/InjectionPointTest.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/co= re/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : Injection point type is a type variable Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDIUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-28 09:06:52 UTC (rev 22403) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-28 09:53:29 UTC (rev 22404) @@ -26,7 +26,9 @@ import org.eclipse.jdt.core.ILocalVariable; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.ITypeParameter; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.Signature; import org.eclipse.wst.validation.internal.plugin.ValidationPlugin; import org.jboss.tools.common.EclipseUtil; import org.jboss.tools.common.model.util.EclipseJavaUtil; @@ -538,6 +540,67 @@ return false; } = + /** + * Checks if the bean member has a type variable as a type. + * If the bean member is a field then checks its type. + * If the bean member is a parameter of a method then checks its type. + * If the bean member is a method then checks its return type. + * = + * @param member + * @param checkGenericMethod if true then checks if this member use a typ= e variable which is declared in the generic method (in case of the member i= s a method). + * @return + */ + public static boolean isTypeVariable(IBeanMember member, boolean checkGen= ericMethod) { + try { + String[] typeVariableSegnatures =3D member.getClassBean().getBeanClass(= ).getTypeParameterSignatures(); + List variables =3D new ArrayList(); + for (String variableSig : typeVariableSegnatures) { + variables.add(Signature.getTypeVariable(variableSig)); + } + if(checkGenericMethod) { + ITypeParameter[] typeParams =3D null; + if(member instanceof IParameter) { + typeParams =3D ((IParameter)member).getBeanMethod().getMethod().getTy= peParameters(); + } if(member instanceof IBeanMethod) { + typeParams =3D ((IBeanMethod)member).getMethod().getTypeParameters(); + } + if(typeParams!=3Dnull) { + for (ITypeParameter param : typeParams) { + variables.add(param.getElementName()); + } + } + } + String signature =3D null; + if(member instanceof IBeanField) { + signature =3D ((IBeanField)member).getField().getTypeSignature(); + } else if(member instanceof IParameter) { + if(((IParameter)member).getType()=3D=3Dnull) { + return false; + } + signature =3D ((IParameter)member).getType().getSignature(); + } else if(member instanceof IBeanMethod) { + signature =3D ((IBeanMethod)member).getMethod().getReturnType(); + } + return isTypeVariable(variables, signature); + } catch (JavaModelException e) { + CDICorePlugin.getDefault().logError(e); + } + return false; + } + + private static boolean isTypeVariable(List typeVariables, String = signature) { + if(signature=3D=3Dnull) { + return false; + } + String typeString =3D Signature.toString(signature); + for (String variableName : typeVariables) { + if(typeString.equals(variableName)) { + return true; + } + } + return false; + } + private static IType getSuperClass(IType type) throws JavaModelException { String superclassName =3D type.getSuperclassName(); if(superclassName!=3Dnull) { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-28 09:06:52 UTC (rev 224= 03) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-28 09:53:29 UTC (rev 224= 04) @@ -368,6 +368,8 @@ if(specializingBean=3D=3Dnull) { return; } + validationContext.addLinkedCoreResource(bean.getSourcePath().toOSString(= ), specializingBean.getResource().getFullPath(), false); + String beanClassName =3D bean.getBeanClass().getElementName(); String beanName =3D bean instanceof IBeanMethod?beanClassName + "." + ((= IBeanMethod)bean).getSourceMember().getElementName() + "()":beanClassName; String specializingBeanClassName =3D specializingBean.getBeanClass().get= ElementName(); @@ -903,7 +905,6 @@ pinjection.getAnnotationPosition(CDIConstants.NAMED_QUALIFIER_TYPE_= NAME), injection.getResource()); } - = } } else if (injection instanceof IInjectionPointMethod) { IAnnotationDeclaration named =3D injection.getAnnotation(CDIConstants.N= AMED_QUALIFIER_TYPE_NAME); @@ -942,6 +943,11 @@ addError(CDIValidationMessages.STATIC_METHOD_ANNOTATED_INJECT, CDIPref= erences.GENERIC_METHOD_ANNOTATED_INJECT, declaration, injection.getResource= ()); } } + + if(!(injection instanceof IInjectionPointMethod) && CDIUtil.isTypeVariab= le(injection, false)) { + IAnnotationDeclaration declaration =3D injection.getInjectAnnotation(); + addError(CDIValidationMessages.INJECTION_TYPE_IS_VARIABLE, CDIPreferenc= es.INJECTION_TYPE_IS_VARIABLE, declaration, injection.getResource()); + } } = /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-28 09:06:52 UTC (rev 22403) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-28 09:53:29 UTC (rev 22404) @@ -128,6 +128,10 @@ 5.2.2. Legal injection point types - injection point type is a type variable = + + + + 5.2.5. Qualifier annotations with members - array-valued or annotation-valued member of a qualifier type is not anno= tated @Nonbinding (Non-Portable behavior) = Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/preferences/CDIConfigurationBlock.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-28 09:06:52 UTC (rev 22403) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/pre= ferences/CDIConfigurationBlock.java 2010-05-28 09:53:29 UTC (rev 22404) @@ -48,7 +48,7 @@ {CDIPreferences.PRODUCER_FIELD_TYPE_HAS_WILDCARD, CDIPreferencesMessage= s.CDIValidatorConfigurationBlock_pb_producerFieldTypeHasWildcard_label}, {CDIPreferences.PRODUCER_FIELD_TYPE_IS_VARIABLE, CDIPreferencesMessages= .CDIValidatorConfigurationBlock_pb_producerFieldTypeIsVariable_label}, // {CDIPreferences.PRODUCER_FIELD_TYPE_DOES_NOT_MATCH_JAVA_EE_OBJECT, CD= IPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerFieldTypeDoe= sNotMatchJavaEeObject_label}, -// {CDIPreferences.INJECTION_TYPE_IS_VARIABLE, CDIPreferencesMessages.CD= IValidatorConfigurationBlock_pb_injectionTypeIsVariable_label}, + {CDIPreferences.INJECTION_TYPE_IS_VARIABLE, CDIPreferencesMessages.CDIV= alidatorConfigurationBlock_pb_injectionTypeIsVariable_label}, {CDIPreferences.STEREOTYPE_IS_ANNOTATED_TYPED, CDIPreferencesMessages.C= DIValidatorConfigurationBlock_pb_stereotypeIsAnnotatedTyped_label}, // {CDIPreferences.MISSING_NONBINDING_IN_QUALIFIER_TYPE_MEMBER, CDIPrefe= rencesMessages.CDIValidatorConfigurationBlock_pb_missingNonbindingInQualifi= erTypeMember_label}, // {CDIPreferences.MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER= , CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_missingNonbindin= gInInterceptorBindingTypeMember_label}, Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/inject/Animal.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/inject/Animal.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/inject/Animal.java 2010-05-28 09:53:29 UTC (rev 22404) @@ -0,0 +1,22 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.jsr299.tck.tests.jbt.validation.inject; + +interface Animal +{ + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/inject/Animal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/inject/FarmBroken.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/inject/FarmBroken.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/inject/FarmBroken.java 2010-05-28 09:53:29 UTC (rev 22404) @@ -0,0 +1,17 @@ +package org.jboss.jsr299.tck.tests.jbt.validation.inject; + +import javax.inject.Inject; + +class FarmBroken { + @Inject + public void setAnimal(T animal) { + = + } + + @Inject + public void setAnimal(U animal) { + } + + @Inject + public U animalU; +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/inject/FarmBroken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jb= t/validation/inject/Sheep.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/inject/Sheep.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/v= alidation/inject/Sheep.java 2010-05-28 09:53:29 UTC (rev 22404) @@ -0,0 +1,22 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.jsr299.tck.tests.jbt.validation.inject; + +class Sheep implements Animal +{ + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resource= s/tck/tests/jbt/validation/inject/Sheep.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/InjectionPointTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/InjectionPointTest.java 2010-05-28 09:06:52 UTC (rev 22403) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/InjectionPointTest.java 2010-05-28 09:53:29 UTC (rev 22404) @@ -12,9 +12,12 @@ = import java.util.Set; = +import org.eclipse.jdt.core.ITypeParameter; import org.jboss.tools.cdi.core.CDIUtil; import org.jboss.tools.cdi.core.IClassBean; +import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IInjectionPointParameter; +import org.jboss.tools.cdi.core.IParametedType; = /** * @author Alexey Kazakov @@ -22,7 +25,7 @@ public class InjectionPointTest extends TCKTest { = /** - * Section 3.7.1 - Declaring a bean constructor + * Section 3.7.1 - Declaring a bean constructorThe bean was not found. * - All parameters of a bean constructor are injection points. */ public void testQualifierTypeAnnotatedConstructor() { @@ -40,4 +43,19 @@ Set points =3D CDIUtil.getInjectionPointParame= ters(bean); assertEquals("There should be two injection point parameters in the bean= .", 1, points.size()); } + + // https://jira.jboss.org/browse/JBIDE-6387 Type of a method parameter is= null in case of generic method. + public void testMethodParameter() { + IClassBean bean =3D getClassBean("JavaSource/org/jboss/jsr299/tck/tests/= jbt/validation/inject/FarmBroken.java"); + assertNotNull("Can't find the bean.", bean); + Set injections =3D bean.getInjectionPoints(); + for (IInjectionPoint injectionPoint : injections) { + if(injectionPoint instanceof IInjectionPointParameter) { + IInjectionPointParameter param =3D (IInjectionPointParameter)injection= Point; + IParametedType type =3D param.getType(); + assertNotNull("Type of the parameter is null", type); + assertNotNull("Signature of parameter type is null", type.getSignature= ()); + } + } + } } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools= /cdi/core/test/tck/ValidationTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-28 09:06:52 UTC (rev 22403) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/c= ore/test/tck/ValidationTest.java 2010-05-28 09:53:29 UTC (rev 22404) @@ -886,6 +886,17 @@ } = /** + * 5.2.2. Legal injection point types + * - injection point type is a type variable + * = + * @throws Exception + */ + public void testTypeVariableInjectionPoint() throws Exception { + IFile file =3D tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests= /jbt/validation/inject/FarmBroken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceM= arkerTest.MARKER_TYPE, CDIValidationMessages.INJECTION_TYPE_IS_VARIABLE, 11= , 15); + } + + /** * 10.4.2. Declaring an observer method * - method has more than one parameter annotated @Observes * = --===============8641552503214132121==-- From jbosstools-commits at lists.jboss.org Fri May 28 06:12:01 2010 Content-Type: multipart/mixed; boundary="===============8490152906825763232==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22405 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation. Date: Fri, 28 May 2010 06:12:01 -0400 Message-ID: <201005281012.o4SAC1LK023795@svn01.web.mwc.hst.phx2.redhat.com> --===============8490152906825763232== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: akazakov Date: 2010-05-28 06:12:00 -0400 (Fri, 28 May 2010) New Revision: 22405 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/validation/errorList.txt Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule= : Injection point type is a type variable Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/CDICoreValidator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-28 09:53:29 UTC (rev 224= 04) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/CDICoreValidator.java 2010-05-28 10:12:00 UTC (rev 224= 05) @@ -943,7 +943,10 @@ addError(CDIValidationMessages.STATIC_METHOD_ANNOTATED_INJECT, CDIPref= erences.GENERIC_METHOD_ANNOTATED_INJECT, declaration, injection.getResource= ()); } } - + /* + * 5.2.2. Legal injection point types + * - injection point type is a type variable + */ if(!(injection instanceof IInjectionPointMethod) && CDIUtil.isTypeVariab= le(injection, false)) { IAnnotationDeclaration declaration =3D injection.getInjectAnnotation(); addError(CDIValidationMessages.INJECTION_TYPE_IS_VARIABLE, CDIPreferenc= es.INJECTION_TYPE_IS_VARIABLE, declaration, injection.getResource()); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/validation/errorList.txt =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-28 09:53:29 UTC (rev 22404) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/validation/errorList.txt 2010-05-28 10:12:00 UTC (rev 22405) @@ -122,9 +122,6 @@ - X specializes Y and Y has a name and X declares a name explicitly, using= @Named - interceptor or decorator is annotated @Specializes (Non-Portable behavio= r) = - - - 5.2.2. Legal injection point types - injection point type is a type variable = @@ -135,6 +132,10 @@ 5.2.5. Qualifier annotations with members - array-valued or annotation-valued member of a qualifier type is not anno= tated @Nonbinding (Non-Portable behavior) = + + + + 5.5.7. Injection point metadata - bean that declares any scope other than @Dependent has an injection poin= t of type = InjectionPoint and qualifier @Default --===============8490152906825763232==-- From jbosstools-commits at lists.jboss.org Fri May 28 06:34:48 2010 Content-Type: multipart/mixed; boundary="===============0639295279198105216==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22406 - in trunk: vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/editor/mozilla/icons and 5 other directories. Date: Fri, 28 May 2010 06:34:48 -0400 Message-ID: <201005281034.o4SAYmTl026494@svn01.web.mwc.hst.phx2.redhat.com> --===============0639295279198105216== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2010-05-28 06:34:46 -0400 (Fri, 28 May 2010) New Revision: 22406 Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/edit= or/mozilla/icons/properties.gif trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dia= log/ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dia= log/ExternalizeStringsDialog.java Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/ou= tline/cssdialog/common/Constants.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bun= dle/BundleMap.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/moz= illa/MozillaEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/V= peUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/m= essages.properties Log: https://jira.jboss.org/browse/JBIDE-6287 , the draft version of the Externa= lize Strings Wizard was added. Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst= /jsp/outline/cssdialog/common/Constants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/common/Constants.java 2010-05-28 10:12:00 UTC (rev 22405) +++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/o= utline/cssdialog/common/Constants.java 2010-05-28 10:34:46 UTC (rev 22406) @@ -74,8 +74,10 @@ public static String COLON =3D ":"; //$NON-NLS-1$ public static String SEMICOLON =3D ";"; //$NON-NLS-1$ public static String COMMA =3D ","; //$NON-NLS-1$ + public static String DOT =3D "."; //$NON-NLS-1$ public static String DASH =3D "-"; //$NON-NLS-1$ public static String SLASH =3D "/"; //$NON-NLS-1$ + public static String EQUAL =3D "=3D"; //$NON-NLS-1$ public static final String START_BRACKET =3D "("; //$NON-NLS-1$ public static final String END_BRACKET =3D ")"; //$NON-NLS-1$ = Added: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jboss/tools/vpe/= editor/mozilla/icons/properties.gif =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/vpe/plugins/org.jboss.tools.vpe/resources/org/jb= oss/tools/vpe/editor/mozilla/icons/properties.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/bundle/BundleMap.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bu= ndle/BundleMap.java 2010-05-28 10:12:00 UTC (rev 22405) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/bu= ndle/BundleMap.java 2010-05-28 10:34:46 UTC (rev 22406) @@ -69,7 +69,7 @@ */ private Locale locale; private BundleEntry[] bundles =3D new BundleEntry[0]; - private Map usedKeys =3D new HashMap(); + private Map usedKeys =3D new HashMap(); = boolean showBundleUsageAsEL =3D JspEditorPlugin.getDefault().getPrefer= enceStore().getBoolean( IVpePreferencesPage.SHOW_RESOURCE_BUNDLES_USAGE_AS_EL); = @@ -554,7 +554,11 @@ public String propertyName; } = - static class BundleEntry { + /* + * https://jira.jboss.org/browse/JBIDE-6287 + * It was required to get access to BundleEntry class. + */ + public static class BundleEntry { public ResourceBundle bundle; public String uri; public String prefix; @@ -567,6 +571,13 @@ this.prefix =3D prefix; this.hashCode =3D hashCode; } + + @Override + public String toString() { + return "BundleEntry [prefix=3D" + prefix + ", uri=3D" + uri + ", hashCo= de=3D" + hashCode //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + + ", bundle=3D"+ bundle +"]"; //$NON-NLS-1$ //$NON-NLS-2$ + } + = } = static class UsedKey { @@ -604,5 +615,9 @@ public void setShowBundleUsageAsEL(boolean showBundleUsageAsEL) { this.showBundleUsageAsEL =3D showBundleUsageAsEL; } + = + public BundleEntry[] getBundles() { + return bundles; + } = } Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor= /dialog/ExternalizeStringsDialog.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/di= alog/ExternalizeStringsDialog.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/di= alog/ExternalizeStringsDialog.java 2010-05-28 10:34:46 UTC (rev 22406) @@ -0,0 +1,295 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2010 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.vpe.editor.dialog; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.dialogs.TitleAreaDialog; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.TextSelection; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.texteditor.IDocumentProvider; +import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.jboss.tools.common.model.ui.ModelUIImages; +import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants; +import org.jboss.tools.vpe.VpePlugin; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.editor.bundle.BundleMap; +import org.jboss.tools.vpe.editor.bundle.BundleMap.BundleEntry; +import org.jboss.tools.vpe.messages.VpeUIMessages; +import org.w3c.dom.Attr; + +public class ExternalizeStringsDialog extends TitleAreaDialog { + + private final int DIALOG_WIDTH =3D 450; + private final int DIALOG_HEIGHT =3D 300; + private VpeController vpeController; + private Text textStringValue; + private Text propsKey; + private Text propsValue; + private Text propsFile; + private Combo rbCombo; + private BundleMap bm; + = + public ExternalizeStringsDialog(Shell parentShell, + VpeController vpeController) { + super(parentShell); + this.vpeController =3D vpeController; + this.bm =3D vpeController.getPageContext().getBundle(); + setHelpAvailable(false); + } + + @Override + protected Control createDialogArea(Composite parent) { + /* + * Setting dialog Title, Message, Image. + */ + getShell().setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE); + setTitle(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE); + setTitleImage(ModelUIImages.getImageDescriptor( + ModelUIImages.WIZARD_DEFAULT).createImage(null)); + setMessage(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_DESCRIPTION); + + Composite composite =3D new Composite(parent, SWT.NONE); + composite.setLayout(new GridLayout(1, false)); + + GridData gd =3D new GridData(SWT.FILL, SWT.FILL, true, true); + gd.widthHint =3D DIALOG_WIDTH; + gd.heightHint =3D DIALOG_HEIGHT; + composite.setLayoutData(gd); + + /* + * Create dialog area separator + */ + Label dialogAreaSeparator =3D new Label(composite, SWT.HORIZONTAL | SWT.= SEPARATOR); + dialogAreaSeparator.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true,= false)); + = + /* + * Create properties string group + */ + Group propsStringGroup =3D new Group(composite, SWT.SHADOW_ETCHED_IN); + propsStringGroup.setLayout(new GridLayout(3, false)); + propsStringGroup.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, fa= lse, 1, 1)); + propsStringGroup.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPS_S= TRINGS_GROUP); + = + /* + * Create Text String label + */ + Label textStringLabel =3D new Label(propsStringGroup, SWT.NONE); + textStringLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, f= alse, 1, 1)); + textStringLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TEXT_STR= ING); + /* + * Create Text String value + */ + textStringValue =3D new Text(propsStringGroup, SWT.BORDER); + textStringValue.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, fal= se, 2, 1)); + textStringValue.setText("Not initialized"); //$NON-NLS-1$ + textStringValue.setEditable(false); + + /* + * Create Properties Key label + */ + Label propsKeyLabel =3D new Label(propsStringGroup, SWT.NONE); + propsKeyLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, fal= se, 1, 1)); + propsKeyLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTIES= _KEY); + /* + * Create Properties Key value + */ + propsKey =3D new Text(propsStringGroup, SWT.BORDER); + propsKey.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, = 1)); + propsKey.setText("key"); //$NON-NLS-1$ + /* + * Create Properties Value label + */ + Label propsValueLabel =3D new Label(propsStringGroup, SWT.NONE); + propsValueLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, f= alse, 1, 1)); + propsValueLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTI= ES_VALUE); + /* + * Create Properties Value value + */ + propsValue =3D new Text(propsStringGroup, SWT.BORDER); + propsValue.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2= , 1)); + propsValue.setText("value"); //$NON-NLS-1$ + + /* + * Create properties string group + */ + Group propsFilesGroup =3D new Group(composite, SWT.SHADOW_ETCHED_IN); + propsFilesGroup.setLayout(new GridLayout(3, false)); + propsFilesGroup.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, fal= se, 1, 1)); + propsFilesGroup.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPS_FI= LES_GROUP); + = + /* + * Create Resource Bundles List label + */ + Label rbListLabel =3D new Label(propsFilesGroup, SWT.NONE); + rbListLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, false= , 1, 1)); + rbListLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_RESOURCE_BUN= DLE_LIST); + /* + * Create Resource Bundles combobox + */ + rbCombo =3D new Combo(propsFilesGroup, SWT.NONE); + rbCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, 1= )); +// rbCombo.add(Constants.EMPTY); + rbCombo.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + IFile bundleFile =3D bm.getBundleFile(rbCombo.getText()); + String bundlePath =3D Constants.EMPTY; + if (bundleFile !=3D null) { + bundlePath =3D bundleFile.getFullPath().toString(); + } = + propsFile.setText(bundlePath); + } + }); + = + /* + * Create Properties File label + */ + Label propsFileLabel =3D new Label(propsFilesGroup, SWT.NONE); + propsFileLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false,fal= se, 1, 1)); + propsFileLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTIE= S_FILE); + /* + * Create Properties File path field + */ + propsFile =3D new Text(propsFilesGroup, SWT.BORDER); + propsFile.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true,false, 2, = 1)); + propsFile.setText(Constants.EMPTY); + propsFile.setEditable(false); + = + /* + * Initialize all fields with real values. + */ + initializeTextFields(); + + return composite; + } + + private void initializeTextFields() { + ISelection sel =3D vpeController.getSourceEditor().getSelectionProvider() + .getSelection(); + if ((textStringValue !=3D null) && (propsKey !=3D null) + && isSelectionCorrect(sel)) { + String stringToUpdate =3D Constants.EMPTY; + TextSelection textSelection =3D null; + String text =3D null; + IStructuredSelection structuredSelection =3D (IStructuredSelection) sel; + textSelection =3D (TextSelection) sel; + text =3D textSelection.getText(); + Object selectedElement =3D structuredSelection.getFirstElement(); + /* + * Parse selected element and find a string to replace + */ + if (selectedElement instanceof org.w3c.dom.Text) { + org.w3c.dom.Text textNode =3D (org.w3c.dom.Text) selectedElement; + if ((textNode.getNodeValue().trim().length() > 0) + && (text.trim().length() > 0)) { + stringToUpdate =3D textNode.getNodeValue(); + } + } else if (selectedElement instanceof Attr) { + Attr attrNode =3D (Attr) selectedElement; + if ((attrNode.getNodeValue().trim().length() > 0) + && (text.trim().length() > 0)) { + stringToUpdate =3D attrNode.getNodeValue(); + } + } else { + VpePlugin.getDefault().logWarning( + VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR); + } + /* + * Update text string field + */ + textStringValue.setText(text); + = + /* + * Initialize bundle messages field + */ + BundleEntry[] bundles =3D bm.getBundles(); + Set uriSet =3D new HashSet(); = + for (BundleEntry bundleEntry : bundles) { + if (!uriSet.contains(bundleEntry.uri)) { + uriSet.add(bundleEntry.uri); + rbCombo.add(bundleEntry.uri); + } + } + } else { + VpePlugin.getDefault().logWarning( + VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR); + } + } + + @Override + protected void okPressed() { + StructuredTextEditor editor =3D vpeController.getSourceEditor(); + IDocumentProvider prov =3D editor.getDocumentProvider(); + IDocument doc =3D prov.getDocument(editor.getEditorInput()); + ISelection sel =3D editor.getSelectionProvider().getSelection(); + if (isSelectionCorrect(sel)) { + try { + /* + * Get source text and new text + */ + final TextSelection textSel =3D (TextSelection) sel; + String newText =3D "\n" + propsKey.getText() + Constants.EQUAL + props= Value.getText() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ + /* + * Add "key=3Dvalue" to the bundle + */ + IFile bundleFile =3D bm.getBundleFile(rbCombo.getText()); + if ((bundleFile !=3D null) && (bundleFile.exists())) { + InputStream is =3D new ByteArrayInputStream(newText.getBytes()); + bundleFile.appendContents(is, false, true, null); + } = + /* + * Replace text in the editor with "key.value" + */ + String bundlePrefix =3D Constants.EMPTY; + for (BundleEntry be : bm.getBundles()) { + if (be.uri.equalsIgnoreCase(rbCombo.getText())) { + bundlePrefix =3D be.prefix; + } + } + newText =3D "#{" + bundlePrefix + Constants.DOT + propsKey.getText() += "}"; //$NON-NLS-1$ //$NON-NLS-2$ + doc.replace(textSel.getOffset(), textSel.getLength(), newText); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + super.okPressed(); + } + + private boolean isSelectionCorrect(ISelection sel) { + if ((sel instanceof TextSelection) + && (sel instanceof IStructuredSelection) + && (((IStructuredSelection) sel).size() =3D=3D 1)) { + return true; + } else { + return false; + } + } + +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/mozilla/MozillaEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEditor.java 2010-05-28 10:12:00 UTC (rev 22405) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEditor.java 2010-05-28 10:34:46 UTC (rev 22406) @@ -61,6 +61,7 @@ import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.editor.dialog.ExternalizeStringsDialog; import org.jboss.tools.vpe.editor.mozilla.listener.EditorLoadWindowListene= r; import org.jboss.tools.vpe.editor.mozilla.listener.MozillaResizeListener; import org.jboss.tools.vpe.editor.mozilla.listener.MozillaTooltipListener; @@ -114,6 +115,7 @@ public static final String ICON_SELECTION_BAR =3D "icons/selbar.gif"; //$= NON-NLS-1$ public static final String ICON_TEXT_FORMATTING =3D "icons/text-formattin= g.gif"; //$NON-NLS-1$ public static final String ICON_BUNDLE_AS_EL=3D "icons/bundle-as-el.gif";= //$NON-NLS-1$ + public static final String ICON_EXTERNALIZE_STRINGS=3D "icons/properties.= gif"; //$NON-NLS-1$ = static String SELECT_BAR =3D "SELECT_LBAR"; //$NON-NLS-1$ private XulRunnerEditor xulRunnerEditor; @@ -143,6 +145,7 @@ private Action showSelectionBarAction; private Action showTextFormattingAction; private Action showBundleAsELAction; + private Action externalizeStringsAction; = static { /* @@ -287,7 +290,7 @@ .getActiveShell(), fileLocation); dialogNew.open(); } else { - VpePlugin.getDefault().logError("Could not open Vpe Resources Dialog.= "); //$NON-NLS-1$ + VpePlugin.getDefault().logError(VpeUIMessages.COULD_NOT_OPEN_VPE_RESO= URCES_DIALOG); } } }; @@ -455,6 +458,28 @@ ICON_BUNDLE_AS_EL)); showBundleAsELAction.setToolTipText(VpeUIMessages.SHOW_BUNDLES_AS_EL); toolBarManager.add(showBundleAsELAction); + = + /* + * Create EXTERNALIZE STRINGS tool bar item + */ + externalizeStringsAction =3D new Action(VpeUIMessages.EXTENALIZE_STRINGS, + IAction.AS_PUSH_BUTTON) { + @Override + public void run() { + /* + * Externalize strings action = + * Show a dialog to add properties key and value + */ + ExternalizeStringsDialog dlg =3D new ExternalizeStringsDialog( + PlatformUI.getWorkbench().getDisplay().getActiveShell(), + controller); + dlg.open(); + } + }; + externalizeStringsAction.setImageDescriptor(ImageDescriptor.createFromFi= le(MozillaEditor.class, + ICON_EXTERNALIZE_STRINGS)); + externalizeStringsAction.setToolTipText(VpeUIMessages.EXTENALIZE_STRINGS= ); + toolBarManager.add(externalizeStringsAction); = updateToolbarItemsAccordingToPreferences(); toolBarManager.update(true); Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/VpeUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= VpeUIMessages.java 2010-05-28 10:12:00 UTC (rev 22405) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= VpeUIMessages.java 2010-05-28 10:34:46 UTC (rev 22406) @@ -127,6 +127,7 @@ public static String SHOW_RESOURCE_BUNDLES_USAGE_AS_EL; public static String SHOW_BUNDLES_AS_EL; public static String SHOW_BUNDLES_AS_MESSAGES; + public static String EXTENALIZE_STRINGS; public static String ASK_TAG_ATTRIBUTES_ON_TAG_INSERT; public static String ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR; public static String INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY= _FOR_VPE; @@ -157,5 +158,18 @@ public static String COULD_NOT_SET_TABLE_SELECTION; public static String CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT; public static String LIST_IS_EMPTY; + public static String EXTRNALIZE_STRINGS_DIALOG_TITLE; + public static String EXTRNALIZE_STRINGS_DIALOG_DESCRIPTION; + public static String EXTRNALIZE_STRINGS_DIALOG_TEXT_STRING; + public static String EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_KEY; + public static String EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE; + public static String EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_FILE; + public static String EXTRNALIZE_STRINGS_DIALOG_RESOURCE_BUNDLE_LIST; + public static String EXTRNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP; + public static String EXTRNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP; + public static String EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR; = + public static String COULD_NOT_OPEN_VPE_RESOURCES_DIALOG; + = + = } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-28 10:12:00 UTC (rev 22405) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-28 10:34:46 UTC (rev 22406) @@ -109,6 +109,7 @@ HIDE_TEXT_FORMATTING =3D Hide text formatting bar SHOW_RESOURCE_BUNDLES_USAGE_AS_EL=3DShow resource bundles usage as EL expr= essions SHOW_BUNDLES_AS_EL=3DShow bundle's messages as EL expressions +EXTENALIZE_STRINGS=3DExternalize strings SHOW_BUNDLES_AS_MESSAGES=3DShow bundle's messages explicitly ASK_TAG_ATTRIBUTES_ON_TAG_INSERT=3DAsk for tag attributes during tag insert ASK_CONFIRMATION_ON_CLOSING_SELECTION_BAR=3DAsk for confirmation when clos= ing Selection Bar @@ -144,5 +145,18 @@ COULD_NOT_SET_TABLE_SELECTION=3DCould not set table selection. LIST_IS_EMPTY=3DList is empty = +# Externalize Strings Dialog +EXTRNALIZE_STRINGS_DIALOG_TITLE=3DExternalize Strings Dialog +EXTRNALIZE_STRINGS_DIALOG_DESCRIPTION=3DExternalize your strings via prope= rties file +EXTRNALIZE_STRINGS_DIALOG_TEXT_STRING=3DText sting: +EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_KEY=3DProperties key: +EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE=3DProperties value: +EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_FILE=3DProperties file: +EXTRNALIZE_STRINGS_DIALOG_RESOURCE_BUNDLE_LIST=3DSelect resource bundle: +EXTRNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP=3DExternalize strings +EXTRNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP=3DHandle properties file +EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR=3DCould not initialize exte= rnalization dialog! + # Other messages -CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT=3DCannot load taglibs from PageConte= xt! \ No newline at end of file +CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT=3DCannot load taglibs from PageConte= xt! +COULD_NOT_OPEN_VPE_RESOURCES_DIALOG=3DCould not open Vpe Resources Dialog! \ No newline at end of file --===============0639295279198105216==-- From jbosstools-commits at lists.jboss.org Fri May 28 06:49:18 2010 Content-Type: multipart/mixed; boundary="===============6121574794858990004==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22407 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages. Date: Fri, 28 May 2010 06:49:18 -0400 Message-ID: <201005281049.o4SAnI6U028615@svn01.web.mwc.hst.phx2.redhat.com> --===============6121574794858990004== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2010-05-28 06:49:17 -0400 (Fri, 28 May 2010) New Revision: 22407 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/m= essages.properties Log: https://jira.jboss.org/browse/JBIDE-6287 , update. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-28 10:34:46 UTC (rev 22406) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-28 10:49:17 UTC (rev 22407) @@ -148,7 +148,7 @@ # Externalize Strings Dialog EXTRNALIZE_STRINGS_DIALOG_TITLE=3DExternalize Strings Dialog EXTRNALIZE_STRINGS_DIALOG_DESCRIPTION=3DExternalize your strings via prope= rties file -EXTRNALIZE_STRINGS_DIALOG_TEXT_STRING=3DText sting: +EXTRNALIZE_STRINGS_DIALOG_TEXT_STRING=3DText string: EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_KEY=3DProperties key: EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_VALUE=3DProperties value: EXTRNALIZE_STRINGS_DIALOG_PROPERTIES_FILE=3DProperties file: --===============6121574794858990004==-- From jbosstools-commits at lists.jboss.org Fri May 28 06:59:31 2010 Content-Type: multipart/mixed; boundary="===============2061651597647584800==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22408 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl. Date: Fri, 28 May 2010 06:59:31 -0400 Message-ID: <201005281059.o4SAxVnh029562@svn01.web.mwc.hst.phx2.redhat.com> --===============2061651597647584800== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-28 06:59:31 -0400 (Fri, 28 May 2010) New Revision: 22408 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/ClassBean.java Log: https://jira.jboss.org/browse/JBIDE-6380 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/ClassBean.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ClassBean.java 2010-05-28 10:49:17 UTC (rev 22407) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/ClassBean.java 2010-05-28 10:59:31 UTC (rev 22408) @@ -433,6 +433,8 @@ for (IQualifierDeclaration d: ds) { if(d.getQualifier() !=3D null && d.getQualifier().getInheritedDeclarati= on() !=3D null) { result.add(d); + } else if(isSpecializing()) { + result.add(d); } } return result; --===============2061651597647584800==-- From jbosstools-commits at lists.jboss.org Fri May 28 08:15:52 2010 Content-Type: multipart/mixed; boundary="===============8660015337773582923==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22409 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: messages and 1 other directory. Date: Fri, 28 May 2010 08:15:52 -0400 Message-ID: <201005281215.o4SCFqpQ018324@svn01.web.mwc.hst.phx2.redhat.com> --===============8660015337773582923== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2010-05-28 08:15:51 -0400 (Fri, 28 May 2010) New Revision: 22409 Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/moz= illa/MozillaEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/V= peUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/m= essages.properties Log: https://jira.jboss.org/browse/JBIDE-6287 , update. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/mozilla/MozillaEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEditor.java 2010-05-28 10:59:31 UTC (rev 22408) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEditor.java 2010-05-28 12:15:51 UTC (rev 22409) @@ -30,7 +30,11 @@ import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.ToolBarManager; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.ImageDescriptor; +import org.eclipse.jface.text.TextSelection; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.swt.SWT; import org.eclipse.swt.browser.ProgressEvent; import org.eclipse.swt.browser.ProgressListener; @@ -467,13 +471,26 @@ @Override public void run() { /* - * Externalize strings action = - * Show a dialog to add properties key and value + * Externalize strings action . + * Show a dialog to add properties key and value. + * When selection is correct show the dialog + * otherwise show warning message. */ - ExternalizeStringsDialog dlg =3D new ExternalizeStringsDialog( - PlatformUI.getWorkbench().getDisplay().getActiveShell(), - controller); - dlg.open(); + ISelection sel =3D controller.getSourceEditor().getSelectionProvider()= .getSelection(); + if ((sel instanceof TextSelection) + && (sel instanceof IStructuredSelection) + && (((IStructuredSelection) sel).size() =3D=3D 1)) { + ExternalizeStringsDialog dlg =3D new ExternalizeStringsDialog( + PlatformUI.getWorkbench().getDisplay().getActiveShell(), + controller); + dlg.open(); + } else { + MessageDialog.openWarning( + PlatformUI.getWorkbench().getDisplay().getActiveShell(), + VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE, + VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTION); + } + = } }; externalizeStringsAction.setImageDescriptor(ImageDescriptor.createFromFi= le(MozillaEditor.class, Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/VpeUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= VpeUIMessages.java 2010-05-28 10:59:31 UTC (rev 22408) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= VpeUIMessages.java 2010-05-28 12:15:51 UTC (rev 22409) @@ -168,6 +168,7 @@ public static String EXTRNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP; public static String EXTRNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP; public static String EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR; + public static String EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTION; = public static String COULD_NOT_OPEN_VPE_RESOURCES_DIALOG; = Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-28 10:59:31 UTC (rev 22408) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-28 12:15:51 UTC (rev 22409) @@ -156,6 +156,7 @@ EXTRNALIZE_STRINGS_DIALOG_PROPS_STRINGS_GROUP=3DExternalize strings EXTRNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP=3DHandle properties file EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR=3DCould not initialize exte= rnalization dialog! +EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTION=3DWrong selection! Please select= correct string. = # Other messages CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT=3DCannot load taglibs from PageConte= xt! --===============8660015337773582923==-- From jbosstools-commits at lists.jboss.org Fri May 28 09:11:44 2010 Content-Type: multipart/mixed; boundary="===============2587222007104085827==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22410 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition. Date: Fri, 28 May 2010 09:11:44 -0400 Message-ID: <201005281311.o4SDBixA031196@svn01.web.mwc.hst.phx2.redhat.com> --===============2587222007104085827== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: scabanovich Date: 2010-05-28 09:11:43 -0400 (Fri, 28 May 2010) New Revision: 22410 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inter= nal/core/impl/definition/ParametedTypeFactory.java Log: https://jira.jboss.org/browse/JBIDE-6387 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/internal/core/impl/definition/ParametedTypeFactory.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/ParametedTypeFactory.java 2010-05-28 12:15:51 UTC= (rev 22409) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/inte= rnal/core/impl/definition/ParametedTypeFactory.java 2010-05-28 13:11:43 UTC= (rev 22410) @@ -84,7 +84,8 @@ String[] ps =3D ((IMethod)context).getTypeParameterSignatures(); for (int i =3D 0; i < ps.length; i++) { String t =3D ps[i]; - if(t.endsWith(":")) t =3D t.substring(0, t.length() - 1); + int cp =3D t.indexOf(":"); + if(cp > 0) t =3D t.substring(0, cp); t =3D "Q" + t + ";"; if(t.equals(result.getSignature())) { cache.put(key, result); --===============2587222007104085827==-- From jbosstools-commits at lists.jboss.org Fri May 28 09:59:48 2010 Content-Type: multipart/mixed; boundary="===============0360570391206852375==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22411 - in trunk/documentation/guides/GettingStartedGuide/en-US: images/first_seam and 1 other directory. Date: Fri, 28 May 2010 09:59:48 -0400 Message-ID: <201005281359.o4SDxm9E004484@svn01.web.mwc.hst.phx2.redhat.com> --===============0360570391206852375== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: smukhina Date: 2010-05-28 09:59:47 -0400 (Fri, 28 May 2010) New Revision: 22411 Modified: trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam13.png trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam3.png trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam5.png trunk/documentation/guides/GettingStartedGuide/en-US/images/first_seam/f= irst_seam8.png Log: nomsg Modified: trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.x= ml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml 201= 0-05-28 13:11:43 UTC (rev 22410) +++ trunk/documentation/guides/GettingStartedGuide/en-US/first_seam.xml 201= 0-05-28 13:59:47 UTC (rev 22411) @@ -1,820 +1,828 @@ - - - - - - JBoss Developer Studio - Seam - JBoss - - - Write Your First Project with JBoss Developer Studio - This chapter is a set of hands-on labs. You get step-by-step infor= mation about how the JBoss - Developer Studio can be used during the development process. -
    - Create a Seam Application - In this section you get to know how to create a Seam project in = JBDS, how to start the - server and what a structure your project has after creating. -
    - Start Development Database - Before opening the JBoss Developer studio you need to download= and start W= orkshop Database - . - To start the database just run ./runDBServer.sh or runDBServer.bat from the database directory. - The end result should be a console window that looks like: -
    - Starting DataBase - - - - - -
    -
    -
    - Create and deploy Seam Web Project - Minimize the terminal window and run the JBoss Devel= oper Studio - from Applications Menu or from the desktop icon. - First of all you get the Workspace Launcher. Change the defaul= t workspace location if - it's needed. Click on Ok. -
    - Workspace Launcher Dialog - - - - - -
    - After startup, you see the welcome page. You could read how to= work with welcome pages - in previous chapter. Now select <= property>Create - New... icon and then press on Create Seam P= roject - link. - The New Seam Project wizard is started. Y= ou need to enter a name - (e.g., "workshop") and a location directory for your new= project. The wizard has - an option for selecting the actual Server (and not just WTP runtim= e) that will be used for - the project. This allows the wizard to correctly identify where th= e needed datasource and - driver libraries need to go. -
    - New Seam Project Wizard - - - - - -
    - All settings are already specified here, you can just modify t= he Configuration. Click on - the - Modify... - button to configure your custom facets pattern: -
    - Project Facets Specifying - - - - - -
    - On the whole the dialog allows to select the "features" you wa= nt to use in your project. - Doing this JBoss Developer Studio setups the = appropriate tooling for - your project. Since JBoss Seam integrates all popular Java EE fram= eworks, you can select any - combination of technologies from the list. Here, for the default c= onfiguration, Dynamic Web - Module, Java, JavaServer Faces (JSF), and Seam Facet are already s= elected for a typical - database-driven web application. The default project facets should= suffice. - In the Project Facets form you can also b= ring up server runtimes - panel by clicking Runtimes tab on the right = corner. This panel shows - available server runtimes. -
    - Runtimes Selecting - - - - - -
    - Click on - Ok - and then - Next - to proceed further. - A dynamic web application contains both web pages and Java code. - The next wizard will ask you where you want to store Java files. -
    - Java Build Path - - - - - -
    - Following page provides you Web Module Settings .You can just leave - the default values or choose another folder. -
    - Web Module Settings - - - - - -
    - On the next form, you will be able to select where those libra= ry JARs come from. The - easiest is just to select the JARs provided by the JBoss AS runtim= e associated with this - project. That is why it is important to chose the right JBoss AS 4= .2 runtime in the project - setup window. - - - Select - Library Provided by Target Runtime - as Type of JSF Impl= ementation - Library. We will use the JSF implementation that = comes with JBoss - server. - - - Click - Next - - - -
    - JSF Capabilities Adding - - - - - -
    - Next wizard step needs more settings that previous. Let's star= t with General section. - Leave the default Seam runtime and check a WAR deployment. -
    - Seam Facet Setting - - - - - -
    - Next Database section is a little tricky.= The Connection - Profile needs to be edited so that the new project wo= rks properly with the - external HSQLDB server. By default the project wizard tries to use= the JBoss embedded - HSQLDB, but the tutorial uses an external database to replicate a = more real world - development scenario. Click on Edit to modify= the Connection - Profile. -
    - DataBase Setting - - - - - -
    - Select HSQLDB Profile Properties. Make su= re the Database location - is set to - hsql://localhost:1701 - -
    - JDBC Connection Properties - - - - - -
    - Try click on Test Connection button. It p= robably won=E2=80=99t work. This - happens if the hsql jdbc driver is not exactly the same. This can = be worked around by - modifying the HSQLDB database driver settings. To modify the setti= ngs, click the Edit Driver Definition Driver( - - - - ) . - The proper Driver JAR File should be listed under Ja= r List. Select - the hsqldb.jar file found in the jbdevstudio/jboss-eap/jboss-as/co= mmon/lib/ directory and - click Ok. -
    - Driver Details - - - - - -
    - Now, the Test Connection should succeed. = After testing the - connection, click Ok. -
    - Connection Testing - - - - - -
    - You can leave the Code Generation section= as is. It refers to Java - packages in which the generated code will be placed. -
    - Code Generation Setting - - - - - -
    - Click on Finish button. Now, there should= be a new Seam project - called =E2=80=9Cworkshop=E2=80=9D listed in Package Explorer view.= -
    - "worskhop" Project in the Package Explorer - - - - - -
    -
    -
    - Start JBoss Application Server - The complete information on how to manage JBoss AS from JBoss = Developer Studio you can - read in a corresponding chapter. - Now you just need to start the server by clicking on the Start= the server icon ( - - - - - ) in the Servers. - Then run the project by selecting the project and use Run As... > - Run on Server. - - Note: - If the project does not show up, then you can use a normal b= rowser and use - http://localhost:8080/workshop/home.seam - as the url. - - Your project looks like this: -
    - "workshop" Project Started - - - - - -
    -
    -
    - Workshop Project Code Overview - Now let's examine the project and its structure. Go back to th= e Package Explorer view in - JBoss Developer Studio. - It seems like it's not much for project but this shell ap= plication contains a login - screen with default login logic, a menu template that can be furth= er modified, and other - layout templates. - It's important to note that the business logic will resid= e in the - src/hot - folder, by default. And, the package naming convention= s that were used in - New Seam project wizard could have been cha= nged to something - different from - org.domain.workshop.session. Al= so, notice that there is a - default Authenticator. java file. This is whe= re custom security logic - can be added. Seam has a nice declarative security model that we w= ill explore in a bit more - detail later on. The - src/main - folder is a model directory. It stores the project&apo= s;s JPA entity - beans. -
    - Project Structure - - - - - -
    - The view tier of the application is also important. Seam uses = facelets and there is a - built-in facelets GUI editor that has some nice WYSIWYG and compon= ent drag/drop - functionality. Try this out by opening home.xhtml from WebContent folder. -
    - Facelets GUI Editor - - - - - -
    - Notice that the templates reside in the - WebContent/layout - folder. There is a stylesheet in the - WebContent/stylesheet - folder. There is also a login and default error page. = The Facelet editor will be - explored in more detail later in the lab. - The project already has a datasource that was created per the = Seam project wizard - database settings. And, obviously all of the Seam specific configu= ration files and JAR - dependencies are included and placed in the proper locations. On l= ast noteworthy line item - is related to the build script. There isn=E2=80=99t a build script= because the Eclipse WTP(Web Tools - Project) plugin is used to publish web application changes. As you= can see, JBoss Developer - Studio is removing a great deal of complexity from the enterprise = Java project - setup/deployment process. The end result is a developer that is wr= iting code, not spending - days/weeks trying to figure out how to get a decent development en= vironment and project - build process. -
    -
    -
    - Seam Action Development - Now, it=E2=80=99s time to write some code. The good news is that= JBoss Developer Studio can also - help out in this respect. In this section, we will create a new Seam= Action POJO and facelet - with some custom business logic and some GUI changes. -
    - Create a New Seam Action - Go to main menu bar and click on - File > New > New Seam Action - to start the New Seam Action wizard. - Specify a Seam component name (e.g., &quo= t;myAction"). The - other properties will be auto-completed for you so there is no nee= d to change them. Click on - Finish. -
    - New Seam Action Wizard - - - - - -
    - Now, open the MyAction.java file and repl= ace the - "myAction" method with this logic: - - You also need to import the java.util.Calendar class by clicking - CTRL + Shift + O. -
    -
    - Test Seam Action - The new action can be tested by browsing the workshop-test pro= ject. JBoss Developer - Studio has already created a TestNG test case for you. -
    - "workshop-test" Project - - - - - -
    - The test case simulates a Seam component/method execution for = the MyAction.myAction() logic. - To run the test case, right click on MyActionTest.xm= l and click - - Run As > TestNG Suite - or use the Run As... toolbar shor= tcut as shown - below. -
    - TestNG Running - - - - - -
    - With any luck, the test case will pass. Look at the TestNG vie= w. -
    - TestNG Results - - - - - -
    - Now, it=E2=80=99s safe to test the new Seam Action in a web br= owser. The fastest way to do that - is to right click on myAction.xhtml and use <= emphasis> - Run As... > Run On Server - which will show the appropriate url in the browser. Al= ternatively you can - manually enter - http://localhost:8080/workshop/myAction.seam - into a browser. -
    - Seam Action in a Web Browser - - - - - -
    -
    -
    - Modify Seam Action User Interface - Browse to - http://localhost:8080/workshop/myAction.seam - and click on myAction. This execu= tes the =E2=80=9CmyAction=E2=80=9D method. - This looks pretty good, but we could make this page look a little = better. - Open - WebContent/myAction.xhtml - in JBoss Developer Studio to use the nice facelets edi= tor. -
    - Open Seam Action with Editor - - - - - -
    - Right click on the "myAction!" button in the visual = part of editor and select - <h:commandButton> Attributes. -
    - Seam Action Editing - - - - - -
    - Change the value of the button to somethi= ng different. If desired, - you can change any other text on the page. Then, type - CTRL + S - to save the facelet. -
    - Attributes Dialog - - - - - -
    - Refresh - http://localhost:8080/workshop/myAction.seam - and now you should see your changes. - Notice that you did not have to publish the application. JBoss= Developer Studio - auto-published it for you. -
    - Seam Action Is Modified - - - - - -
    -
    -
    -
    - Declarative Security - In this section you will see how it=E2=80=99s easy to secure the= facelets and facelet components - in Seam. Let=E2=80=99s go ahead and secure the action button, then w= e will secure the entire - page. -
    - Edit Login Authentication Logic - There is a class called Authenticator.java. The login page will - execute the Authenticator.authenticate() meth= od by default, so we=E2=80=99ll - start by adding some custom login logic. - Open Authenticator.java in JBoss Develope= r Studio and replace the - authenticate() method with this code: - -
    -
    - Secure Seam Page Component - Open myAction.xhtml and add a new secured= command button: - ]]> - Refresh - http://localhost:8080/workshop/myAction.seam - If you are not logged in you will only see one button.= If you are logged in, - there will be two buttons. -
    - One Button on a Page - - - - - -
    - The secured button is not visible because the user isn=E2=80= =99t logged in as "admin". -
    - Secured Button is Visible - - - - - -
    - The user is logged in as "admin". Securing components is - easy but securing pages is pretty simple as well. - Open - WebContent/WEB-INF/pages.xml - . Then add this markup directly underneath the <page= s> element: - ]]> - Refresh - http://localhost:8080/workshop/myAction.seam - If you are not logged in you will get bounced back to = the login page. -
    - Login Page - - - - - -
    - Thus, if you enter login credentials for the "a= dmin" - user, you will be re-directed to the secured page and secured comp= onent. If you enter - different login credentials, page access will be granted, but the = secured component will not - be displayed. - Congratulations! You have secured your new action both at the = facelet component and page - level. You also added custom authentication logic to the login act= ion. -
    -
    -
    - Browsing Workshop Database - In this section you get to know how to use the workshop database= that was started at the - beginning of the lab. -
    - Database Connectivity Setup - The workshop data can be browsed inside of JBoss Developer Stu= dio. - To open the Data Source Explorer, click on Window > Open Perspective - > Other > Database Development. - In the Data Source Explorer, expand a Databases node and select a - Default database. Right click on it, select= Connect from the context menu. -
    - Data Source Explorer - - - - - -
    -
    -
    - Browse Workshop Database - Then in the current view, drill down to the CUSTOMER= S table. -
    - "CUSTOMERS" Table - - - - - -
    - Right click on CUSTOMERS, select - Data > Sample Contents - to view the data in the table. - There should be a SQL Results view on the workbench, but it co= uld be hidden. Click on - the "Result1" tab in the right side= and you should see the - data in the CUSTOMERS table. -
    - SQL Results View - - - - - -
    - - Note: - If you can=E2=80=99t find the SQL Results view tab, click on= Window > Show - View > Other > SQL Development > SQL Results. - - Congratulations! You just connected to the workshop database a= nd queried the content - using Database Explorer tools. -
    -
    -
    - Database Programming - Now, it=E2=80=99s time to reverse engineer the workshop database= into a fully functioning Seam - CRUD(Create Read Update Delete) application. -
    - Reverse Engineer CRUD from a Running Database - In JBoss Developer Studio, switch to Seam - perspective, and then right-click the project and sel= ect New > Seam Generate Entities. - "workshop" project in the Seam Generate En= tities wizard - will be selected automatically. There is no need to change somethi= ng more, click - Next - to proceed further. -
    - Generate Seam Entities - - - - - -
    - On the next page use the - Include - button to include all the tables from the database and= click - Finish. -
    - Selecting Tables - - - - - -
    - After running the Generate Entities action, you will see new <= emphasis> - org.domain.workshop.entity - classes. These classes represent insert/update/delete/= query logic. -
    - org.domain.workshop.entity Classes - - - - - -
    - There are also - org.domain.workshop.entity - package that contains the JPA classes. These are the e= ntity beans that are - mapped to database tables.Note,that you can use Seam refactoring t= ools with Seam components. - Read more about it in Seam refactoring tools chapter of Seam Dev Tools Refere= nce Guide. - Last, but not least, there are facelets for all of the CRUD sc= reens. The best way to get - a feel for the generated code is to open a browser and play around= with the application. Go - to - http://localhost:8080/workshop - and insert/update/delete/query a few records. There is= quite a bit of AJAX in - this application, but which we will explore further later on in th= e lab. For now, take note - of the page tabs, required field logic and data table sorting in t= he list pages. -
    - CustomersList.xhtml in the Editor - - - - - -
    - Congratulations! You now have a fully functioning CRUD applica= tion that is already AJAX - enabled. -
    -
    - Use Hibernate Tools to Query Data via JPA - Now, it's time to write some JPA queries using the Hibern= ate perspective in - JBoss Developer Studio. - In the upper right corner of the workbench there is a small ic= on (see the figure below), - click on it and choose Hibernate. -
    - Hibernate Perspective - - - - - -
    - Look at the Hibernate Configurations view. In the "worksh= op" project, drill - down on the Session Factory and notice that t= he JPA entities/attributes - are listed in a nice tree view. -
    - Hibernate Configurations View - - - - - -
    - Right click on the Session Factory and se= lect HQL - Editor. This will open a JPA query scratch pad window= . - Write your query and click on the "Hibernate Dynamic SQL = Preview" tab. You - should see the SQL that will be executed if this JPA query is run.= -
    - JPA Query Editor - - - - - -
    - Run the query by clicking on the green run icon. - The results are listed in the "Hibernate Query Result&quo= t; tab. There is a - "Properties" tab in the workbench that can be used to se= e a specific JPA result. - These results represent the JPA objects because our query did not = specify column - names. -
    - Hibernate Query Result View - - - - - -
    - The query can be refined, and take note that there is nice cod= e completion in the JPA - query editor. -
    - Code Completion - - - - - -
    - A refined query will return results that are more ResultSet or= iented. Notice the join - logic that JPA supports. -
    - The Hibernate Query Result - - - - - -
    - There was no need to specify an Employees= table in the from part of the JPA query because JPA supports refe= rence traversal via Java - class attribute references. Not only are JPA and HQL queries fully= supported, but Criteria - based queries can also be written in the Criteria Editor. You shou= ld spend some time - tinkering with different queries and possibly Criteria based queri= es, even though the - instructions are not provided in this lab. -
    - Criteria Editor - - - - - -
    -
    -
    - Use Hibernate Tools to visualize the Data Model - Now, it=E2=80=99s time to view the data model for the workshop= database. - In the Hibernate Configurations view, select "workshop&qu= ot; project and expand the - Configuration node. Select the Cu= stomers entity, - right click on it, choose Open Mapping Diagram. -
    - Mapping Diagram Opening - - - - - -
    - You see a Diagram tab for the CUSTOMERS table and any tables t= hat have FK references. - This is a handy way to view the data model and JPA mappings. Now, = you=E2=80=99ve got access to - something that the Erwin Data Modeler can=E2=80=99t do. -
    - Diagram Tab - - - - - -
    -
    -
    -
    - Rich Components - This lab will conclude with one last AJAX twist. In this section= we add a RichFaces - inputNumberSlider to the Order Details edit s= creen. -
    - Add a Richfaces component to the CRUD Application - Switch to Seam perspective, open - WebContent/OrderdetailsEdit.xhtml - in JBoss Developer Studio. - Change the form field values using the visual editor. Seam has= generated the form field - names that match the database column names. This is not ideal for = business users. -
    - Form Fields Editing - - - - - -
    - Also, replace the QTY Ordered input field with a inp= utNumberSlider. - You can use the JBoss Developer Studio palette or right click on t= he form and insert the - RichFaces component. -
    - Insert RichFaces Component from Context Menu - - - - - -
    - One the last option is to use the source view and manually cop= y the inputNumberSlider - markup listed below: - ]]> -
    - Manually coping Source Code - - - - - -
    - The end result is an edit page that has better form labels and= a new RichFaces - control. -
    - The Result Page - - - - - -
    - Congratulations! You have completed the JBoss Developer Studio= lab. -
    -
    -     + + + + + + JBoss Developer Studio + Seam + JBoss + + + Write Your First Project with JBoss Developer Studio + This chapter is a set of hands-on labs. You get step-by-step infor= mation about how the JBoss + Developer Studio can be used during the development process. +
    + Create a Seam Application + In this section you get to know how to create a Seam project in = JBDS, how to start the + server and what a structure your project has after creating. +
    + Start Development Database + Before opening the JBoss Developer studio you need to download= and start W= orkshop Database + . + To start the database just run ./runDBServer.sh or runDBServer.bat from the database directory. + The end result should be a console window that looks like: +
    + Starting DataBase + + + + + +
    +
    +
    + Create and deploy Seam Web Project + Minimize the terminal window and run the JBoss Devel= oper Studio + from Applications Menu or from the desktop icon. + First of all you get the Workspace Launcher. Change the defaul= t workspace location if + it's needed. Click on Ok. +
    + Workspace Launcher Dialog + + + + + +
    + After startup, you see the welcome page. You could read how to= work with welcome pages + in previous chapter. Now select <= property>Create + New... icon and then press on Create Seam P= roject + link. + The New Seam Project wizard is started. Y= ou need to enter a name + (e.g., "workshop") and a location directory for your new= project. The wizard has + an option for selecting the actual Server (and not just WTP runtim= e) that will be used for + the project. This allows the wizard to correctly identify where th= e needed datasource and + driver libraries need to go. +
    + New Seam Project Wizard + + + + + +
    + All settings are already specified here, you can just modify t= he Configuration. Click on + the + Modify... + button to configure your custom facets pattern: +
    + Project Facets Specifying + + + + + +
    + On the whole the dialog allows to select the "features" you wa= nt to use in your project. + Doing this JBoss Developer Studio setups the = appropriate tooling for + your project. Since JBoss Seam integrates all popular Java EE fram= eworks, you can select any + combination of technologies from the list. Here, for the default c= onfiguration, Dynamic Web + Module, Java, JavaServer Faces (JSF), and Seam Facet are already s= elected for a typical + database-driven web application. The default project facets should= suffice. + In the Project Facets form you can also b= ring up server runtimes + panel by clicking Runtimes tab on the right = corner. This panel shows + available server runtimes. +
    + Runtimes Selecting + + + + + +
    + Click on + Ok + and then + Next + to proceed further. + A dynamic web application contains both web pages and Java code. + The next wizard will ask you where you want to store Java files. +
    + Java Build Path + + + + + +
    + Following page provides you Web Module Settings .You can just leave + the default values or choose another folder. +
    + Web Module Settings + + + + + +
    + On the next form, you will be able to select where those libra= ry JARs come from. The + easiest is just to select the JARs provided by the JBoss AS runtim= e associated with this + project. That is why it is important to chose the right JBoss AS 4= .2 runtime in the project + setup window. + + + Select + Library Provided by Target Runtime + as Type of JSF Impl= ementation + Library. We will use the JSF implementation that = comes with JBoss + server. + + + Click + Next + + + +
    + JSF Capabilities Adding + + + + + +
    + Next wizard step needs more settings that previous. Let's star= t with General section. + Leave the default Seam runtime and check a WAR deployment. +
    + Seam Facet Setting + + + + + +
    + Next Database section is a little tricky.= The Connection + Profile needs to be edited so that the new project wo= rks properly with the + external HSQLDB server. By default the project wizard tries to use= the JBoss embedded + HSQLDB, but the tutorial uses an external database to replicate a = more real world + development scenario. Click on Edit to modify= the Connection + Profile. +
    + DataBase Setting + + + + + +
    + Select HSQLDB Profile Properties. Make su= re the Database location + is set to + hsql://localhost:1701 + +
    + JDBC Connection Properties + + + + + +
    + Try click on Test Connection button. It p= robably won=E2=80=99t work. This + happens if the hsql jdbc driver is not exactly the same. This can = be worked around by + modifying the HSQLDB database driver settings. To modify the setti= ngs, click the Edit Driver Definition Driver( + + + + ) . + The proper Driver JAR File should be listed under Ja= r List. Select + the hsqldb.jar file found in the jbdevstudio/jboss-eap/jboss-as/co= mmon/lib/ directory and + click Ok. +
    + Driver Details + + + + + +
    + Now, the Test Connection should succeed. = After testing the + connection, click Ok. +
    + Connection Testing + + + + + +
    + You can leave the Code Generation section= as is. It refers to Java + packages in which the generated code will be placed. + = +
    + Code Generation Setting + + + + + +
    + + + Tip: + If you want to name your web project "MyProject-war" note th= at the Test project name should not be "MyProject-war-test", = + it should be "MyProject-test". + + = + Click on Finish button. Now, there should= be a new Seam project + called =E2=80=9Cworkshop=E2=80=9D listed in Package Explorer view.= +
    + "worskhop" Project in the Package Explorer + + + + + +
    +
    +
    + Start JBoss Application Server + The complete information on how to manage JBoss AS from JBoss = Developer Studio you can + read in a corresponding chapter. + Now you just need to start the server by clicking on the Start= the server icon ( + + + + + ) in the Servers. + Then run the project by selecting the project and use Run As... > + Run on Server. + + Note: + If the project does not show up, then you can use a normal b= rowser and use + http://localhost:8080/workshop/home.seam + as the url. + + Your project looks like this: +
    + "workshop" Project Started + + + + + +
    +
    +
    + Workshop Project Code Overview + Now let's examine the project and its structure. Go back to th= e Package Explorer view in + JBoss Developer Studio. + It seems like it's not much for project but this shell ap= plication contains a login + screen with default login logic, a menu template that can be furth= er modified, and other + layout templates. + It's important to note that the business logic will resid= e in the + src/hot + folder, by default. And, the package naming convention= s that were used in + New Seam project wizard could have been cha= nged to something + different from + org.domain.workshop.session. Al= so, notice that there is a + default Authenticator. java file. This is whe= re custom security logic + can be added. Seam has a nice declarative security model that we w= ill explore in a bit more + detail later on. The + src/main + folder is a model directory. It stores the project&apo= s;s JPA entity + beans. +
    + Project Structure + + + + + +
    + The view tier of the application is also important. Seam uses = facelets and there is a + built-in facelets GUI editor that has some nice WYSIWYG and compon= ent drag/drop + functionality. Try this out by opening home.xhtml from WebContent folder. +
    + Facelets GUI Editor + + + + + +
    + Notice that the templates reside in the + WebContent/layout + folder. There is a stylesheet in the + WebContent/stylesheet + folder. There is also a login and default error page. = The Facelet editor will be + explored in more detail later in the lab. + The project already has a datasource that was created per the = Seam project wizard + database settings. And, obviously all of the Seam specific configu= ration files and JAR + dependencies are included and placed in the proper locations. On l= ast noteworthy line item + is related to the build script. There isn=E2=80=99t a build script= because the Eclipse WTP(Web Tools + Project) plugin is used to publish web application changes. As you= can see, JBoss Developer + Studio is removing a great deal of complexity from the enterprise = Java project + setup/deployment process. The end result is a developer that is wr= iting code, not spending + days/weeks trying to figure out how to get a decent development en= vironment and project + build process. +
    +
    +
    + Seam Action Development + Now, it=E2=80=99s time to write some code. The good news is that= JBoss Developer Studio can also + help out in this respect. In this section, we will create a new Seam= Action POJO and facelet + with some custom business logic and some GUI changes. +
    + Create a New Seam Action + Go to main menu bar and click on + File > New > New Seam Action + to start the New Seam Action wizard. + Specify a Seam component name (e.g., &quo= t;myAction"). The + other properties will be auto-completed for you so there is no nee= d to change them. Click on + Finish. +
    + New Seam Action Wizard + + + + + +
    + Now, open the MyAction.java file and repl= ace the + "myAction" method with this logic: + + You also need to import the java.util.Calendar class by clicking + CTRL + Shift + O. +
    +
    + Test Seam Action + The new action can be tested by browsing the workshop-test pro= ject. JBoss Developer + Studio has already created a TestNG test case for you. +
    + "workshop-test" Project + + + + + +
    + The test case simulates a Seam component/method execution for = the MyAction.myAction() logic. + To run the test case, right click on MyActionTest.xm= l and click + + Run As > TestNG Suite + or use the Run As... toolbar shor= tcut as shown + below. +
    + TestNG Running + + + + + +
    + With any luck, the test case will pass. Look at the TestNG vie= w. +
    + TestNG Results + + + + + +
    + Now, it=E2=80=99s safe to test the new Seam Action in a web br= owser. The fastest way to do that + is to right click on myAction.xhtml and use <= emphasis> + Run As... > Run On Server + which will show the appropriate url in the browser. Al= ternatively you can + manually enter + http://localhost:8080/workshop/myAction.seam + into a browser. +
    + Seam Action in a Web Browser + + + + + +
    +
    +
    + Modify Seam Action User Interface + Browse to + http://localhost:8080/workshop/myAction.seam + and click on myAction. This execu= tes the =E2=80=9CmyAction=E2=80=9D method. + This looks pretty good, but we could make this page look a little = better. + Open + WebContent/myAction.xhtml + in JBoss Developer Studio to use the nice facelets edi= tor. +
    + Open Seam Action with Editor + + + + + +
    + Right click on the "myAction!" button in the visual = part of editor and select + <h:commandButton> Attributes. +
    + Seam Action Editing + + + + + +
    + Change the value of the button to somethi= ng different. If desired, + you can change any other text on the page. Then, type + CTRL + S + to save the facelet. +
    + Attributes Dialog + + + + + +
    + Refresh + http://localhost:8080/workshop/myAction.seam + and now you should see your changes. + Notice that you did not have to publish the application. JBoss= Developer Studio + auto-published it for you. +
    + Seam Action Is Modified + + + + + +
    +
    +
    +
    + Declarative Security + In this section you will see how it=E2=80=99s easy to secure the= facelets and facelet components + in Seam. Let=E2=80=99s go ahead and secure the action button, then w= e will secure the entire + page. +
    + Edit Login Authentication Logic + There is a class called Authenticator.java. The login page will + execute the Authenticator.authenticate() meth= od by default, so we=E2=80=99ll + start by adding some custom login logic. + Open Authenticator.java in JBoss Develope= r Studio and replace the + authenticate() method with this code: + +
    +
    + Secure Seam Page Component + Open myAction.xhtml and add a new secured= command button: + ]]> + Refresh + http://localhost:8080/workshop/myAction.seam + If you are not logged in you will only see one button.= If you are logged in, + there will be two buttons. +
    + One Button on a Page + + + + + +
    + The secured button is not visible because the user isn=E2=80= =99t logged in as "admin". +
    + Secured Button is Visible + + + + + +
    + The user is logged in as "admin". Securing components is + easy but securing pages is pretty simple as well. + Open + WebContent/WEB-INF/pages.xml + . Then add this markup directly underneath the <page= s> element: + ]]> + Refresh + http://localhost:8080/workshop/myAction.seam + If you are not logged in you will get bounced back to = the login page. +
    + Login Page + + + + + +
    + Thus, if you enter login credentials for the "a= dmin" + user, you will be re-directed to the secured page and secured comp= onent. If you enter + different login credentials, page access will be granted, but the = secured component will not + be displayed. + Congratulations! You have secured your new action both at the = facelet component and page + level. You also added custom authentication logic to the login act= ion. +
    +
    +
    + Browsing Workshop Database + In this section you get to know how to use the workshop database= that was started at the + beginning of the lab. +
    + Database Connectivity Setup + The workshop data can be browsed inside of JBoss Developer Stu= dio. + To open the Data Source Explorer, click on Window > Open Perspective + > Other > Database Development. + In the Data Source Explorer, expand a Databases node and select a + Default database. Right click on it, select= Connect from the context menu. +
    + Data Source Explorer + + + + + +
    +
    +
    + Browse Workshop Database + Then in the current view, drill down to the CUSTOMER= S table. +
    + "CUSTOMERS" Table + + + + + +
    + Right click on CUSTOMERS, select + Data > Sample Contents + to view the data in the table. + There should be a SQL Results view on the workbench, but it co= uld be hidden. Click on + the "Result1" tab in the right side= and you should see the + data in the CUSTOMERS table. +
    + SQL Results View + + + + + +
    + + Note: + If you can=E2=80=99t find the SQL Results view tab, click on= Window > Show + View > Other > SQL Development > SQL Results. + + Congratulations! You just connected to the workshop database a= nd queried the content + using Database Explorer tools. +
    +
    +
    + Database Programming + Now, it=E2=80=99s time to reverse engineer the workshop database= into a fully functioning Seam + CRUD(Create Read Update Delete) application. +
    + Reverse Engineer CRUD from a Running Database + In JBoss Developer Studio, switch to Seam + perspective, and then right-click the project and sel= ect New > Seam Generate Entities. + "workshop" project in the Seam Generate En= tities wizard + will be selected automatically. There is no need to change somethi= ng more, click + Next + to proceed further. +
    + Generate Seam Entities + + + + + +
    + On the next page use the + Include + button to include all the tables from the database and= click + Finish. +
    + Selecting Tables + + + + + +
    + After running the Generate Entities action, you will see new <= emphasis> + org.domain.workshop.entity + classes. These classes represent insert/update/delete/= query logic. +
    + org.domain.workshop.entity Classes + + + + + +
    + There are also + org.domain.workshop.entity + package that contains the JPA classes. These are the e= ntity beans that are + mapped to database tables.Note,that you can use Seam refactoring t= ools with Seam components. + Read more about it in Seam refactoring tools chapter of Seam Dev Tools Refere= nce Guide. + Last, but not least, there are facelets for all of the CRUD sc= reens. The best way to get + a feel for the generated code is to open a browser and play around= with the application. Go + to + http://localhost:8080/workshop + and insert/update/delete/query a few records. There is= quite a bit of AJAX in + this application, but which we will explore further later on in th= e lab. For now, take note + of the page tabs, required field logic and data table sorting in t= he list pages. +
    + CustomersList.xhtml in the Editor + + + + + +
    + Congratulations! You now have a fully functioning CRUD applica= tion that is already AJAX + enabled. +
    +
    + Use Hibernate Tools to Query Data via JPA + Now, it's time to write some JPA queries using the Hibern= ate perspective in + JBoss Developer Studio. + In the upper right corner of the workbench there is a small ic= on (see the figure below), + click on it and choose Hibernate. +
    + Hibernate Perspective + + + + + +
    + Look at the Hibernate Configurations view. In the "worksh= op" project, drill + down on the Session Factory and notice that t= he JPA entities/attributes + are listed in a nice tree view. +
    + Hibernate Configurations View + + + + + +
    + Right click on the Session Factory and se= lect HQL + Editor. This will open a JPA query scratch pad window= . + Write your query and click on the "Hibernate Dynamic SQL = Preview" tab. You + should see the SQL that will be executed if this JPA query is run.= +
    + JPA Query Editor + + + + + +
    + Run the query by clicking on the green run icon. + The results are listed in the "Hibernate Query Result&quo= t; tab. There is a + "Properties" tab in the workbench that can be used to se= e a specific JPA result. + These results represent the JPA objects because our query did not = specify column + names. +
    + Hibernate Query Result View + + + + + +
    + The query can be refined, and take note that there is nice cod= e completion in the JPA + query editor. +
    + Code Completion + + + + + +
    + A refined query will return results that are more ResultSet or= iented. Notice the join + logic that JPA supports. +
    + The Hibernate Query Result + + + + + +
    + There was no need to specify an Employees= table in the from part of the JPA query because JPA supports refe= rence traversal via Java + class attribute references. Not only are JPA and HQL queries fully= supported, but Criteria + based queries can also be written in the Criteria Editor. You shou= ld spend some time + tinkering with different queries and possibly Criteria based queri= es, even though the + instructions are not provided in this lab. +
    + Criteria Editor + + + + + +
    +
    +
    + Use Hibernate Tools to visualize the Data Model + Now, it=E2=80=99s time to view the data model for the workshop= database. + In the Hibernate Configurations view, select "workshop&qu= ot; project and expand the + Configuration node. Select the Cu= stomers entity, + right click on it, choose Open Mapping Diagram. +
    + Mapping Diagram Opening + + + + + +
    + You see a Diagram tab for the CUSTOMERS table and any tables t= hat have FK references. + This is a handy way to view the data model and JPA mappings. Now, = you=E2=80=99ve got access to + something that the Erwin Data Modeler can=E2=80=99t do. +
    + Diagram Tab + + + + + +
    +
    +
    +
    + Rich Components + This lab will conclude with one last AJAX twist. In this section= we add a RichFaces + inputNumberSlider to the Order Details edit s= creen. +
    + Add a Richfaces component to the CRUD Application + Switch to Seam perspective, open + WebContent/OrderdetailsEdit.xhtml + in JBoss Developer Studio. + Change the form field values using the visual editor. Seam has= generated the form field + names that match the database column names. This is not ideal for = business users. +
    + Form Fields Editing + + + + + +
    + Also, replace the QTY Ordered input field with a inp= utNumberSlider. + You can use the JBoss Developer Studio palette or right click on t= he form and insert the + RichFaces component. +
    + Insert RichFaces Component from Context Menu + + + + + +
    + One the last option is to use the source view and manually cop= y the inputNumberSlider + markup listed below: + ]]> +
    + Manually coping Source Code + + + + + +
    + The end result is an edit page that has better form labels and= a new RichFaces + control. +
    + The Result Page + + + + + +
    + Congratulations! You have completed the JBoss Developer Studio= lab. +
    +
    +     \ No newline at end of file Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam13.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam3.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam5.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/documentation/guides/GettingStartedGuide/en-US/images/first= _seam/first_seam8.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============0360570391206852375==-- From jbosstools-commits at lists.jboss.org Fri May 28 11:18:21 2010 Content-Type: multipart/mixed; boundary="===============7627020476445837370==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22412 - in trunk/as/tests/org.jboss.ide.eclipse.as.test: projectPieces and 2 other directories. Date: Fri, 28 May 2010 11:18:20 -0400 Message-ID: <201005281518.o4SFIKx3025755@svn01.web.mwc.hst.phx2.redhat.com> --===============7627020476445837370== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-28 11:18:20 -0400 (Fri, 28 May 2010) New Revision: 22412 Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projectPieces/mvel2.jar trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/a= s/test/publishing/v2/JSTZippedDeploymentTester.java Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/a= s/test/publishing/AbstractDeploymentTest.java Log: JBIDE-6320 - test case added Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2010-= 05-28 13:59:47 UTC (rev 22411) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/META-INF/MANIFEST.MF 2010-= 05-28 15:18:20 UTC (rev 22412) @@ -16,7 +16,7 @@ org.eclipse.wst.common.project.facet.ui, org.eclipse.debug.core, org.eclipse.jdt.launching, - org.eclipse.jst.jee;bundle-version=3D"1.0.100", + org.eclipse.jst.jee, org.eclipse.jst.server.core;bundle-version=3D"1.1.0", org.jboss.tools.jmx.core.test, org.jboss.ide.eclipse.as.ui;bundle-version=3D"1.0.0", Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/projectPieces/mvel2.jar =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/as/tests/org.jboss.ide.eclipse.as.test/projectPi= eces/mvel2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/ec= lipse/as/test/publishing/AbstractDeploymentTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/= as/test/publishing/AbstractDeploymentTest.java 2010-05-28 13:59:47 UTC (rev= 22411) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/= as/test/publishing/AbstractDeploymentTest.java 2010-05-28 15:18:20 UTC (rev= 22412) @@ -93,7 +93,7 @@ return getFileLocation("/projects/" + name); } = - protected File getFileLocation(String path) throws CoreException { + public static File getFileLocation(String path) throws CoreException { Bundle bundle =3D Platform.getBundle(BUNDLE_NAME); URL url =3D null; try { Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclip= se/as/test/publishing/v2/JSTZippedDeploymentTester.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/= as/test/publishing/v2/JSTZippedDeploymentTester.java = (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/= as/test/publishing/v2/JSTZippedDeploymentTester.java 2010-05-28 15:18:20 UT= C (rev 22412) @@ -0,0 +1,290 @@ +package org.jboss.ide.eclipse.as.test.publishing.v2; + +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.ByteArrayInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.zip.ZipEntry; +import java.util.zip.ZipInputStream; + +import junit.framework.TestCase; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.wst.common.frameworks.datamodel.IDataModel; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IRuntime; +import org.eclipse.wst.server.core.IRuntimeType; +import org.eclipse.wst.server.core.IRuntimeWorkingCopy; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.IServerType; +import org.eclipse.wst.server.core.IServerWorkingCopy; +import org.eclipse.wst.server.core.ServerCore; +import org.eclipse.wst.server.core.ServerUtil; +import org.eclipse.wst.server.core.internal.ServerWorkingCopy; +import org.jboss.ide.eclipse.as.core.ExtensionManager; +import org.jboss.ide.eclipse.as.core.server.IDeployableServer; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; +import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer; +import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; +import org.jboss.ide.eclipse.as.core.util.FileUtil; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; +import org.jboss.ide.eclipse.as.test.ASTest; +import org.jboss.ide.eclipse.as.test.publishing.AbstractDeploymentTest; +import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils; +import org.jboss.ide.eclipse.as.test.util.wtp.JavaEEFacetConstants; +import org.jboss.ide.eclipse.as.test.util.wtp.OperationTestCase; +import org.jboss.ide.eclipse.as.test.util.wtp.ProjectCreationUtil; +import org.jboss.ide.eclipse.as.test.util.wtp.ProjectUtility; +import org.jboss.tools.test.util.JobUtils; + +public class JSTZippedDeploymentTester extends TestCase { + = + IProject project; + IServer server; + final String MODULE_NAME =3D "newModule"; + final String CONTENT_DIR =3D "contentDirS"; = + final String TEXT_FILE =3D "test.txt"; + final IPath CONTENT_TEXT_FILE =3D new Path(CONTENT_DIR).append(TEXT_FILE); + public void setUp() throws Exception { + project =3D createProject(); + server =3D createServer(); + IServerWorkingCopy wc =3D server.createWorkingCopy(); + ServerAttributeHelper helper =3D new ServerAttributeHelper(server, wc); + helper.setAttribute(IDeployableServer.ZIP_DEPLOYMENTS_PREF, true); + server =3D wc.save(true, new NullProgressMonitor()); + } + = + public void tearDown() throws Exception { + ServerRuntimeUtils.deleteAllServers(); + ServerRuntimeUtils.deleteAllRuntimes(); + ProjectUtility.deleteAllProjects(); + clearStateLocation(); + } + = + protected IProject createProject() throws Exception { + IDataModel dm =3D ProjectCreationUtil.getEARDataModel(MODULE_NAME, CONTE= NT_DIR, null, null, JavaEEFacetConstants.EAR_5, false); + OperationTestCase.runAndVerify(dm); + IProject p =3D ResourcesPlugin.getWorkspace().getRoot().getProject(MODUL= E_NAME); + assertTrue(p.exists()); + = + File srcFile =3D AbstractDeploymentTest.getFileLocation("projectPieces/m= vel2.jar"); + IPath contentDir =3D p.getFolder(CONTENT_DIR).getLocation(); + File destFile =3D new File(contentDir.toFile(), "mvel2.jar"); + FileUtil.fileSafeCopy(srcFile, destFile); + p.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); + return p; + } + = + protected IServer createServer() throws CoreException { + IPath state =3D ASTest.getDefault().getStateLocation(); + IPath deploy =3D state.append("testDeployments").append("deploy"); + IPath tmpDeploy =3D state.append("testDeployments").append("tmpDeploy"); + return createServer(deploy.toOSString(), tmpDeploy.toOSString()); + } + = + protected void clearStateLocation() { + IPath state =3D ASTest.getDefault().getStateLocation(); + if( state.toFile().exists()) { + File[] children =3D state.toFile().listFiles(); + for( int i =3D 0; i < children.length; i++ ) { + FileUtil.safeDelete(children[i]); + } + } + } + = + protected String getDeployRoot(IServer server) { + IDeployableServer ds =3D ServerConverter.getDeployableServer(server); + return ds.getDeployFolder(); + } + = + protected IServer createServer(String deployLocation, String tempDeployLo= cation) throws CoreException { + IRuntimeType rt =3D ServerCore.findRuntimeType("org.jboss.ide.eclipse.as= .runtime.stripped"); + IRuntimeWorkingCopy wc =3D rt.createRuntime("testRuntime", null); + wc.setLocation(ASTest.getDefault().getStateLocation()); + IRuntime runtime =3D wc.save(true, null); + IServerType st =3D ServerCore.findServerType("org.jboss.ide.eclipse.as.s= ystemCopyServer"); + ServerWorkingCopy swc =3D (ServerWorkingCopy) st.createServer("testServe= r", null, null); + swc.setServerConfiguration(null); + swc.setName("testServer"); + swc.setRuntime(runtime); + swc.setAttribute(DeployableServer.DEPLOY_DIRECTORY, deployLocation); + swc.setAttribute(DeployableServer.TEMP_DEPLOY_DIRECTORY, tempDeployLocat= ion); + IServer server =3D swc.save(true, null); + return server; + } + + protected IStatus publish() throws CoreException { + return server.publish(IServer.PUBLISH_INCREMENTAL, new NullProgressMonit= or()); + } + = + protected void addModule(IModule module) throws CoreException { + IServerWorkingCopy copy =3D server.createWorkingCopy(); + copy.modifyModules(new IModule[]{module}, new IModule[0], new NullProgre= ssMonitor()); + server =3D copy.save(false, new NullProgressMonitor()); + } + + protected void removeModule(IModule module) throws CoreException { + IServerWorkingCopy copy =3D server.createWorkingCopy(); + copy.modifyModules(new IModule[]{}, new IModule[] {module}, new NullProg= ressMonitor()); + server =3D copy.save(false, new NullProgressMonitor()); + } + + protected void verifyJSTZippedPublisher(IModule[] module) { + IJBossServerPublisher publisher =3D ExtensionManager + .getDefault().getPublisher(server, module, "local"); + assertTrue(publisher.getClass().getName().contains("WTPZippedPublisher")= ); + } + = + public int countFiles(File root) { + int count =3D 0; + if( !root.isDirectory() ) + return 1; + File[] children =3D root.listFiles(); + for( int i =3D 0; i < children.length; i++ ) = + count +=3D countFiles(children[i]); + return count; + } + = + public int countAllResources(File root) { + int count =3D 0; + if( !root.isDirectory() ) + return 1; + File[] children =3D root.listFiles(); + for( int i =3D 0; i < children.length; i++ ) = + count +=3D countFiles(children[i]); + return 1 + count; + } + = + = + + protected void setContents(IFile file, int val) throws IOException , Core= Exception{ + setContents(file, "" + val); + } + = + protected void setContents(IFile file, String val) throws IOException , C= oreException{ + if( !file.exists()) = + file.create(new ByteArrayInputStream((val).getBytes()), false, null); + else + file.setContents(new ByteArrayInputStream((val).getBytes()), false, fal= se, new NullProgressMonitor()); + try { + Thread.sleep(2000); + } catch( InterruptedException ie) {} + JobUtils.waitForIdle(); = + } + = + protected void assertContents(IFile file, int val) throws IOException, Co= reException { + assertContents(file, "" + val); + } + = + protected void assertContents(IFile file, String val) throws IOException,= CoreException { + String contents =3D getContents(file); + assertEquals(val, contents); + } + + protected void assertContents(File file, int val) throws IOException, Cor= eException { + assertContents(file, "" + val); + } + = + protected void assertContents(File file, String val) throws IOException, = CoreException { + String contents =3D getContents(file); + assertEquals(val, contents); + } + + protected String getContents(IFile file) throws IOException, CoreExceptio= n { + BufferedInputStream bis =3D new BufferedInputStream(file.getContents()); + int l =3D (int)file.getLocation().toFile().length(); + byte[] bs =3D new byte[l]; + l =3D bis.read(bs, 0, l); + bis.close(); + return new String(bs); + } + = + public static byte[] getBytesFromFile(File file) throws IOException { + InputStream is =3D new FileInputStream(file); + byte[] bytes =3D new byte[(int)file.length()]; + int offset =3D 0; + int numRead =3D 0; + while (offset < bytes.length + && (numRead=3Dis.read(bytes, offset, bytes.length-offset)) = >=3D 0) { + offset +=3D numRead; + } + is.close(); + return bytes; + } + = + static public String getContents(File aFile) throws IOException { + return new String(getBytesFromFile(aFile)); + } + + = + public void testMain() throws CoreException, IOException { + IModule[] mods =3D ServerUtil.getModules(project); + IModule mod =3D null; + // find hte right module ugh + for( int i =3D 0; i < mods.length && mod =3D=3D null; i++ ) { + if( mods[i].getModuleType().getId().equals("jst.ear")) + mod =3D mods[i]; + } + assertNotNull(mod); + IModule[] module =3D new IModule[] { mod }; + verifyJSTZippedPublisher(module); + addModule(mod); + publish(); + IPath projLoc =3D project.getLocation(); + System.out.println(projLoc); + IPath deployRoot =3D new Path(getDeployRoot(server)); + IPath zipped =3D deployRoot.append(MODULE_NAME + ".ear"); + assertTrue(zipped.toFile().exists()); + assertTrue(zipped.toFile().isFile()); + IPath unzip1 =3D ASTest.getDefault().getStateLocation().append("unzip1"); + IPath unzip2 =3D ASTest.getDefault().getStateLocation().append("unzip2"); + unzipFile(zipped,unzip1); + assertTrue(unzip1.toFile().list().length =3D=3D 1); + unzipFile(unzip1.append("mvel2.jar"), unzip2); + assertTrue(unzip2.toFile().list().length > 1); + System.out.println("end"); + } + = + = + public static void unzipFile(IPath zipped, IPath toLoc) { + toLoc.toFile().mkdirs(); + final int BUFFER =3D 2048; + try { + BufferedOutputStream dest =3D null; + FileInputStream fis =3D new = + FileInputStream(zipped.toFile()); + ZipInputStream zis =3D new ZipInputStream(new BufferedInputStream(fis= )); + ZipEntry entry; + while((entry =3D zis.getNextEntry()) !=3D null) { + int count; + byte data[] =3D new byte[BUFFER]; + // write the files to the disk + toLoc.append(entry.getName()).toFile().getParentFile().mkdir= s(); + if( !toLoc.append(entry.getName()).toFile().exists()) { + FileOutputStream fos =3D new FileOutputStream(toLoc.append(= entry.getName()).toOSString()); + dest =3D new BufferedOutputStream(fos, BUFFER); + while ((count =3D zis.read(data, 0, BUFFER)) !=3D -1) { + dest.write(data, 0, count); + } + dest.flush(); + dest.close(); + } + } + zis.close(); + } catch(Exception e) { + e.printStackTrace(); + } + } +} --===============7627020476445837370==-- From jbosstools-commits at lists.jboss.org Fri May 28 11:50:38 2010 Content-Type: multipart/mixed; boundary="===============3661059263745025585==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22413 - in trunk/cdi: plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink and 1 other directories. Date: Fri, 28 May 2010 11:50:38 -0400 Message-ID: <201005281550.o4SFocG5029870@svn01.web.mwc.hst.phx2.redhat.com> --===============3661059263745025585== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-28 11:50:37 -0400 (Fri, 28 May 2010) New Revision: 22413 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/= CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/t= ext/ext/hyperlink/InjectedPointHyperlinkDetector.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/t= ext/ext/hyperlink/InjectedPointListHyperlink.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cd= i/text/ext/test/InjectedPointHyperlinkDetectorTest.java Log: https://jira.jboss.org/browse/JBIDE-6386 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cd= i/core/CDIUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-28 15:18:20 UTC (rev 22412) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core= /CDIUtil.java 2010-05-28 15:50:37 UTC (rev 22413) @@ -77,7 +77,7 @@ * @param beans * @param element */ - public static IInjectionPoint findInjectionPoint(Set beans, IJavaE= lement element) { + public static IInjectionPoint findInjectionPoint(Set beans, IJavaE= lement element, int position) { if (!(element instanceof IField) && (element instanceof IMethod) && (ele= ment instanceof ILocalVariable)) { return null; } @@ -86,17 +86,17 @@ Set injectionPoints =3D bean.getInjectionPoints(); for (IInjectionPoint iPoint : injectionPoints) { if (element instanceof IField && iPoint instanceof IInjectionPointFiel= d) { - if (((IInjectionPointField) iPoint).getField() !=3D null && ((IInject= ionPointField) iPoint).getField().equals(element)) { + if (((IInjectionPointField) iPoint).getField() !=3D null && ((IInject= ionPointField) iPoint).getField().equals(element)) return iPoint; - } - } else if (element instanceof IMethod && iPoint instanceof IInjectionP= ointMethod) { - if (((IInjectionPointMethod) iPoint).getMethod() !=3D null && ((IInje= ctionPointMethod) iPoint).getMethod().equals(element)) { + } else if (element instanceof IMethod && iPoint instanceof IInjectionP= ointMethod && position =3D=3D 0) { + if (((IInjectionPointMethod) iPoint).getMethod() !=3D null && ((IInje= ctionPointMethod) iPoint).getMethod().equals(element)) return iPoint; - } }else if(element instanceof ILocalVariable && iPoint instanceof IInjec= tionPointParameter){ - if (((IInjectionPointParameter) iPoint).getName().equals(element.getE= lementName())) { + if (((IInjectionPointParameter) iPoint).getName().equals(element.getE= lementName())) = return iPoint; - } + }else if(iPoint instanceof IInjectionPointParameter && position !=3D 0= ){ + if(iPoint.getStartPosition() <=3D position && (iPoint.getStartPositio= n()+iPoint.getLength()) >=3D position) + return iPoint; } } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tool= s/cdi/text/ext/hyperlink/InjectedPointHyperlinkDetector.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2010-05-28 15:18:20 = UTC (rev 22412) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/hyperlink/InjectedPointHyperlinkDetector.java 2010-05-28 15:50:37 = UTC (rev 22413) @@ -11,18 +11,17 @@ package org.jboss.tools.cdi.text.ext.hyperlink; = import java.util.ArrayList; +import java.util.Set; = import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IResource; -import org.eclipse.jdt.core.IAnnotatable; -import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jdt.core.ICodeAssist; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.ILocalVariable; -import org.eclipse.jdt.core.IMember; -import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.internal.core.ResolvedBinaryType; +import org.eclipse.jdt.internal.core.ResolvedSourceType; import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility; import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; import org.eclipse.jdt.internal.ui.text.JavaWordFinder; @@ -32,10 +31,13 @@ import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector; import org.eclipse.jface.text.hyperlink.IHyperlink; import org.eclipse.ui.texteditor.ITextEditor; -import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDICoreNature; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIUtil; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; -import org.jboss.tools.common.model.util.EclipseJavaUtil; = public class InjectedPointHyperlinkDetector extends AbstractHyperlinkDetec= tor{ = @@ -72,8 +74,8 @@ = if(file =3D=3D null) return null; - = - if(CDICorePlugin.getCDI(file.getProject(), true) =3D=3D null) + CDICoreNature cdiNature =3D CDICorePlugin.getCDI(file.getProject(), true= ); + if(cdiNature =3D=3D null) return null; = IJavaElement[] elements =3D null; @@ -85,18 +87,20 @@ = ArrayList hyperlinks =3D new ArrayList(); for (IJavaElement element : elements) { - = - if(element instanceof IType){ - if(CDIConstants.INJECT_ANNOTATION_TYPE_NAME.equals(((IType) element).= getFullyQualifiedName())){ - ICompilationUnit cUnit =3D (ICompilationUnit)input; - element =3D cUnit.getElementAt(wordRegion.getOffset()); - if(element =3D=3D null) - continue; + int position =3D 0; + if(element instanceof ResolvedSourceType || element instanceof Resolve= dBinaryType){ + ICompilationUnit cUnit =3D (ICompilationUnit)input; + element =3D cUnit.getElementAt(wordRegion.getOffset()); + if(element =3D=3D null) + continue; + = + if(element instanceof IMethod){ + position =3D offset; } } = - if(findAnnotation(element)){ - hyperlinks.add(new InjectedPointListHyperlink(file, textViewer, wordR= egion, element, document)); + if(findInjectedBeans(cdiNature, element, position, file)){ + hyperlinks.add(new InjectedPointListHyperlink(file, textViewer, wordR= egion, element, position, document)); } } = @@ -109,42 +113,24 @@ return null; } = - private IMember findMember(IJavaElement element){ - IJavaElement elem =3D element; - while(elem !=3D null){ - if(elem instanceof IMember) - return (IMember)elem; - elem =3D elem.getParent(); + private boolean findInjectedBeans(CDICoreNature nature, IJavaElement elem= ent, int offset, IFile file){ + ICDIProject cdiProject =3D nature.getDelegate(); + = + if(cdiProject =3D=3D null){ + return false; } - return null; - } - = - private boolean findAnnotation(IJavaElement element){ - if(element instanceof IAnnotatable){ - IAnnotatable annotatable =3D (IAnnotatable) element; - IType type =3D null; - if(element instanceof IMember){ - type =3D ((IMember)element).getDeclaringType(); - try{ - IAnnotation[] annotations =3D annotatable.getAnnotations(); - for(IAnnotation annotation : annotations){ - if(annotation !=3D null && annotation.getElementName() !=3D null && = CDIConstants.INJECT_ANNOTATION_TYPE_NAME.equals(EclipseJavaUtil.resolveType= (type, annotation.getElementName()))) - return true; - } - }catch (JavaModelException jme) { - CDIExtensionsPlugin.log(jme); - } - }else if(element instanceof ILocalVariable){ - IMember member =3D findMember(element); - if(member =3D=3D null) - return false; - type =3D member.getDeclaringType(); - return true; - } - = + = + Set beans =3D cdiProject.getBeans(file.getFullPath()); + = + IInjectionPoint injectionPoint =3D CDIUtil.findInjectionPoint(beans, ele= ment, offset); + if(injectionPoint =3D=3D null){ + return false; } + = + Set resultBeanSet =3D cdiProject.getBeans(injectionPoint); + if(resultBeanSet.size() > 0) + return true; + = return false; - = } - } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tool= s/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/hyperlink/InjectedPointListHyperlink.java 2010-05-28 15:18:20 UTC = (rev 22412) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/= text/ext/hyperlink/InjectedPointListHyperlink.java 2010-05-28 15:50:37 UTC = (rev 22413) @@ -33,19 +33,20 @@ public class InjectedPointListHyperlink extends AbstractHyperlink{ private IFile file; private IJavaElement element; + private int position; private IRegion region; private ITextViewer viewer; = private static MultipleHyperlinkPresenter mhp =3D new MultipleHyperlinkPr= esenter(new RGB(0, 0, 255)); private static boolean installed =3D false; = - public InjectedPointListHyperlink(IFile file, ITextViewer viewer, IRegion= region, IJavaElement element, IDocument document){ + public InjectedPointListHyperlink(IFile file, ITextViewer viewer, IRegion= region, IJavaElement element, int position, IDocument document){ this.file =3D file; this.element =3D element; + this.position =3D position; this.region =3D region; this.viewer =3D viewer; setDocument(document); - = } = = @@ -71,7 +72,7 @@ = Set beans =3D cdiProject.getBeans(file.getFullPath()); = - IInjectionPoint injectionPoint =3D CDIUtil.findInjectionPoint(beans, ele= ment); + IInjectionPoint injectionPoint =3D CDIUtil.findInjectionPoint(beans, ele= ment, position); if(injectionPoint =3D=3D null){ openFileFailed(); return; Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/t= ools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-28 15:18:2= 0 UTC (rev 22412) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/c= di/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-05-28 15:50:3= 7 UTC (rev 22413) @@ -19,6 +19,7 @@ public void testInjectedPointHyperlinkDetector() throws Exception { ArrayList regionList =3D new ArrayList(); regionList.add(new Region(115, 6)); // Inject + regionList.add(new Region(133, 6)); // Logger regionList.add(new Region(140, 6)); // logger regionList.add(new Region(196, 6)); // logger regionList.add(new Region(250, 6)); // logger @@ -28,9 +29,10 @@ = public void testInjectedProducerMethodParametersHyperlinkDetector() throw= s Exception { ArrayList regionList =3D new ArrayList(); + regionList.add(new Region(552, 3)); // Foo + regionList.add(new Region(556, 3)); // Foo + regionList.add(new Region(567, 3)); // Foo regionList.add(new Region(571, 5)); // order - regionList.add(new Region(659, 3)); = - regionList.add(new Region(695, 3)); = checkRegions("JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/CustomPro= ducerImpl.java", regionList, new InjectedPointHyperlinkDetector()); } @@ -47,9 +49,9 @@ public void testInjectedConstructorParametersHyperlinkDetector() throws E= xception { ArrayList regionList =3D new ArrayList(); regionList.add(new Region(880, 6)); + regionList.add(new Region(894, 3)); // Fox regionList.add(new Region(898, 3)); - regionList.add(new Region(950, 6)); - regionList.add(new Region(967, 7)); + regionList.add(new Region(975, 3)); regionList.add(new Region(979, 3)); regionList.add(new Region(1017, 3)); = @@ -59,9 +61,9 @@ public void testInjectedInitializerParametersHyperlinkDetector() throws E= xception { ArrayList regionList =3D new ArrayList(); regionList.add(new Region(880, 6)); + regionList.add(new Region(894, 3)); // Fox regionList.add(new Region(898, 3)); - regionList.add(new Region(945, 6)); - regionList.add(new Region(967, 4)); + regionList.add(new Region(972, 3)); regionList.add(new Region(976, 3)); regionList.add(new Region(1014, 3)); = --===============3661059263745025585==-- From jbosstools-commits at lists.jboss.org Fri May 28 12:08:44 2010 Content-Type: multipart/mixed; boundary="===============3356836770145243679==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22414 - branches/3.2.helios/esb/tests/org.jboss.tools.esb.project.core.test/META-INF. Date: Fri, 28 May 2010 12:08:44 -0400 Message-ID: <201005281608.o4SG8iRo005678@svn01.web.mwc.hst.phx2.redhat.com> --===============3356836770145243679== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-28 12:08:44 -0400 (Fri, 28 May 2010) New Revision: 22414 Modified: branches/3.2.helios/esb/tests/org.jboss.tools.esb.project.core.test/META= -INF/MANIFEST.MF Log: ESB manifest errors in 3.2.helios Modified: branches/3.2.helios/esb/tests/org.jboss.tools.esb.project.core.te= st/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/esb/tests/org.jboss.tools.esb.project.core.test/MET= A-INF/MANIFEST.MF 2010-05-28 15:50:37 UTC (rev 22413) +++ branches/3.2.helios/esb/tests/org.jboss.tools.esb.project.core.test/MET= A-INF/MANIFEST.MF 2010-05-28 16:08:44 UTC (rev 22414) @@ -6,13 +6,11 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Require-Bundle: org.junit;bundle-version=3D"3.8.2", - org.jboss.tools.tests, org.jboss.tools.esb.project.core;bundle-version=3D"1.0.0", org.eclipse.wst.common.project.facet.core;bundle-version=3D"1.4.0", org.eclipse.wst.server.core;bundle-version=3D"1.1.101", org.eclipse.core.resources;bundle-version=3D"3.5.0", org.eclipse.core.runtime;bundle-version=3D"3.5.0", - org.jboss.tools.common.test;bundle-version=3D"2.0.0", org.eclipse.jdt.core;bundle-version=3D"3.5.0", org.jboss.ide.eclipse.as.core;bundle-version=3D"1.0.0", org.eclipse.jdt.launching;bundle-version=3D"3.5.0", @@ -21,4 +19,5 @@ org.eclipse.jst.common.frameworks;bundle-version=3D"1.1.300", org.eclipse.core.commands;bundle-version=3D"3.5.0", org.eclipse.jst.j2ee;bundle-version=3D"1.1.300", - org.jboss.ide.eclipse.as.classpath.core;bundle-version=3D"2.1.0" + org.jboss.ide.eclipse.as.classpath.core;bundle-version=3D"2.1.0", + org.jboss.tools.tests;bundle-version=3D"3.1.0" --===============3356836770145243679==-- From jbosstools-commits at lists.jboss.org Fri May 28 12:15:06 2010 Content-Type: multipart/mixed; boundary="===============5089272779292848327==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22415 - in trunk: product and 1 other directory. Date: Fri, 28 May 2010 12:15:06 -0400 Message-ID: <201005281615.o4SGF6F4006387@svn01.web.mwc.hst.phx2.redhat.com> --===============5089272779292848327== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-28 12:15:05 -0400 (Fri, 28 May 2010) New Revision: 22415 Added: trunk/product/ trunk/product/jbds4.product trunk/product/pom.xml trunk/product/product-pom.xml Log: initial commit of product build using tycho (incomplete; fails to find jbt = examples plugin) Added: trunk/product/jbds4.product =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/product/jbds4.product (rev 0) +++ trunk/product/jbds4.product 2010-05-28 16:15:05 UTC (rev 22415) @@ -0,0 +1,40 @@ + + + + + + + + + + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.sm= allFonts + + + + + + + + + + + + + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.inter= nal.debug.ui.launcher.StandardVMType/JavaSE-1.6 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.inter= nal.debug.ui.launcher.StandardVMType/JavaSE-1.6 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.int= ernal.debug.ui.launcher.StandardVMType/JavaSE-1.6 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.int= ernal.debug.ui.launcher.StandardVMType/JavaSE-1.6 + + + + + + + + + + + + + + Added: trunk/product/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/product/pom.xml (rev 0) +++ trunk/product/pom.xml 2010-05-28 16:15:05 UTC (rev 22415) @@ -0,0 +1,19 @@ + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + product + 0.0.1-SNAPSHOT + pom + + features + plugins + + + = \ No newline at end of file Added: trunk/product/product-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/product/product-pom.xml (rev 0) +++ trunk/product/product-pom.xml 2010-05-28 16:15:05 UTC (rev 22415) @@ -0,0 +1,85 @@ + + = + + 4.0.0 + + ../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + product + 0.0.1-SNAPSHOT + + + pom + + plugins + features + + + ${project.artifactId}_${project.version} + + + org.sonatype.tycho + maven-osgi-packaging-plugin + ${tychoVersion} + + + package + product-export + + product-export + + + jbds4.product + + + + macosx + cocoa + x86 + + + macosx + carbon + x86 + + + win32 + win32 + x86 + + + linux + gtk + x86 + + + linux + gtk + x86_64 + + + + + + + + + + = --===============5089272779292848327==-- From jbosstools-commits at lists.jboss.org Fri May 28 15:17:48 2010 Content-Type: multipart/mixed; boundary="===============9037482941003258296==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22416 - in trunk/jst/tests/org.jboss.tools.jst.text.ext.test: META-INF and 1 other directories. Date: Fri, 28 May 2010 15:17:48 -0400 Message-ID: <201005281917.o4SJHmTu014058@svn01.web.mwc.hst.phx2.redhat.com> --===============9037482941003258296== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-28 15:17:47 -0400 (Fri, 28 May 2010) New Revision: 22416 Added: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/js= t/text/ext/test/JsfExtAllTests.java Removed: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/js= t/text/ext/test/CommonExtAllTests.java Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF trunk/jst/tests/org.jboss.tools.jst.text.ext.test/build.properties trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests fixed: - manifest errors - project import errors this tests should be moved to jsf component to work under tycho Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFE= ST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF = 2010-05-28 16:15:05 UTC (rev 22415) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/META-INF/MANIFEST.MF = 2010-05-28 19:17:47 UTC (rev 22416) @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name.0 -Bundle-SymbolicName: org.jboss.tools.jsp.text.ext.test +Bundle-SymbolicName: org.jboss.tools.jst.text.ext.test Bundle-Version: 3.1.0.qualifier Require-Bundle: org.jboss.tools.common.text.ext, org.junit, @@ -15,7 +15,6 @@ org.eclipse.jface.text, org.jboss.tools.common.model.ui Export-Package: org.jboss.tools.jst.text.ext.test -Bundle-ClassPath: common-text-ext-test.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/build.properties 2010= -05-28 16:15:05 UTC (rev 22415) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/build.properties 2010= -05-28 19:17:47 UTC (rev 22416) @@ -1,10 +1,15 @@ -output.. =3D bin/ -bin.includes =3D META-INF/,\ - projects/,\ - common-text-ext-test.jar,\ - plugin.properties -source.common-text-ext-test.jar =3D src/ +bin.includes =3D projects/,\ + META-INF/,\ + plugin.properties,\ + . src.includes =3D projects/,\ src/,\ + plugin.properties,\ + build.properties,\ META-INF/,\ - build.properties + .project,\ + .classpath +source.. =3D src/ +jars.compile.order =3D . +source.. =3D src/ +output.. =3D bin/ Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml 2010-05-28 16= :15:05 UTC (rev 22415) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/pom.xml 2010-05-28 19= :17:47 UTC (rev 22416) @@ -8,7 +8,7 @@ 0.0.1-SNAPSHOT org.jboss.tools - org.jboss.tools.jsp.text.ext.test = + org.jboss.tools.jst.text.ext.test = 3.1.0-SNAPSHOT eclipse-test-plugin Deleted: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/to= ols/jst/text/ext/test/CommonExtAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/j= st/text/ext/test/CommonExtAllTests.java 2010-05-28 16:15:05 UTC (rev 22415) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/j= st/text/ext/test/CommonExtAllTests.java 2010-05-28 19:17:47 UTC (rev 22416) @@ -1,22 +0,0 @@ -package org.jboss.tools.jst.text.ext.test; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.jboss.tools.test.util.ProjectImportTestSetup; - - -public class CommonExtAllTests { - public static Test suite() { - TestSuite suite =3D new TestSuite("Test for default package"); - //$JUnit-BEGIN$ - - suite.addTest(new ProjectImportTestSetup(new TestSuite(OpenOnsTest.class= ), - "org.jboss.tools.common.text.ext.test", - new String[]{"projects/HiperlinksTestProject"}, - new String[]{"HiperlinksTestProject"})); - = - //$JUnit-END$ - return suite; - } -} Copied: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/too= ls/jst/text/ext/test/JsfExtAllTests.java (from rev 22415, trunk/jst/tests/o= rg.jboss.tools.jst.text.ext.test/src/org/jboss/tools/jst/text/ext/test/Comm= onExtAllTests.java) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/j= st/text/ext/test/JsfExtAllTests.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/j= st/text/ext/test/JsfExtAllTests.java 2010-05-28 19:17:47 UTC (rev 22416) @@ -0,0 +1,22 @@ +package org.jboss.tools.jst.text.ext.test; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.jboss.tools.test.util.ProjectImportTestSetup; + + +public class JsfExtAllTests { + public static Test suite() { + TestSuite suite =3D new TestSuite("Test for default package"); + //$JUnit-BEGIN$ + + suite.addTest(new ProjectImportTestSetup(new TestSuite(OpenOnsTest.class= ), + "org.jboss.tools.jst.text.ext.test", + new String[]{"projects/HiperlinksTestProject"}, + new String[]{"HiperlinksTestProject"})); + = + //$JUnit-END$ + return suite; + } +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/= org/jboss/tools/jst/text/ext/test/JsfExtAllTests.java ___________________________________________________________________ Name: svn:mime-type + text/plain --===============9037482941003258296==-- From jbosstools-commits at lists.jboss.org Fri May 28 15:40:13 2010 Content-Type: multipart/mixed; boundary="===============6233339067148894665==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22417 - in trunk/seam: plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core and 5 other directories. Date: Fri, 28 May 2010 15:40:12 -0400 Message-ID: <201005281940.o4SJeCkq017037@svn01.web.mwc.hst.phx2.redhat.com> --===============6233339067148894665== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-28 15:40:10 -0400 (Fri, 28 May 2010) New Revision: 22417 Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/co= re/SeamCoreBuilder.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/co= re/SeamCorePlugin.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/SeamProject.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/SeamResourceVisitor.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/scanner/java/JavaScanner.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/scanner/lib/ClassPath.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/scanner/lib/LibraryScanner.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/scanner/xml/PropertiesScanner.java trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/in= ternal/core/scanner/xml/XMLScanner.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam= /core/test/ScannerTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam= /core/test/SeamBigProjectTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam= /core/test/project/facet/AbstractSeamFacetTest.java trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam= /core/test/project/facet/Seam2FacetInstallDelegateTest.java Log: Performance fix for seam. Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/core/SeamCoreBuilder.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/c= ore/SeamCoreBuilder.java 2010-05-28 19:17:47 UTC (rev 22416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/c= ore/SeamCoreBuilder.java 2010-05-28 19:40:10 UTC (rev 22417) @@ -10,17 +10,14 @@ *************************************************************************= *****/ = package org.jboss.tools.seam.core; = -import java.io.IOException; import java.util.Map; = import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceDelta; -import org.eclipse.core.resources.IResourceDeltaVisitor; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osgi.util.NLS; import org.jboss.tools.common.el.core.resolver.TypeInfoCollector; import org.jboss.tools.seam.internal.core.SeamProject; import org.jboss.tools.seam.internal.core.SeamResourceVisitor; @@ -30,123 +27,55 @@ import org.jboss.tools.seam.internal.core.scanner.xml.XMLScanner; = public class SeamCoreBuilder extends IncrementalProjectBuilder { + public static String BUILDER_ID =3D "org.jboss.tools.seam.core.seambuilde= r"; //$NON-NLS-1$ - = - SeamResourceVisitor resourceVisitor =3D null; - = - SeamProject getSeamProject() { - IProject p =3D getProject(); - if(p =3D=3D null) return null; - return (SeamProject)SeamCorePlugin.getSeamProject(p, false); - } - = - SeamResourceVisitor getResourceVisitor() { - if(resourceVisitor =3D=3D null) { - SeamProject p =3D getSeamProject(); - resourceVisitor =3D new SeamResourceVisitor(p); - } - return resourceVisitor; - } - - class SampleDeltaVisitor implements IResourceDeltaVisitor { - /* - * @see org.eclipse.core.resources.IResourceDeltaVisitor#visit(org.eclip= se.core.resources.IResourceDelta) - */ - public boolean visit(IResourceDelta delta) throws CoreException { - IResource resource =3D delta.getResource(); - switch (delta.getKind()) { - case IResourceDelta.ADDED: - return getResourceVisitor().getVisitor().visit(resource); - case IResourceDelta.REMOVED: - SeamProject p =3D getSeamProject(); - if(p !=3D null) p.pathRemoved(resource.getFullPath()); - break; - case IResourceDelta.CHANGED: - return getResourceVisitor().getVisitor().visit(resource); - } - //return true to continue visiting children. - return true; - } - } - + /** * @see org.eclipse.core.resource.InternalProjectBuilder#build(int, * java.util.Map, org.eclipse.core.runtime.IProgressMonitor) */ protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException { - SeamProject sp =3D getSeamProject(); - if(sp =3D=3D null) { - return null; = - } - = - if(sp.hasNoStorage()) { - kind =3D FULL_BUILD; - } + SeamProject seamProject =3D (SeamProject)SeamCorePlugin.getSeamProject(g= etProject(), false); + SeamResourceVisitor resourceVisitor =3D new SeamResourceVisitor(seamProj= ect); = long begin =3D System.currentTimeMillis(); = - sp.postponeFiring(); - = + seamProject.postponeFiring(); + try { - = - sp.resolveStorage(kind !=3D FULL_BUILD); - = - if(sp.getClassPath().update()) { - sp.getClassPath().process(); - } else if(sp.getClassPath().hasToUpdateProjectDependencies()) { - sp.getClassPath().validateProjectDependencies(); - } = + seamProject.build(); TypeInfoCollector.cleanCache(); = - if (kind =3D=3D FULL_BUILD) { - fullBuild(monitor); - } else { - IResourceDelta delta =3D getDelta(getProject()); - if (delta =3D=3D null) { - fullBuild(monitor); - } else { - incrementalBuild(delta, monitor); + IResourceDelta delta =3D getDelta(getProject()); + + if (seamProject.hasNoStorage() || delta =3D=3D null ) { + IPath[] paths =3D resourceVisitor.getPathsToVisit(); + for (IPath iPath : paths) { + getProject().findMember(iPath.removeFirstSegments(1)).accept(resource= Visitor); } + } else { + delta.accept(resourceVisitor); } + long end =3D System.currentTimeMillis(); - sp.fullBuildTime +=3D end - begin; - try { - sp.store(); - } catch (IOException e) { - SeamCorePlugin.getPluginLog().logError(NLS.bind(SeamCoreMessages.SeamC= oreBuilder_1,sp.getProject().getName()), e); //$NON-NLS-1$ - } - = - sp.postBuild(); - = + seamProject.fullBuildTime +=3D end - begin; + seamProject.postBuild(); + } finally { - sp.fireChanges(); + seamProject.fireChanges(); } - = + // Check if we need to return something here instead of null return null; } = - protected void fullBuild(final IProgressMonitor monitor) - throws CoreException { - try { - getProject().accept(getResourceVisitor().getVisitor()); - } catch (CoreException e) { - SeamCorePlugin.getPluginLog().logError(e); - } - } - - protected void incrementalBuild(IResourceDelta delta, - IProgressMonitor monitor) throws CoreException { - // the visitor does the work. - delta.accept(new SampleDeltaVisitor()); - } = /** * Access to xml scanner for test. * @return */ - public static IFileScanner getXMLScanner() { + public static IFileScanner createXMLScanner() { return new XMLScanner(); } = @@ -154,7 +83,7 @@ * Access to java scanner for test. * @return */ - public static IFileScanner getJavaScanner() { + public static IFileScanner createJavaScanner() { return new JavaScanner(); } = @@ -162,13 +91,12 @@ * Access to library scanner for test. * @return */ - public static IFileScanner getLibraryScanner() { + public static IFileScanner createLibraryScanner() { return new LibraryScanner(); } = protected void clean(IProgressMonitor monitor) throws CoreException { - SeamProject sp =3D getSeamProject(); - if(sp !=3D null) sp.clean(); + ((SeamProject)SeamCorePlugin.getSeamProject(getProject(), false)).clean(= ); } = } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/core/SeamCorePlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/c= ore/SeamCorePlugin.java 2010-05-28 19:17:47 UTC (rev 22416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/c= ore/SeamCorePlugin.java 2010-05-28 19:40:10 UTC (rev 22417) @@ -11,6 +11,7 @@ package org.jboss.tools.seam.core; = import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.List; = @@ -18,6 +19,9 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; +import org.eclipse.core.resources.ISaveContext; +import org.eclipse.core.resources.ISaveParticipant; +import org.eclipse.core.resources.ISavedState; import org.eclipse.core.resources.ProjectScope; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; @@ -65,6 +69,37 @@ super.start(context); cleanCachedProjects(); ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeL= istener); + ISavedState lastState =3D + ResourcesPlugin.getWorkspace().addSaveParticipant(this, new ISavePartic= ipant() { + = + public void saving(ISaveContext context) + throws CoreException { + switch (context.getKind()) { + case ISaveContext.SNAPSHOT: + case ISaveContext.FULL_SAVE: + break; + case ISaveContext.PROJECT_SAVE: + SeamProject sp =3D (SeamProject)SeamCorePlugin.getSeamProject(cont= ext.getProject(), false); + try { + sp.store(); + } catch (IOException e) { + SeamCorePlugin.getPluginLog().logError(e); + } + break; + } + } + = + public void rollback(ISaveContext context) { + + } + = + public void prepareToSave(ISaveContext context) throws CoreException { + } + = + public void doneSaving(ISaveContext context) { + } + }); + = } = static void cleanCachedProjects() { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/SeamProject.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/SeamProject.java 2010-05-28 19:17:47 UTC (rev 22416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/SeamProject.java 2010-05-28 19:40:10 UTC (rev 22417) @@ -357,6 +357,11 @@ } } = + public void build() { + resolveStorage(hasNoStorage()); + getClassPath().build(); + } + = /** * = */ Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/SeamResourceVisitor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/SeamResourceVisitor.java 2010-05-28 19:17:47 UTC (rev 22416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/SeamResourceVisitor.java 2010-05-28 19:40:10 UTC (rev 22417) @@ -17,6 +17,8 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IResourceDelta; +import org.eclipse.core.resources.IResourceDeltaVisitor; import org.eclipse.core.resources.IResourceVisitor; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; @@ -39,7 +41,7 @@ /** * @author Viacheslav Kabanovich */ -public class SeamResourceVisitor implements IResourceVisitor { +public class SeamResourceVisitor implements IResourceVisitor, IResourceDel= taVisitor { static IFileScanner[] FILE_SCANNERS =3D { new JavaScanner(), = new XMLScanner(), = @@ -51,6 +53,15 @@ IPath[] srcs =3D new IPath[0]; IPath webinf =3D null; = + public IPath[] getPathsToVisit() { + IPath[] dest =3D new IPath[srcs.length + (webinf=3D=3Dnull?0:1)]; + System.arraycopy(srcs, 0, dest, 0, srcs.length); + if(webinf!=3Dnull) { + dest[srcs.length] =3D webinf; + } + return dest; + } + = public SeamResourceVisitor(SeamProject p) { this.p =3D p; = @@ -69,19 +80,10 @@ } } } - = - public IResourceVisitor getVisitor() { - return this; - } = public boolean visit(IResource resource) { if(resource instanceof IFile) { IFile f =3D (IFile)resource; - for (int i =3D 0; i < outs.length; i++) { - if(outs[i].isPrefixOf(resource.getFullPath())) { - return false; - } - } for (int i =3D 0; i < FILE_SCANNERS.length; i++) { IFileScanner scanner =3D FILE_SCANNERS[i]; if(scanner.isRelevant(f)) { @@ -103,29 +105,6 @@ } } } - if(resource instanceof IFolder) { - IPath path =3D resource.getFullPath(); - for (int i =3D 0; i < outs.length; i++) { - if(outs[i].isPrefixOf(path)) { - return false; - } - } - for (int i =3D 0; i < srcs.length; i++) { - if(srcs[i].isPrefixOf(path) || path.isPrefixOf(srcs[i])) { - return true; - } - } - if(webinf !=3D null) { - if(webinf.isPrefixOf(path) || path.isPrefixOf(webinf)) { - return true; - } - } - if(resource =3D=3D resource.getProject()) { - return true; - } - return false; - } - //return true to continue visiting children. return true; } = @@ -164,4 +143,68 @@ } } = + public boolean visit(IResourceDelta delta) throws CoreException { + IResource resource =3D delta.getResource(); + switch (delta.getKind()) { + case IResourceDelta.ADDED: + case IResourceDelta.CHANGED: + if(resource instanceof IFile) { + IFile f =3D (IFile)resource; + for (int i =3D 0; i < outs.length; i++) { + if(outs[i].isPrefixOf(resource.getFullPath())) { + return false; + } + } + for (int i =3D 0; i < FILE_SCANNERS.length; i++) { + IFileScanner scanner =3D FILE_SCANNERS[i]; + if(scanner.isRelevant(f)) { + long t =3D System.currentTimeMillis(); + if(!scanner.isLikelyComponentSource(f)) { + p.pathRemoved(f.getFullPath()); + return false; + } + LoadedDeclarations c =3D null; + try { + c =3D scanner.parse(f, p); + } catch (ScannerException e) { + SeamCorePlugin.getDefault().logError(e); + } + if(c !=3D null) componentsLoaded(c, f); + long dt =3D System.currentTimeMillis() - t; + timeUsed +=3D dt; +// System.out.println("Time=3D" + timeUsed); + } + } + } + if(resource instanceof IFolder) { + IPath path =3D resource.getFullPath(); + for (int i =3D 0; i < outs.length; i++) { + if(outs[i].isPrefixOf(path)) { + return false; + } + } + for (int i =3D 0; i < srcs.length; i++) { + if(srcs[i].isPrefixOf(path) || path.isPrefixOf(srcs[i])) { + return true; + } + } + if(webinf !=3D null) { + if(webinf.isPrefixOf(path) || path.isPrefixOf(webinf)) { + return true; + } + } + if(resource =3D=3D resource.getProject()) { + return true; + } + return false; + } + //return true to continue visiting children. + return true; + case IResourceDelta.REMOVED: + p.pathRemoved(resource.getFullPath()); + break; + } + return true; + } + } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/scanner/java/JavaScanner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/scanner/java/JavaScanner.java 2010-05-28 19:17:47 UTC (rev 224= 16) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/scanner/java/JavaScanner.java 2010-05-28 19:40:10 UTC (rev 224= 17) @@ -33,6 +33,7 @@ import org.jboss.tools.common.util.FileUtil; import org.jboss.tools.seam.core.ISeamProject; import org.jboss.tools.seam.core.SeamCoreMessages; +import org.jboss.tools.seam.core.SeamCorePlugin; import org.jboss.tools.seam.internal.core.scanner.IFileScanner; import org.jboss.tools.seam.internal.core.scanner.LoadedDeclarations; import org.jboss.tools.seam.internal.core.scanner.ScannerException; @@ -52,8 +53,7 @@ * @return */ = public boolean isRelevant(IFile resource) { - if(resource.getName().endsWith(".java")) return true; //$NON-NLS-1$ - return false; + return resource.getName().endsWith(".java"); } = /** @@ -76,6 +76,8 @@ return true; } = + private ASTParser p =3D ASTParser.newParser(AST.JLS3); + /** * Returns component or list of component * TODO change return type @@ -93,7 +95,6 @@ } if(u =3D=3D null) return null; ICompilationUnit[] us =3D new ICompilationUnit[]{u}; - ASTParser p =3D ASTParser.newParser(AST.JLS3); p.setSource(u); p.setResolveBindings(true); if("package-info.java".equals(f.getFullPath().lastSegment())) { @@ -150,7 +151,7 @@ try { ts =3D source.getTypes(); } catch (JavaModelException e) { - //ignore + SeamCorePlugin.getPluginLog().logError(e); } if(ts =3D=3D null || ts.length =3D=3D 0) return; for (int i =3D 0; i < ts.length; i++) { @@ -159,7 +160,7 @@ try { f =3D ts[i].getFlags(); } catch (JavaModelException e) { - //ignore + SeamCorePlugin.getPluginLog().logError(e); continue; } if(Flags.isPublic(f)) { Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/scanner/lib/ClassPath.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/scanner/lib/ClassPath.java 2010-05-28 19:17:47 UTC (rev 22416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/scanner/lib/ClassPath.java 2010-05-28 19:40:10 UTC (rev 22417) @@ -286,4 +286,11 @@ processedPaths.clear(); } = + public void build() { + if(update()) { + process(); + } else if(hasToUpdateProjectDependencies()) { + validateProjectDependencies(); + } + } } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/scanner/lib/LibraryScanner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/scanner/lib/LibraryScanner.java 2010-05-28 19:17:47 UTC (rev 2= 2416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/scanner/lib/LibraryScanner.java 2010-05-28 19:40:10 UTC (rev 2= 2417) @@ -11,6 +11,7 @@ package org.jboss.tools.seam.internal.core.scanner.lib; = import java.io.ByteArrayInputStream; +import java.io.IOException; = import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.IPath; @@ -25,6 +26,7 @@ import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader; +import org.eclipse.jdt.internal.compiler.classfmt.ClassFormatException; import org.eclipse.jdt.internal.compiler.env.IBinaryAnnotation; import org.jboss.tools.common.model.XModel; import org.jboss.tools.common.model.XModelObject; @@ -63,42 +65,52 @@ return false; } = + XModelObject o =3D null; + XModel model =3D null; + = public boolean isLikelyComponentSource(IFile f) { - XModel model =3D InnerModelHelper.createXModel(f.getProject()); - if(model =3D=3D null) return false; - XModelObject o =3D EclipseResourceUtil.getObjectByResource(model, f); - if(o =3D=3D null) return false; - if(!o.getModelEntity().getName().equals("FileSystemJar")) { //$NON-NLS-1$ - ((FileSystemsImpl)o.getModel().getByPath("FileSystems")).updateOverlapp= ed(); //$NON-NLS-1$ - o =3D EclipseResourceUtil.getObjectByResource(f); - if(o =3D=3D null || !o.getModelEntity().getName().equals("FileSystemJar= ")) return false; //$NON-NLS-1$ + cleanState(); + boolean isComponent =3D false; + try { + model =3D InnerModelHelper.createXModel(f.getProject()); + if(model !=3D null) { + o =3D EclipseResourceUtil.getObjectByResource(model, f); + if(o !=3D null && o.getModelEntity().getName().equals("FileSystemJar")= ) { + ((FileSystemsImpl)o.getModel().getByPath("FileSystems")).updateOverla= pped(); //$NON-NLS-1$ + o =3D EclipseResourceUtil.getObjectByResource(f); + if(o !=3D null && o.getModelEntity().getName().equals("FileSystemJar"= )) { + isComponent =3D isLikelyComponentSource(o); + } + } + } + } finally { = + if(!isComponent) { + cleanState(); + } } - return isLikelyComponentSource(o); + return isComponent; } = + private void cleanState() { + model =3D null; + o =3D null; + } + public LoadedDeclarations parse(IFile f, ISeamProject sp) throws ScannerE= xception { - XModel model =3D InnerModelHelper.createXModel(f.getProject()); - if(model =3D=3D null) return null; - XModelObject o =3D EclipseResourceUtil.getObjectByResource(model, f); - if(o =3D=3D null) return null; - if(!o.getModelEntity().getName().equals("FileSystemJar")) { //$NON-NLS-1$ - ((FileSystemsImpl)o.getModel().getByPath("FileSystems")).updateOverlapp= ed(); //$NON-NLS-1$ - o =3D EclipseResourceUtil.getObjectByResource(f); - if(o =3D=3D null || !o.getModelEntity().getName().equals("FileSystemJar= ")) return null; //$NON-NLS-1$ + LoadedDeclarations decls =3D null; + if(o!=3Dnull) { + decls =3D parse(o, f.getFullPath(), sp); } - return parse(o, f.getFullPath(), sp); + return decls; } = - public boolean isLikelyComponentSource(XModelObject o) { - if(o =3D=3D null) return false; - if(o.getChildByPath("seam.properties") !=3D null) return true; //$NON-NL= S-1$ - if(o.getChildByPath("META-INF/seam.properties") !=3D null) return true; = //$NON-NLS-1$ - if(o.getChildByPath("META-INF/components.xml") !=3D null) return true; /= /$NON-NLS-1$ - return false; + public static final boolean isLikelyComponentSource(XModelObject o) { + return o.getChildByPath("seam.properties") !=3D null = + || o.getChildByPath("META-INF/seam.properties") !=3D null + || o.getChildByPath("META-INF/components.xml") !=3D null; } = public LoadedDeclarations parse(XModelObject o, IPath path, ISeamProject = sp) throws ScannerException { - if(o =3D=3D null) return null; sourcePath =3D path; XModelObject seamProperties =3D o.getChildByPath("META-INF/seam.properti= es"); //$NON-NLS-1$ if(seamProperties =3D=3D null) seamProperties =3D o.getChildByPath("seam= .properties"); //$NON-NLS-1$ @@ -111,6 +123,10 @@ processJavaClasses(o, ds); } catch (JavaModelException e) { throw new ScannerException(SeamCoreMessages.LIBRARY_SCANNER_CANNOT_PROC= ESS_JAVA_CLASSES, e); + } catch (ClassFormatException e) { + throw new ScannerException(SeamCoreMessages.LIBRARY_SCANNER_CANNOT_PROC= ESS_JAVA_CLASSES, e); + } catch (IOException e) { + throw new ScannerException(SeamCoreMessages.LIBRARY_SCANNER_CANNOT_PROC= ESS_JAVA_CLASSES, e); } = if(componentsXML !=3D null) { @@ -126,25 +142,27 @@ return ds; } = - protected void processJavaClasses(XModelObject o, LoadedDeclarations ds) = throws JavaModelException { + protected void processJavaClasses(XModelObject o, LoadedDeclarations ds) = throws JavaModelException, ClassFormatException, IOException { IJavaProject javaProject =3D JavaCore.create(classPath.getProject().getP= roject()); String location =3D o.getAttributeValue("location"); //$NON-NLS-1$ location =3D XModelObjectUtil.expand(location, o.getModel(), null); = IFile[] fs =3D ModelPlugin.getWorkspace().getRoot().findFilesForLocation= (new Path(location)); IPackageFragmentRoot root =3D null; - if(fs !=3D null) for (int i =3D 0; i < fs.length && root =3D=3D null; i+= +) { - root =3D javaProject.findPackageFragmentRoot(fs[i].getFullPath()); - } - if(root =3D=3D null) { - root =3D javaProject.findPackageFragmentRoot(new Path(location)); - } - if(root =3D=3D null) return; - process(root, ds); - = + if(fs !=3D null) { = + for (int i =3D 0; i < fs.length && root =3D=3D null; i++) { + root =3D javaProject.findPackageFragmentRoot(fs[i].getFullPath()); + } + if(root =3D=3D null) { + root =3D javaProject.findPackageFragmentRoot(new Path(location)); + if(root !=3D null) { + process(root, ds); + } = + } + } = } = - protected void process(IParent element, LoadedDeclarations ds) throws Jav= aModelException { + protected void process(IParent element, LoadedDeclarations ds) throws Jav= aModelException, ClassFormatException, IOException { if(element =3D=3D null) return; IJavaElement[] es =3D element.getChildren(); String prefix =3D null; @@ -171,7 +189,7 @@ } } = - void processWithClassReader(IClassFile typeRoot, LoadedDeclarations ds, S= tring prefix) { + void processWithClassReader(IClassFile typeRoot, LoadedDeclarations ds, S= tring prefix) throws JavaModelException, ClassFormatException, IOException { IType type =3D typeRoot.getType(); = ClassFileReader reader =3D getReader(type, typeRoot); @@ -189,7 +207,7 @@ } } = - String processPackageInfo(IClassFile typeRoot, LoadedDeclarations ds) { + String processPackageInfo(IClassFile typeRoot, LoadedDeclarations ds) thr= ows JavaModelException, ClassFormatException, IOException { IType type =3D typeRoot.getType(); = ClassFileReader reader =3D getReader(type, typeRoot); @@ -218,33 +236,24 @@ } = static IBinaryAnnotation getNamespaceAnnotation(IBinaryAnnotation[] as) { - if(as !=3D null) for (int i =3D 0; i < as.length; i++) { - String type =3D TypeScanner.getTypeName(as[i]); - if(type !=3D null && type.equals(SeamAnnotations.NAMESPACE_ANNOTATION_T= YPE)) { - return as[i]; + if(as !=3D null) { + for (int i =3D 0; i < as.length; i++) { + String type =3D TypeScanner.getTypeName(as[i]); + if(type !=3D null && type.equals(SeamAnnotations.NAMESPACE_ANNOTATION_= TYPE)) { + return as[i]; + } } } return null; } = - private ClassFileReader getReader(IType type, IClassFile typeRoot) { + private ClassFileReader getReader(IType type, IClassFile typeRoot) throws= JavaModelException, ClassFormatException, IOException { String className =3D type.getFullyQualifiedName(); - = + ClassFileReader newReader =3D null; byte[] bs =3D null; = - try { bs =3D typeRoot.getBytes(); - } catch (JavaModelException e) { - return null; - } - = - try { return ClassFileReader.read(new ByteArrayInputStream(bs), className, fa= lse); - } catch (Throwable t) { - //ignore - } - - return null; } = } Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/scanner/xml/PropertiesScanner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/scanner/xml/PropertiesScanner.java 2010-05-28 19:17:47 UTC (re= v 22416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/scanner/xml/PropertiesScanner.java 2010-05-28 19:40:10 UTC (re= v 22417) @@ -43,8 +43,7 @@ * @return */ = public boolean isRelevant(IFile resource) { - if(resource.getName().equals("seam.properties")) return true; //$NON-NLS= -1$ - return false; + return resource.getName().equals("seam.properties"); } = /** @@ -54,9 +53,7 @@ * @return */ public boolean isLikelyComponentSource(IFile f) { - if(!f.isSynchronized(IFile.DEPTH_ZERO) || !f.exists()) return false; - if(f.getName().equals("seam.properties")) return true; //$NON-NLS-1$ - return false; + return f.isSynchronized(IFile.DEPTH_ZERO) && f.exists() && f.getName().e= quals("seam.properties"); } = /** @@ -67,53 +64,55 @@ */ public LoadedDeclarations parse(IFile f, ISeamProject sp) throws ScannerE= xception { XModel model =3D InnerModelHelper.createXModel(f.getProject()); - if(model =3D=3D null) return null; XModelObject o =3D EclipseResourceUtil.getObjectByResource(model, f); return parse(o, f.getFullPath()); } = public LoadedDeclarations parse(XModelObject o, IPath source) { - if(o =3D=3D null) return null; + LoadedDeclarations ds =3D null; + = + if(o !=3D null) { = - if(o.getParent() instanceof FolderImpl) { - IFile f =3D ResourcesPlugin.getWorkspace().getRoot().getFile(source); - if(f !=3D null && f.exists()) { - try { - ((FolderImpl)o.getParent()).updateChildFile(o, f.getLocation().toFile= ()); - } catch (XModelException e) { - ModelPlugin.getPluginLog().logError(e); + if(o.getParent() instanceof FolderImpl) { + IFile f =3D ResourcesPlugin.getWorkspace().getRoot().getFile(source); + if(f !=3D null && f.exists()) { + try { + ((FolderImpl)o.getParent()).updateChildFile(o, f.getLocation().toFil= e()); + } catch (XModelException e) { + ModelPlugin.getPluginLog().logError(e); + } } } - } - = - LoadedDeclarations ds =3D new LoadedDeclarations(); - - XModelObject[] properties =3D o.getChildren(); - Map ds1 =3D new HashMap(); - for (int i =3D 0; i < properties.length; i++) { - String name =3D properties[i].getAttributeValue("name"); //$NON-NLS-1$ - int q =3D name.lastIndexOf('.'); - if(q < 0) continue; - String componentName =3D name.substring(0, q); - String propertyName =3D name.substring(q + 1); - SeamPropertiesDeclaration d =3D ds1.get(componentName); - if(d =3D=3D null) { - d =3D new SeamPropertiesDeclaration(); - d.setId(properties[i]); - d.setSourcePath(source); - d.setName(componentName); - ds1.put(componentName, d); + = + ds =3D new LoadedDeclarations(); + = + XModelObject[] properties =3D o.getChildren(); + Map ds1 =3D new HashMap(); + for (int i =3D 0; i < properties.length; i++) { + String name =3D properties[i].getAttributeValue("name"); //$NON-NLS-1$ + int q =3D name.lastIndexOf('.'); + if(q < 0) continue; + String componentName =3D name.substring(0, q); + String propertyName =3D name.substring(q + 1); + SeamPropertiesDeclaration d =3D ds1.get(componentName); + if(d =3D=3D null) { + d =3D new SeamPropertiesDeclaration(); + d.setId(properties[i]); + d.setSourcePath(source); + d.setName(componentName); + ds1.put(componentName, d); + } + SeamProperty p =3D new SeamProperty(); + p.setId(properties[i]); + p.setName(new XMLValueInfo(properties[i], "name")); //$NON-NLS-1$ + p.setName(propertyName); + SeamValueString v =3D new SeamValueString(); + v.setValue(new XMLValueInfo(properties[i], "value")); //$NON-NLS-1$ + p.setValue(v); + d.addProperty(p); } - SeamProperty p =3D new SeamProperty(); - p.setId(properties[i]); - p.setName(new XMLValueInfo(properties[i], "name")); //$NON-NLS-1$ - p.setName(propertyName); - SeamValueString v =3D new SeamValueString(); - v.setValue(new XMLValueInfo(properties[i], "value")); //$NON-NLS-1$ - p.setValue(v); - d.addProperty(p); + ds.getComponents().addAll(ds1.values()); } - ds.getComponents().addAll(ds1.values()); return ds; } = Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/= seam/internal/core/scanner/xml/XMLScanner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/scanner/xml/XMLScanner.java 2010-05-28 19:17:47 UTC (rev 22416) +++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/i= nternal/core/scanner/xml/XMLScanner.java 2010-05-28 19:40:10 UTC (rev 22417) @@ -58,6 +58,9 @@ */ public class XMLScanner implements IFileScanner { = + private XModel model; + private XModelObject o; + public XMLScanner() {} = /** @@ -67,9 +70,7 @@ * @return */ = public boolean isRelevant(IFile resource) { - if(resource.getName().equals("components.xml")) return true; //$NON-NLS-= 1$ - if(resource.getName().endsWith(".component.xml")) return true; //$NON-NL= S-1$ - return false; + return resource.getName().equals("components.xml") || resource.getName()= .endsWith(".component.xml"); } = /** @@ -79,15 +80,28 @@ * @return */ public boolean isLikelyComponentSource(IFile f) { - if(!f.isSynchronized(IFile.DEPTH_ZERO) || !f.exists()) return false; - XModel model =3D InnerModelHelper.createXModel(f.getProject()); - if(model =3D=3D null) return false; - XModelObject o =3D EclipseResourceUtil.getObjectByResource(model, f); - if(o =3D=3D null) return false; - if(o.getModelEntity().getName().startsWith("FileSeamComponent")) return = true; //$NON-NLS-1$ - return false; + cleanState(); + boolean isComponentSource =3D false; + if(f.isSynchronized(IFile.DEPTH_ZERO) && f.exists()) { + model =3D InnerModelHelper.createXModel(f.getProject()); + if(model !=3D null) { + o =3D EclipseResourceUtil.getObjectByResource(model, f); + if(o !=3D null) { + isComponentSource =3D o.getModelEntity().getName().startsWith("FileSe= amComponent"); //$NON-NLS-1$ + } + } + } + if(!isComponentSource) { + cleanState(); + } + return isComponentSource; } = + private void cleanState() { + model =3D null; + o =3D null; + } + = /** * Returns list of components * @param f @@ -95,9 +109,8 @@ * @throws ScannerException */ public LoadedDeclarations parse(IFile f, ISeamProject sp) throws ScannerE= xception { - XModel model =3D InnerModelHelper.createXModel(f.getProject()); - if(model =3D=3D null) return null; - XModelObject o =3D EclipseResourceUtil.getObjectByResource(model, f); + model =3D InnerModelHelper.createXModel(f.getProject()); + o =3D EclipseResourceUtil.getObjectByResource(model, f); return parse(o, f.getFullPath(), sp); } = @@ -121,8 +134,6 @@ } = public LoadedDeclarations parse(XModelObject o, IPath source, ISeamProjec= t sp) { - if(o =3D=3D null) return null; - NamespaceMapping nm =3D NamespaceMapping.load(o); = if(o.getParent() instanceof FolderImpl) { Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/too= ls/seam/core/test/ScannerTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/ScannerTest.java 2010-05-28 19:17:47 UTC (rev 22416) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/ScannerTest.java 2010-05-28 19:40:10 UTC (rev 22417) @@ -88,7 +88,7 @@ IFile f =3D project.getFile("WebContent/WEB-INF/components.xml"); assertTrue("Cannot find components.xml in test project", f !=3D null && = f.exists()); = - IFileScanner scanner =3D SeamCoreBuilder.getXMLScanner(); + IFileScanner scanner =3D SeamCoreBuilder.createXMLScanner(); assertTrue("Scanner cannot recognise components.xml", scanner.isRelevant= (f)); assertTrue("Scanner cannot recognise components.xml content", scanner.is= LikelyComponentSource(f)); ISeamComponentDeclaration[] cs =3D null; @@ -206,7 +206,7 @@ IFile f =3D project.getFile("JavaSource/demo/User.java"); assertTrue("Cannot find User.java in test project", f !=3D null && f.exi= sts()); = - IFileScanner scanner =3D SeamCoreBuilder.getJavaScanner(); + IFileScanner scanner =3D SeamCoreBuilder.createJavaScanner(); assertTrue("Scanner cannot recognise User.java", scanner.isRelevant(f)); assertTrue("Scanner cannot recognise User.java content", scanner.isLikel= yComponentSource(f)); ISeamComponentDeclaration[] cs =3D null; @@ -291,7 +291,7 @@ IFile f =3D project.getFile("WebContent/WEB-INF/lib/jboss-seam.jar"); assertTrue("Cannot find User.java in test project", f !=3D null && f.exi= sts()); = - LibraryScanner scanner =3D(LibraryScanner)SeamCoreBuilder.getLibraryScan= ner(); + LibraryScanner scanner =3D(LibraryScanner)SeamCoreBuilder.createLibraryS= canner(); ClassPath cp =3D ((SeamProject)seamProject).getClassPath(); scanner.setClassPath(cp); cp.update(); Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/too= ls/seam/core/test/SeamBigProjectTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/SeamBigProjectTest.java 2010-05-28 19:17:47 UTC (rev 22416) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/SeamBigProjectTest.java 2010-05-28 19:40:10 UTC (rev 22417) @@ -79,7 +79,7 @@ return new File(location); } = - public void testBigProject() { + public void testBigProject() throws IOException { ISeamProject sp =3D getSeamProject(); ISeamComponent[] cs =3D sp.getComponents(); int components =3D cs.length; @@ -88,6 +88,7 @@ } SeamProject impl =3D (SeamProject)sp; System.out.println("Full build of " + components + " components complete= d in " + impl.fullBuildTime + "ms"); + impl.store(); long time =3D impl.reload(); System.out.println("Reloaded " + sp.getComponents().length + " component= s in " + time + "ms"); List statistics =3D impl.statistics; Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/too= ls/seam/core/test/project/facet/AbstractSeamFacetTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/project/facet/AbstractSeamFacetTest.java 2010-05-28 19:17:47 UT= C (rev 22416) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/project/facet/AbstractSeamFacetTest.java 2010-05-28 19:40:10 UT= C (rev 22417) @@ -108,10 +108,8 @@ return SEAM_EAP_121_HOME_PROPERY; } = - protected void tearDown() + protected void tearDown() throws Exception = - throws Exception - { = // Wait until all jobs is finished to avoid delete project problems Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/too= ls/seam/core/test/project/facet/Seam2FacetInstallDelegateTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2010-05-28 19:= 17:47 UTC (rev 22416) +++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/sea= m/core/test/project/facet/Seam2FacetInstallDelegateTest.java 2010-05-28 19:= 40:10 UTC (rev 22417) @@ -64,8 +64,6 @@ // ws.removeResourceChangeListener( ValManager.getDefault() ); // EventManager.getManager().shutdown(); = - suspendXJobs =3D XJob.isSuspended(); - XJob.setSuspended(true); assertSeamHomeAvailable(); = seam2Facet =3D ProjectFacetsManager.getProjectFacet("jst.seam"); @@ -94,7 +92,6 @@ super.tearDown(); ValidationFramework.getDefault().suspendAllValidation( suspendAllValidation); - XJob.setSuspended(suspendXJobs); = ResourcesPlugin.getWorkspace().addResourceChangeListener( EventManager.getManager(), --===============6233339067148894665==-- From jbosstools-commits at lists.jboss.org Fri May 28 16:11:39 2010 Content-Type: multipart/mixed; boundary="===============2860258222046800984==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22418 - trunk/seam/tests/org.jboss.tools.seam.ui.test/projects. Date: Fri, 28 May 2010 16:11:39 -0400 Message-ID: <201005282011.o4SKBdZm026754@svn01.web.mwc.hst.phx2.redhat.com> --===============2860258222046800984== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-28 16:11:39 -0400 (Fri, 28 May 2010) New Revision: 22418 Added: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/numberguess/ Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests test project for el partitioning moved to seam.ui.test to fix test error Copied: trunk/seam/tests/org.jboss.tools.seam.ui.test/projects/numberguess = (from rev 22417, trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects= /numberguess) --===============2860258222046800984==-- From jbosstools-commits at lists.jboss.org Fri May 28 16:18:43 2010 Content-Type: multipart/mixed; boundary="===============4909146918468284338==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22419 - trunk. Date: Fri, 28 May 2010 16:18:43 -0400 Message-ID: <201005282018.o4SKIhdq027304@svn01.web.mwc.hst.phx2.redhat.com> --===============4909146918468284338== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-28 16:18:43 -0400 (Fri, 28 May 2010) New Revision: 22419 Modified: trunk/parent-pom.xml Log: add wtp helios site Modified: trunk/parent-pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/parent-pom.xml 2010-05-28 20:11:39 UTC (rev 22418) +++ trunk/parent-pom.xml 2010-05-28 20:18:43 UTC (rev 22419) @@ -168,8 +168,8 @@ = - + hudson @@ -184,7 +184,8 @@ maven-osgi-packaging-plugin ${tychoVersion} - 'v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}-${BUILD_ALIAS}' + 'v'yyyyMMdd-HHmm'-H${BUILD_NUMBER}-${BUILD_ALIAS}' + true @@ -211,6 +212,17 @@ + webtools32 + http://download.eclipse.org/webtools/repository/helios + p2 + + true + + + true + + + eclipse36 http://download.eclipse.org/eclipse/updates/3.6/ p2 --===============4909146918468284338==-- From jbosstools-commits at lists.jboss.org Fri May 28 16:37:34 2010 Content-Type: multipart/mixed; boundary="===============8273319135609373333==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22420 - trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search. Date: Fri, 28 May 2010 16:37:34 -0400 Message-ID: <201005282037.o4SKbYCU029883@svn01.web.mwc.hst.phx2.redhat.com> --===============8273319135609373333== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dazarov Date: 2010-05-28 16:37:34 -0400 (Fri, 28 May 2010) New Revision: 22420 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/sear= ch/InjectionPointQueryParticipant.java Log: https://jira.jboss.org/browse/JBIDE-6386 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/= ui/search/InjectionPointQueryParticipant.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/sea= rch/InjectionPointQueryParticipant.java 2010-05-28 20:18:43 UTC (rev 22419) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/sea= rch/InjectionPointQueryParticipant.java 2010-05-28 20:37:34 UTC (rev 22420) @@ -80,7 +80,7 @@ IAnnotation annotation =3D annotatable.getAnnotation(CDIConstants.INJ= ECT_ANNOTATION_TYPE_NAME); if (annotation =3D=3D null) return; - IInjectionPoint injectionPoint =3D CDIUtil.findInjectionPoint(beans, = element); + IInjectionPoint injectionPoint =3D CDIUtil.findInjectionPoint(beans, = element, 0); if(injectionPoint !=3D null){ Set resultBeanSet =3D cdiProject.getBeans(injectionPoint); List resultBeanList =3D CDIUtil.sortBeans(resultBeanSet); --===============8273319135609373333==-- From jbosstools-commits at lists.jboss.org Fri May 28 16:44:34 2010 Content-Type: multipart/mixed; boundary="===============7974577181169008265==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22421 - trunk/jmx/releng/psfs. Date: Fri, 28 May 2010 16:44:33 -0400 Message-ID: <201005282044.o4SKiX2w030364@svn01.web.mwc.hst.phx2.redhat.com> --===============7974577181169008265== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-28 16:44:33 -0400 (Fri, 28 May 2010) New Revision: 22421 Modified: trunk/jmx/releng/psfs/project.subclipse.psf trunk/jmx/releng/psfs/project.subversive.psf Log: remove interative test Modified: trunk/jmx/releng/psfs/project.subclipse.psf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/releng/psfs/project.subclipse.psf 2010-05-28 20:37:34 UTC (re= v 22420) +++ trunk/jmx/releng/psfs/project.subclipse.psf 2010-05-28 20:44:33 UTC (re= v 22421) @@ -9,6 +9,5 @@ - Modified: trunk/jmx/releng/psfs/project.subversive.psf =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/releng/psfs/project.subversive.psf 2010-05-28 20:37:34 UTC (r= ev 22420) +++ trunk/jmx/releng/psfs/project.subversive.psf 2010-05-28 20:44:33 UTC (r= ev 22421) @@ -9,6 +9,5 @@ - --===============7974577181169008265==-- From jbosstools-commits at lists.jboss.org Fri May 28 16:44:53 2010 Content-Type: multipart/mixed; boundary="===============3725065741759889812==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22422 - trunk/jmx/releng/maps. Date: Fri, 28 May 2010 16:44:53 -0400 Message-ID: <201005282044.o4SKir0A030375@svn01.web.mwc.hst.phx2.redhat.com> --===============3725065741759889812== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-28 16:44:53 -0400 (Fri, 28 May 2010) New Revision: 22422 Modified: trunk/jmx/releng/maps/project.map Log: remove interative test Modified: trunk/jmx/releng/maps/project.map =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/releng/maps/project.map 2010-05-28 20:44:33 UTC (rev 22421) +++ trunk/jmx/releng/maps/project.map 2010-05-28 20:44:53 UTC (rev 22422) @@ -6,4 +6,3 @@ plugin(a)org.jboss.tools.jmx.ui=3DSVN,,http://anonsvn.jboss.org/repos,,jbo= sstools/trunk/jmx/plugins/org.jboss.tools.jmx.ui plugin(a)org.jboss.tools.jmx.core.test=3DSVN,,http://anonsvn.jboss.org/rep= os,,jbosstools/trunk/jmx/tests/org.jboss.tools.jmx.core.test plugin(a)org.jboss.tools.jmx.ui.test=3DSVN,,http://anonsvn.jboss.org/repos= ,,jbosstools/trunk/jmx/tests/org.jboss.tools.jmx.ui.test -plugin(a)org.jboss.tools.jmx.ui.test.interactive=3DSVN,,http://anonsvn.jbo= ss.org/repos,,jbosstools/trunk/jmx/tests/org.jboss.tools.jmx.ui.test.intera= ctive --===============3725065741759889812==-- From jbosstools-commits at lists.jboss.org Fri May 28 17:52:36 2010 Content-Type: multipart/mixed; boundary="===============7159644460682353608==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22423 - in trunk/jst: tests/org.jboss.tools.jst.jsp.test/projects and 8 other directories. Date: Fri, 28 May 2010 17:52:36 -0400 Message-ID: <201005282152.o4SLqaw4012002@svn01.web.mwc.hst.phx2.redhat.com> --===============7159644460682353608== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-28 17:52:35 -0400 (Fri, 28 May 2010) New Revision: 22423 Removed: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForCompositeComp= onentTest/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForELinStyleTest/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/CAForIDTest/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide2016Test/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1807Tes= t/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJspJbide1813Tes= t/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/MissingKBBuilderTe= st/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/StrutsJbide1648Tes= t/ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp= /test/ca/CAForCompositeComponentTest.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp= /test/ca/CAForELinStyleTest.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp= /test/ca/CAForIDTest.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp= /test/ca/CAForUnclosedELTest.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp= /test/ca/JsfJspJbide1807Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp= /test/ca/JsfJspJbide1813Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp= /test/ca/JsfJspJbide2016Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp= /test/ca/JsfJspJbide2437Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp= /test/ca/JstJspJbide1759Test.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp= /test/ca/MissingKBBuilderTest.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp= /test/ca/StrutsJspJbide1648Test.java trunk/jst/tests/org.jboss.tools.jst.text.ext.test/projects/ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/js= t/text/ext/test/OpenOnsTest.java trunk/jst/tests/org.jboss.tools.jst.web.test/projects/TestsWebArtefacts/ Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web= /kb/internal/scanner/LibraryScanner.java trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web= /kb/internal/scanner/XMLScanner.java trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp= /test/JstJspAllTests.java trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/js= t/text/ext/test/JsfExtAllTests.java trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web= /test/JstWebAllTests.java trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web= /test/WebContentAssistProviderTest.java trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.eclipse.jd= t.core.prefs trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests jst component tests fix: - tests that requires jsf moved to jsf - manifest errors fixed Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/= jst/web/kb/internal/scanner/LibraryScanner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/internal/scanner/LibraryScanner.java 2010-05-28 20:44:53 UTC (rev 2242= 2) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/internal/scanner/LibraryScanner.java 2010-05-28 21:52:35 UTC (rev 2242= 3) @@ -24,52 +24,63 @@ * @author Viacheslav Kabanovich */ public class LibraryScanner implements IFileScanner { + = + public static final String FILE_SYSTEMS_PATH =3D "FileSystems"; //$NON-NL= S-1$ + public static final String FILE_SYSTEM_JAR_PATH =3D "FileSystemJar"; //$N= ON-NLS-1$ + public static final String META_INF_PATH =3D "META-INF"; //$NON-NLS-1$ + = + public static final String JAR_SUFFIX =3D ".jar"; //$NON-NLS-1$ + public static final String ZIP_SUFFIX =3D ".zip"; //$NON-NLS-1$ + = //Now it is absolute file on disk IPath sourcePath =3D null; = public LibraryScanner() {} = public boolean isRelevant(IFile f) { - if(EclipseResourceUtil.isJar(f.getName())) return true; - return false; + String name =3D f.getName().toLowerCase(); + return name.endsWith(JAR_SUFFIX) || name.endsWith(ZIP_SUFFIX); } = public boolean isLikelyComponentSource(IFile f) { XModel model =3D InnerModelHelper.createXModel(f.getProject()); - if(model =3D=3D null) return false; - XModelObject o =3D EclipseResourceUtil.getObjectByResource(model, f); - if(o =3D=3D null) return false; - if(!o.getModelEntity().getName().equals("FileSystemJar")) { //$NON-NLS-1$ - ((FileSystemsImpl)o.getModel().getByPath("FileSystems")).updateOverlapp= ed(); //$NON-NLS-1$ - o =3D EclipseResourceUtil.getObjectByResource(f); - if(o =3D=3D null || !o.getModelEntity().getName().equals("FileSystemJar= ")) return false; //$NON-NLS-1$ + boolean result =3D false; + if(model !=3D null) { + XModelObject o =3D EclipseResourceUtil.getObjectByResource(model, f); + if(o !=3D null) { + if(o.getModelEntity().getName().equals(FILE_SYSTEM_JAR_PATH)) { + result =3D isLikelyComponentSource(o); + } else { + ((FileSystemsImpl)o.getModel().getByPath(FILE_SYSTEMS_PATH)).updateOv= erlapped(); + o =3D EclipseResourceUtil.getObjectByResource(f); + result =3D o !=3D null && o.getModelEntity().getName().equals(FILE_SY= STEM_JAR_PATH); + } + } } - return isLikelyComponentSource(o); + return result; } = public LoadedDeclarations parse(IFile f, IKbProject sp) throws ScannerExc= eption { XModel model =3D InnerModelHelper.createXModel(f.getProject()); - if(model =3D=3D null) return null; XModelObject o =3D EclipseResourceUtil.getObjectByResource(model, f); - if(o =3D=3D null) return null; - if(!o.getModelEntity().getName().equals("FileSystemJar")) { //$NON-NLS-1$ - ((FileSystemsImpl)o.getModel().getByPath("FileSystems")).updateOverlapp= ed(); //$NON-NLS-1$ + if(!o.getModelEntity().getName().equals(FILE_SYSTEM_JAR_PATH)) { + ((FileSystemsImpl)o.getModel().getByPath(FILE_SYSTEMS_PATH)).updateOver= lapped(); o =3D EclipseResourceUtil.getObjectByResource(f); - if(o =3D=3D null || !o.getModelEntity().getName().equals("FileSystemJar= ")) return null; //$NON-NLS-1$ + if(o =3D=3D null || !o.getModelEntity().getName().equals(FILE_SYSTEM_JA= R_PATH)) return null; } return parse(o, f.getFullPath(), sp); } = public boolean isLikelyComponentSource(XModelObject o) { if(o =3D=3D null) return false; - if(o.getChildByPath("META-INF") !=3D null) return true; //$NON-NLS-1$ + if(o.getChildByPath(META_INF_PATH) !=3D null) return true; return false; } = public LoadedDeclarations parse(XModelObject o, IPath path, IKbProject sp= ) throws ScannerException { if(o =3D=3D null) return null; sourcePath =3D path; - XModelObject metaInf =3D o.getChildByPath("META-INF"); //$NON-NLS-1$ + XModelObject metaInf =3D o.getChildByPath(META_INF_PATH); if(metaInf =3D=3D null) return null; = LoadedDeclarations ds =3D new LoadedDeclarations(); @@ -107,9 +118,6 @@ XMLScanner s =3D new XMLScanner(); = LoadedDeclarations ds1 =3D s.parse(tld, path, sp); ds =3D add(ds, ds1); - if(ds1 !=3D null && !ds1.isEmpty()) { - System.out.println(tld.getPath() + ":" + ds1.getLibraries().get(0).ge= tURI()); - } } else if(tld.getFileType() =3D=3D XModelObject.FOLDER) { LoadedDeclarations ds1 =3D parseInPackages(tld, path, sp); ds =3D add(ds, ds1); @@ -148,7 +156,7 @@ public static boolean isCompositeComponentFile(XModelObject o) { if(o =3D=3D null) return false; String entity =3D o.getModelEntity().getName(); - if(entity.startsWith(JSF2ResourcesScanner.ENT_COMPOSITE_COMPONENT)) retu= rn true; //$NON-NLS-1$ + if(entity.startsWith(JSF2ResourcesScanner.ENT_COMPOSITE_COMPONENT)) retu= rn true; return false; } = Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/= jst/web/kb/internal/scanner/XMLScanner.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/internal/scanner/XMLScanner.java 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/we= b/kb/internal/scanner/XMLScanner.java 2010-05-28 21:52:35 UTC (rev 22423) @@ -52,6 +52,9 @@ public static final String ATTR_FUNC_NAME =3D "function-name"; //$NON-NLS= -1$ public static final String ATTR_COMPONENT_TYPE =3D "component-type"; //$N= ON-NLS-1$ = + public static final String XML_SUFFIX =3D ".xml"; + public static final String TLD_SUFFIX =3D ".tld"; = + = public XMLScanner() {} = /** @@ -61,9 +64,8 @@ * @return */ = public boolean isRelevant(IFile resource) { - if(resource.getName().endsWith(".xml")) return true; //$NON-NLS-1$ - if(resource.getName().endsWith(".tld")) return true; //$NON-NLS-1$ - return false; + String name =3D resource.getName().toLowerCase(); + return name.endsWith(XML_SUFFIX) || name.endsWith(TLD_SUFFIX); //$NON-NL= S-1$ //$NON-NLS-2$ } = /** Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/= jst/jsp/test/JstJspAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/JstJspAllTests.java 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/JstJspAllTests.java 2010-05-28 21:52:35 UTC (rev 22423) @@ -3,45 +3,23 @@ import junit.framework.Test; import junit.framework.TestSuite; = -import org.jboss.tools.jst.jsp.test.ca.CAForCompositeComponentTest; -import org.jboss.tools.jst.jsp.test.ca.CAForELinStyleTest; -import org.jboss.tools.jst.jsp.test.ca.CAForIDTest; -import org.jboss.tools.jst.jsp.test.ca.CAForUnclosedELTest; import org.jboss.tools.jst.jsp.test.ca.Jbide1791Test; import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1704Test; import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1717Test; -import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1807Test; -import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1813Test; -import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide2016Test; -import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide2437Test; import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1585Test; import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1641Test; -import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1759Test; -import org.jboss.tools.jst.jsp.test.ca.MissingKBBuilderTest; -import org.jboss.tools.jst.jsp.test.ca.StrutsJspJbide1648Test; = public class JstJspAllTests { = public static Test suite() { TestSuite suite =3D new TestSuite("Test for org.jboss.tools.jst.jsp.test= "); - suite.addTestSuite(CAForUnclosedELTest.class); - suite.addTestSuite(CAForCompositeComponentTest.class); - suite.addTestSuite(MissingKBBuilderTest.class); - suite.addTestSuite(JsfJspJbide1807Test.class); - suite.addTestSuite(CAForIDTest.class); - suite.addTestSuite(JsfJspJbide1813Test.class); suite.addTestSuite(JstJspJbide1585Test.class); - suite.addTestSuite(StrutsJspJbide1648Test.class); suite.addTestSuite(JstJspJbide1641Test.class); suite.addTestSuite(JsfJspJbide1704Test.class); suite.addTestSuite(JsfJspJbide1717Test.class); - suite.addTestSuite(JstJspJbide1759Test.class); suite.addTestSuite(Jbide1791Test.class); - suite.addTestSuite(JsfJspJbide2437Test.class); suite.addTestSuite(JspPreferencesPageTest.class); - suite.addTestSuite(JsfJspJbide2016Test.class); - suite.addTestSuite(CAForELinStyleTest.class); - = + = return suite; } = Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/j= st/jsp/test/ca/CAForCompositeComponentTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/CAForCompositeComponentTest.java 2010-05-28 20:44:53 UTC (rev 224= 22) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/CAForCompositeComponentTest.java 2010-05-28 21:52:35 UTC (rev 224= 23) @@ -1,47 +0,0 @@ -package org.jboss.tools.jst.jsp.test.ca; - -import org.jboss.tools.test.util.TestProjectProvider; - -public class CAForCompositeComponentTest extends ContentAssistantTestCase{ - TestProjectProvider provider =3D null; - boolean makeCopy =3D true; - private static final String PROJECT_NAME =3D "CAForCompositeComponentTest= "; - private static final String PAGE_NAME =3D "/WebContent/pages/greeting.xht= ml"; - private static final String TAG_NAME =3D "/WebContent/resources/sample/ta= g2.xhtml"; - = - public void setUp() throws Exception { - provider =3D new TestProjectProvider("org.jboss.tools.jst.jsp.test", nul= l, PROJECT_NAME, makeCopy); = - project =3D provider.getProject(); - } - - protected void tearDown() throws Exception { - if(provider !=3D null) { - provider.dispose(); - } - } - = - public void testCAForCompositeComponent(){ - String[] proposals =3D { - "sample:tag", "sample:tag2", "sample:tag3" - }; - - checkProposals(PAGE_NAME, "", 8, proposals, false); - - proposals =3D new String[]{ - "aaa" - }; - checkProposals(PAGE_NAME, "", 12, proposals, false); - } - - /** - * JBIDE-5941 - */ - public void testCAForCCAttrs(){ - String[] proposals =3D { - "cc.attrs.a2", "cc.attrs.b3", "cc.attrs.onclick" - }; - - checkProposals(TAG_NAME, "#{cc.attrs.}", 11, proposals, false); - - } -} Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/j= st/jsp/test/ca/CAForELinStyleTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/CAForELinStyleTest.java 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/CAForELinStyleTest.java 2010-05-28 21:52:35 UTC (rev 22423) @@ -1,29 +0,0 @@ -package org.jboss.tools.jst.jsp.test.ca; - -import org.jboss.tools.test.util.TestProjectProvider; - -public class CAForELinStyleTest extends ContentAssistantTestCase{ - TestProjectProvider provider =3D null; - boolean makeCopy =3D false; - private static final String PROJECT_NAME =3D "CAForELinStyleTest"; - private static final String PAGE_NAME =3D "/WebContent/pages/greeting.xht= ml"; - = - public void setUp() throws Exception { - provider =3D new TestProjectProvider("org.jboss.tools.jst.jsp.test", nul= l, PROJECT_NAME, makeCopy); = - project =3D provider.getProject(); - } - - protected void tearDown() throws Exception { - if(provider !=3D null) { - provider.dispose(); - } - } - = - public void testCAForELinStyleTest(){ - String[] proposals =3D { - "person", - }; - - checkProposals(PAGE_NAME, "background-color:#{}", 19, proposals, false); - } -} \ No newline at end of file Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/j= st/jsp/test/ca/CAForIDTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/CAForIDTest.java 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/CAForIDTest.java 2010-05-28 21:52:35 UTC (rev 22423) @@ -1,45 +0,0 @@ -package org.jboss.tools.jst.jsp.test.ca; - -import org.jboss.tools.test.util.TestProjectProvider; - -public class CAForIDTest extends ContentAssistantTestCase{ - TestProjectProvider provider =3D null; - boolean makeCopy =3D true; - private static final String PROJECT_NAME =3D "CAForIDTest"; - private static final String PAGE_NAME =3D "/WebContent/pages/inputUserNam= e.jsp"; - = - public void setUp() throws Exception { - provider =3D new TestProjectProvider("org.jboss.tools.jst.jsp.test", nul= l, PROJECT_NAME, makeCopy); = - project =3D provider.getProject(); - } - - protected void tearDown() throws Exception { - if(provider !=3D null) { - provider.dispose(); - } - } - = - public void testCAForIDTest(){ - String[] proposals =3D { - "greetingForm", - }; - - checkProposals(PAGE_NAME, "", 26, propo= sals, false, false); - } - - public void testCAForConverterIDTest(){ - String[] proposals =3D { - "converter1", - }; - - checkProposals(PAGE_NAME, "", 61, proposals, false, false); - } - - public void testCAForValidatorIDTest(){ - String[] proposals =3D { - "validator1", - }; - - checkProposals(PAGE_NAME, "", 26, prop= osals, false, false); - } -} \ No newline at end of file Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/j= st/jsp/test/ca/CAForUnclosedELTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/CAForUnclosedELTest.java 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/CAForUnclosedELTest.java 2010-05-28 21:52:35 UTC (rev 22423) @@ -1,30 +0,0 @@ -package org.jboss.tools.jst.jsp.test.ca; - -import org.jboss.tools.test.util.TestProjectProvider; - -public class CAForUnclosedELTest extends ContentAssistantTestCase{ - TestProjectProvider provider =3D null; - boolean makeCopy =3D false; - private static final String PROJECT_NAME =3D "CAForELinStyleTest"; - private static final String PAGE_NAME =3D "/WebContent/pages/greeting.xht= ml"; - = - public void setUp() throws Exception { - provider =3D new TestProjectProvider("org.jboss.tools.jst.jsp.test", nul= l, PROJECT_NAME, makeCopy); = - project =3D provider.getProject(); - } - - protected void tearDown() throws Exception { - if(provider !=3D null) { - provider.dispose(); - } - } - = - public void testCAForUnclosedELTest(){ - String[] proposals =3D { - "person", - }; - - checkProposals(PAGE_NAME, "Greeting Pag= e#{ ", 46, proposals, false); - } -} \ No newline at end of file Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/j= st/jsp/test/ca/JsfJspJbide1807Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/JsfJspJbide1807Test.java 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/JsfJspJbide1807Test.java 2010-05-28 21:52:35 UTC (rev 22423) @@ -1,35 +0,0 @@ -package org.jboss.tools.jst.jsp.test.ca; - -import org.jboss.tools.test.util.TestProjectProvider; - -public class JsfJspJbide1807Test extends ContentAssistantTestCase{ - TestProjectProvider provider =3D null; - boolean makeCopy =3D true; - private static final String PROJECT_NAME =3D "JsfJspJbide1807Test"; - private static final String PAGE_NAME =3D "/WebContent/pages/greeting.xht= ml"; - = - public void setUp() throws Exception { - provider =3D new TestProjectProvider("org.jboss.tools.jst.jsp.test", nul= l, PROJECT_NAME, makeCopy); = - project =3D provider.getProject(); - } - - protected void tearDown() throws Exception { - if(provider !=3D null) { - provider.dispose(); - } - } - = - public void testJsfJspJbide1807Test(){ - = - // JBIDE-4341: the EL proposals are not to be returned (and tested) here= anymore. - // - The EL-proposals are removed from the test-list. - // - The "/pages" proposal is added as the main case to test = - String[] proposals=3D{ - "/pages/", - "/templates/", - "#{}" - }; - - checkProposals(PAGE_NAME, ""; - private static final String WHITESPACE_INSERTION_STRING =3D ""; - = - public static Test suite() { - return new TestSuite(JstJspJbide1759Test.class); - } - - public void setUp() throws Exception { - provider =3D new TestProjectProvider("org.jboss.tools.jst.jsp.test", nul= l, PROJECT_NAME, makeCopy); = - project =3D provider.getProject(); - } - - protected void tearDown() throws Exception { - if(provider !=3D null) { - provider.dispose(); - } - } - - public void testJstJspJbide1759() { - try { - JobUtils.waitForIdle(); - } catch (Exception e) { - e.printStackTrace(); - } = - assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (proje= ct !=3D null)); - - for (int i =3D 0; i < PAGE_EXTS.length; i++) { - testJstJspJbide1759(PAGE_NAME + PAGE_EXTS[i]); - } - } - = - private void testJstJspJbide1759(String pageName) { - = - openEditor(pageName); - - // Find start of tag - String documentContent =3D document.get(); - int start =3D (documentContent =3D=3D null ? -1 : documentContent.indexO= f(INSERT_BEFORE_STRING)); - - assertTrue("Cannot find the starting point in the test file \"" + pageN= ame + "\"", (start !=3D -1)); - = - // First of all perform the test on a region placed in one space behind = empty-valued attribute - = - // this is to return normal list of attribute names proposal list = - = - String documentContentModified =3D documentContent.substring(0, start) + - INSERTION_BEGIN_STRING + WHITESPACE_INSERTION_STRING + INSERTION_END_ST= RING + documentContent.substring(start); - = - int offsetToTest =3D start + INSERTION_BEGIN_STRING.length(); - - - jspTextEditor.setText(documentContentModified); - = - ICompletionProposal[] result=3D null; - String errorMessage =3D null; - - IContentAssistProcessor p=3D TestUtil.getProcessor(viewer, offsetToTest,= contentAssistant); - if (p !=3D null) { - try { - result=3D p.computeCompletionProposals(viewer, offsetToTest); - } catch (Throwable x) { - x.printStackTrace(); - } - errorMessage=3D p.getErrorMessage(); - } - = - - List customCompletionProposals =3D new ArrayList(); - for (int i =3D 0; i < result.length; i++) { - // There should be at least one proposal of type CustomCompletionPropos= al in the result - if (result[i] instanceof CustomCompletionProposal) { - customCompletionProposals.add(((CustomCompletionProposal)result[i]).ge= tReplacementString()); - } - } - assertFalse("Content Assistant returned no proposals of type CustomCompl= etionProposal.",customCompletionProposals.isEmpty()); - - try { - JobUtils.waitForIdle(); - } catch (Exception e) { - e.printStackTrace(); - assertTrue("Waiting for the jobs to complete has failed.", false); - } = - - // Next perform the test on a region placed in one space behind an attri= bute those value is a container - // (contains JSF expression) - this has to return the same normal list o= f attribute names proposal list as - // we got at the first step (because the tag is the same, but only the a= ttribute value is changed) = - = - documentContentModified =3D documentContent.substring(0, start) + - INSERTION_BEGIN_STRING + INSERTION_END_STRING + documentContent.substr= ing(start); - = - offsetToTest =3D start + INSERTION_BEGIN_STRING.length(); - = - jspTextEditor.setText(documentContentModified); - = - p=3D TestUtil.getProcessor(viewer, offsetToTest, contentAssistant); - if (p !=3D null) { - try { - result=3D p.computeCompletionProposals(viewer, offsetToTest); - } catch (Throwable x) { - x.printStackTrace(); - } - errorMessage=3D p.getErrorMessage(); - } - - for (int i =3D 0; i < result.length; i++) { - // There should be the same proposals as in the saved result - if (result[i] instanceof CustomCompletionProposal) { - assertTrue("Content Assistant returned additional proposal (proposal r= eturned doesn't exist in the saved list).", - customCompletionProposals.contains(((CustomCompletionProposal)result= [i]).getReplacementString())); - customCompletionProposals.remove(((CustomCompletionProposal)result[i])= .getReplacementString()); - } - } - assertTrue("Content Assistant didn't return some of the required proposa= ls.",customCompletionProposals.isEmpty()); - - closeEditor(); - } -} Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/j= st/jsp/test/ca/MissingKBBuilderTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/MissingKBBuilderTest.java 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/MissingKBBuilderTest.java 2010-05-28 21:52:35 UTC (rev 22423) @@ -1,61 +0,0 @@ -package org.jboss.tools.jst.jsp.test.ca; - -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.jboss.tools.jst.jsp.test.TestUtil; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.TestProjectProvider; - -public class MissingKBBuilderTest extends ContentAssistantTestCase{ - TestProjectProvider provider =3D null; - boolean makeCopy =3D false; - private static final String PROJECT_NAME =3D "MissingKBBuilderTest"; - private static final String PAGE_NAME =3D "/WebContent/pages/inputname.xh= tml"; - = - public void setUp() throws Exception { - provider =3D new TestProjectProvider("org.jboss.tools.jst.jsp.test", nul= l, PROJECT_NAME, makeCopy); = - project =3D provider.getProject(); - } - - protected void tearDown() throws Exception { - if(provider !=3D null) { - provider.dispose(); - } - } - = - public void testCAForIDTest(){ - String[] proposals =3D { - "resources" - }; - - ICompletionProposal[] ps =3D checkProposals(PAGE_NAME, "", 24); - System.out.println("-1->" + (ps =3D=3D null ? 0 : ps.length)); - JobUtils.waitForIdle(2000); - ps =3D checkProposals(PAGE_NAME, "", 24, proposals, false); - System.out.println("-2->" + (ps =3D=3D null ? 0 : ps.length)); - } - - protected ICompletionProposal[] checkProposals(String fileName, String su= bstring, int offset){ - openEditor(fileName); - - int position =3D 0; - if (substring !=3D null) { - String documentContent =3D document.get(); - position =3D documentContent.indexOf(substring); - } - - ICompletionProposal[] result =3D null; - - IContentAssistProcessor p =3D TestUtil.getProcessor(viewer, positi= on + offset, contentAssistant); - if (p !=3D null) { - try { - result =3D p.computeCompletionProposals(viewer, position += offset); - } catch (Throwable x) { - x.printStackTrace(); - } - } - - return result; - } - -} \ No newline at end of file Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/j= st/jsp/test/ca/StrutsJspJbide1648Test.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/StrutsJspJbide1648Test.java 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/js= p/test/ca/StrutsJspJbide1648Test.java 2010-05-28 21:52:35 UTC (rev 22423) @@ -1,75 +0,0 @@ -package org.jboss.tools.jst.jsp.test.ca; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.jboss.tools.jst.jsp.test.TestUtil; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.TestProjectProvider; - -public class StrutsJspJbide1648Test extends ContentAssistantTestCase { - TestProjectProvider provider =3D null; - boolean makeCopy =3D false; - private static final String PROJECT_NAME =3D "StrutsJbide1648Test"; - private static final String[] PAGE_NAMES =3D { = - "/WebContent/pages/a.jsp", - "/WebContent/pages/a.xhtml" - }; - - public static Test suite() { - return new TestSuite(StrutsJspJbide1648Test.class); - } - - public void setUp() throws Exception { - provider =3D new TestProjectProvider("org.jboss.tools.jst.jsp.test", nul= l, PROJECT_NAME, makeCopy); = - project =3D provider.getProject(); - } - - protected void tearDown() throws Exception { - if(provider !=3D null) { - provider.dispose(); - } - } - - public void testStrutsJspJbide1648() { - try { - JobUtils.waitForIdle(); - } catch (Exception e) { - e.printStackTrace(); - } = - assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (proje= ct !=3D null)); - - for (int i =3D 0; i < PAGE_NAMES.length; i++) { - doTestOnPage(PAGE_NAMES[i]); - } - = - } - = - private void doTestOnPage(String pageName) { - openEditor(pageName); - = - ICompletionProposal[] result=3D null; - String errorMessage =3D null; - - try { - IContentAssistProcessor p=3D TestUtil.getProcessor(viewer, 0, contentAs= sistant); - if (p !=3D null) { - result=3D p.computeCompletionProposals(viewer, 0); - errorMessage=3D p.getErrorMessage(); - } - = - } catch (Throwable x) { - x.printStackTrace(); - if (x instanceof NullPointerException) { - assertTrue("Content Assistant failed with NullPointerException", false= ); - } else { - assertTrue("Content Assistant failed with exception: \n" + x.getLocali= zedMessage(), false); - } - } - = - closeEditor(); - - } -} Modified: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/t= ools/jst/text/ext/test/JsfExtAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/j= st/text/ext/test/JsfExtAllTests.java 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/j= st/text/ext/test/JsfExtAllTests.java 2010-05-28 21:52:35 UTC (rev 22423) @@ -7,16 +7,21 @@ = = public class JsfExtAllTests { - public static Test suite() { - TestSuite suite =3D new TestSuite("Test for default package"); - //$JUnit-BEGIN$ - - suite.addTest(new ProjectImportTestSetup(new TestSuite(OpenOnsTest.class= ), - "org.jboss.tools.jst.text.ext.test", - new String[]{"projects/HiperlinksTestProject"}, - new String[]{"HiperlinksTestProject"})); + = + // all tests were moved to jst.ui.test plugin + public void testJsfTextExt () { = - //$JUnit-END$ - return suite; } +// public static Test suite() { +// TestSuite suite =3D new TestSuite("Test for default package"); +// //$JUnit-BEGIN$ +// +// suite.addTest(new ProjectImportTestSetup(new TestSuite(OpenOnsTest.cla= ss), +// "org.jboss.tools.jst.text.ext.test", +// new String[]{"projects/HiperlinksTestProject"}, +// new String[]{"HiperlinksTestProject"})); +// = +// //$JUnit-END$ +// return suite; +// } } Deleted: trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/to= ols/jst/text/ext/test/OpenOnsTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/j= st/text/ext/test/OpenOnsTest.java 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.jst.text.ext.test/src/org/jboss/tools/j= st/text/ext/test/OpenOnsTest.java 2010-05-28 21:52:35 UTC (rev 22423) @@ -1,575 +0,0 @@ -package org.jboss.tools.jst.text.ext.test; - -import junit.framework.TestCase; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.text.BadLocationException; -import org.eclipse.jface.text.FindReplaceDocumentAdapter; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.IRegion; -import org.eclipse.jface.text.ITextSelection; -import org.eclipse.jface.text.hyperlink.IHyperlink; -import org.eclipse.jface.text.source.ISourceViewer; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.part.EditorPart; -import org.jboss.tools.common.model.ui.editor.EditorPartWrapper; -import org.jboss.tools.common.model.ui.editors.multipage.DefaultMultipageE= ditor; -import org.jboss.tools.common.text.ext.hyperlink.HyperlinkDetector; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.WorkbenchUtils; - -public class OpenOnsTest extends TestCase { - - public static final String OPENON_TEST_PROJECT =3D "HiperlinksTestProject= "; - - - public IProject project =3D null; - - protected void setUp() { - project =3D ResourcesPlugin.getWorkspace().getRoot().getProject( - OPENON_TEST_PROJECT); - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().clo= seAllEditors(false); - JobUtils.waitForIdle(); - IWorkbench workbench =3D PlatformUI.getWorkbench(); - } - = - protected void tearDown() { - PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().clo= seAllEditors(false); - } - - public OpenOnsTest() { - super("styleClass OpenOn tests"); - } - = - public static final String WEB_XML_FILE_PATH =3D OPENON_TEST_PROJECT+"/We= bContent/WEB-INF/web.xml"; - = - public void testFilterNameOpenOn() throws PartInitException, BadLocationE= xception { - IEditorPart editor =3D WorkbenchUtils.openEditor(WEB_XML_FILE_PATH); - editor =3D ((EditorPartWrapper)editor).getEditor(); - JobUtils.waitForIdle(); - DefaultMultipageEditor xmlMultyPageEditor =3D (DefaultMultipageEditor) e= ditor; - xmlMultyPageEditor.selectPageByName("Source"); - ISourceViewer viewer =3D xmlMultyPageEditor.getSourceEditor().getTextVie= wer(); = - = - IDocument document =3D viewer.getDocument(); - IRegion reg =3D new FindReplaceDocumentAdapter(document).find(0, - "Filter1", true, true, false, false); - reg =3D new FindReplaceDocumentAdapter(document).find(reg.getOffset()+re= g.getLength()+1, - "Filter1", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - ITextSelection selection =3D (ITextSelection)viewer.getSelectionProvider= ().getSelection(); - assertEquals("", selection.getText()); - } - = - public void testRoleNameOpenOn() throws PartInitException, BadLocationExc= eption { - IEditorPart editor =3D WorkbenchUtils.openEditor(WEB_XML_FILE_PATH); - editor =3D ((EditorPartWrapper)editor).getEditor(); - JobUtils.waitForIdle(); - DefaultMultipageEditor xmlMultyPageEditor =3D (DefaultMultipageEditor) e= ditor; - xmlMultyPageEditor.selectPageByName("Source"); - ISourceViewer viewer =3D xmlMultyPageEditor.getSourceEditor().getTextVie= wer(); = - = - IDocument document =3D viewer.getDocument(); - IRegion reg =3D new FindReplaceDocumentAdapter(document).find(0, - "Designer", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - ITextSelection selection =3D (ITextSelection)viewer.getSelectionProvider= ().getSelection(); - assertEquals("", selection.getText()); - } - = - public void testServletNameOpenOn() throws PartInitException, BadLocation= Exception { - IEditorPart editor =3D WorkbenchUtils.openEditor(WEB_XML_FILE_PATH); - editor =3D ((EditorPartWrapper)editor).getEditor(); - JobUtils.waitForIdle(); - DefaultMultipageEditor xmlMultyPageEditor =3D (DefaultMultipageEditor) e= ditor; - xmlMultyPageEditor.selectPageByName("Source"); - ISourceViewer viewer =3D xmlMultyPageEditor.getSourceEditor().getTextVie= wer(); = - = - IDocument document =3D viewer.getDocument(); - IRegion reg =3D new FindReplaceDocumentAdapter(document).find(0, - "Faces Servlet", true, true, false, false); - reg =3D new FindReplaceDocumentAdapter(document).find(reg.getOffset()+re= g.getLength()+1, - "Faces Servlet", true, true, false, false); - reg =3D new FindReplaceDocumentAdapter(document).find(reg.getOffset()+re= g.getLength()+1, - "Faces Servlet", true, true, false, false); - reg =3D new FindReplaceDocumentAdapter(document).find(reg.getOffset()+re= g.getLength()+1, - "Faces Servlet", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - ITextSelection selection =3D (ITextSelection)viewer.getSelectionProvider= ().getSelection(); - assertEquals("", selection.getText()); - } - - public static final String TAGLIB_URI_TEST_FILE =3D OPENON_TEST_PROJECT += "/WebContent/tldUriHyperlinkTests.jsp"; - = - public void testTaglibUriFromJarOpenOn() throws BadLocationException { - IEditorPart editor =3D WorkbenchUtils.openEditor(TAGLIB_URI_TEST_FILE); - assertTrue(editor instanceof JSPMultiPageEditor); - JobUtils.waitForIdle(); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - IDocument document =3D jspMultyPageEditor.getSourceEditor().getTextViewe= r().getDocument(); - IRegion reg =3D new FindReplaceDocumentAdapter(document).find(0, - "jsf/core", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - String fileName =3D editor.getEditorInput().getName(); - System.out.println(fileName); - assertTrue("jsf_core.tld".equals(fileName)); - } - public static final String TAGLIB_URI_JSP_ROOT_TEST_FILE =3D OPENON_TEST_= PROJECT + "/WebContent/jspTagsHyperlinkTests.jsp"; - = - public void testTaglibUriFromJarinJspRootOpenOn() throws BadLocationExcep= tion { - IEditorPart editor =3D WorkbenchUtils.openEditor(TAGLIB_URI_JSP_ROOT_TES= T_FILE); - assertTrue(editor instanceof JSPMultiPageEditor); - JobUtils.waitForIdle(); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - IDocument document =3D jspMultyPageEditor.getSourceEditor().getTextViewe= r().getDocument(); - IRegion reg =3D new FindReplaceDocumentAdapter(document).find(0, - "jsf/core", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - = - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - String fileName =3D editor.getEditorInput().getName(); - System.out.println(fileName); - assertTrue("jsf_core.tld".equals(fileName)); - } - = - public static final String STYLE_TEST_FILE =3D OPENON_TEST_PROJECT + "/We= bContent/styleHyperlinkTests.jsp"; - public static final String CSS1_TEST_FILE =3D OPENON_TEST_PROJECT + "/Web= Content/stylesheet/style1.css"; - public static final String CSS2_TEST_FILE =3D OPENON_TEST_PROJECT + "/Web= Content/stylesheet/style2.css"; - = - public void testStylesheetOpenOn() throws BadLocationException { - IEditorPart editor =3D WorkbenchUtils.openEditor(STYLE_TEST_FILE); - assertTrue(editor instanceof JSPMultiPageEditor); - JobUtils.waitForIdle(); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - IDocument document =3D jspMultyPageEditor.getSourceEditor().getTextViewe= r().getDocument(); - IRegion reg =3D new FindReplaceDocumentAdapter(document).find(0, - "stylesheet/style1.css", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - String fileName =3D editor.getEditorInput().getName(); - assertTrue("style1.css".equals(fileName)); = - } - = - public void testStyleClassOpenOns() throws CoreException, BadLocationExce= ption { - IEditorPart editor =3D WorkbenchUtils.openEditor(STYLE_TEST_FILE); - assertTrue(editor instanceof JSPMultiPageEditor); - JobUtils.waitForIdle(); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - IDocument document =3D jspMultyPageEditor.getSourceEditor().getTextViewe= r().getDocument(); - IRegion reg =3D new FindReplaceDocumentAdapter(document).find(0, - "style-class9\"", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - String fileName =3D editor.getEditorInput().getName(); - assertTrue("styleHyperlinkTests.jsp".equals(fileName)); - = - reg =3D new FindReplaceDocumentAdapter(document).find(0, - "style-class3", true, true, false, false); - links =3D HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, = false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - fileName =3D editor.getEditorInput().getName(); - assertTrue("style1.css".equals(fileName)); - = - reg =3D new FindReplaceDocumentAdapter(document).find(0, - "style-class6", true, true, false, false); - links =3D HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, = false); - links[0].open(); - JobUtils.waitForIdle(); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - fileName =3D editor.getEditorInput().getName(); - assertTrue("style2.css".equals(fileName)); - } - = - public static final String CLASS_TEST_FILE =3D OPENON_TEST_PROJECT + "/We= bContent/classHyperlinkTests.jsp"; - public static final String CLASS1_TEST_FILE =3D OPENON_TEST_PROJECT + "/J= avaSource/org/jboss/test/ChangeListenerInstance.java"; - = - public void testClassNameOpenOn() throws CoreException, BadLocationExcept= ion { - IEditorPart editor =3D WorkbenchUtils.openEditor(CLASS_TEST_FILE); - assertTrue(editor instanceof JSPMultiPageEditor); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - - IRegion reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSou= rceEditor().getTextViewer().getDocument()).find(0, - "org.jboss.tools.test.ChangeListenerInstance", true, true, false, fals= e); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - String fileName =3D editor.getEditorInput().getName(); - assertTrue("ChangeListenerInstance.java".equals(fileName)); - } - = - public void testTaglibTagNameOpenOn() throws CoreException, BadLocationEx= ception { - IEditorPart editor =3D WorkbenchUtils.openEditor(CLASS_TEST_FILE); - assertTrue(editor instanceof JSPMultiPageEditor); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - - IRegion reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSou= rceEditor().getTextViewer().getDocument()).find(0, - "view", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - System.out.println(links[0].getClass().getName()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - String fileName =3D editor.getEditorInput().getName(); - assertTrue("jsf_core.tld".equals(fileName)); - } - = - public static final String USE_BEAN_TEST_FILE =3D OPENON_TEST_PROJECT + "= /WebContent/beanHyperlinkTests.jsp"; - = - public void testUseBeanClassOpenOn() throws CoreException, BadLocationExc= eption { - IEditorPart editor =3D WorkbenchUtils.openEditor(USE_BEAN_TEST_FILE); - assertTrue(editor instanceof JSPMultiPageEditor); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - - IRegion reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSou= rceEditor().getTextViewer().getDocument()).find(0, - "b1", true, true, false, false); - reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEdito= r().getTextViewer().getDocument()).find(reg.getOffset()+reg.getLength(), - "b1", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - ITextSelection selection =3D (ITextSelection)viewer.getSelectionProvider= ().getSelection(); - assertEquals("", selection.getText()); - = - reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEdito= r().getTextViewer().getDocument()).find(0, - "org.jboss.tools.test.TestBean1", true, true, false, false); - links =3D HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, = false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - String fileName =3D editor.getEditorInput().getName(); - assertTrue("TestBean1.java".equals(fileName)); - } - - public void testGetBeanPropertyOpenOn() throws CoreException, BadLocation= Exception { - IEditorPart editor =3D WorkbenchUtils.openEditor(USE_BEAN_TEST_FILE); - assertTrue(editor instanceof JSPMultiPageEditor); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - - IRegion reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSou= rceEditor().getTextViewer().getDocument()).find(0, - "property1", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - = - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - String fileName =3D editor.getEditorInput().getName(); - assertTrue("TestBean1.java".equals(fileName)); = - } - = - public void testSetBeanPropertyOpenOn() throws CoreException, BadLocation= Exception { - IEditorPart editor =3D WorkbenchUtils.openEditor(USE_BEAN_TEST_FILE); - assertTrue(editor instanceof JSPMultiPageEditor); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - - IRegion reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSou= rceEditor().getTextViewer().getDocument()).find(0, - "property2", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - = - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - String fileName =3D editor.getEditorInput().getName(); - assertTrue("TestBean1.java".equals(fileName)); = - } - = - public static final String FORWARD_TEST_FILE =3D OPENON_TEST_PROJECT + "/= WebContent/forwardHiperlinkTests.jsp"; - - = - public void testJspForwardOpenOn() throws CoreException, BadLocationExcep= tion { - IEditorPart editor =3D WorkbenchUtils.openEditor(FORWARD_TEST_FILE); - assertTrue(editor instanceof JSPMultiPageEditor); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - - IRegion reg =3D new FindReplaceDocumentAdapter(viewer.getDocument()).fin= d(0, - "forward/forwardHiperlinkPage2Tests.jsp", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - String fileName =3D editor.getEditorInput().getName(); - assertTrue("forwardHiperlinkPage2Tests.jsp".equals(fileName)); - = - reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEdito= r().getTextViewer().getDocument()).find(0, - "forwardHiperlinkPage1Tests.jsp", true, true, false, false); - links =3D HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, = false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - = - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - fileName =3D editor.getEditorInput().getName(); - assertTrue("forwardHiperlinkPage1Tests.jsp".equals(fileName)); - } - = - public static final String INCLUDE_TEST_FILE =3D OPENON_TEST_PROJECT + "/= WebContent/includeHiperlinkTests.jsp"; - - = - public void testJspIncludeOpenOn() throws CoreException, BadLocationExcep= tion { - IEditorPart editor =3D WorkbenchUtils.openEditor(INCLUDE_TEST_FILE); - assertTrue(editor instanceof JSPMultiPageEditor); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - - IRegion reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSou= rceEditor().getTextViewer().getDocument()).find(0, - "include/includeHiperlinkPage2Tests.jsp", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - String fileName =3D editor.getEditorInput().getName(); - assertTrue("includeHiperlinkPage2Tests.jsp".equals(fileName)); - = - reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSourceEdito= r().getTextViewer().getDocument()).find(0, - "includeHiperlinkPage1Tests.jsp", true, true, false, false); - links =3D HyperlinkDetector.getInstance().detectHyperlinks(viewer, reg, = false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - fileName =3D editor.getEditorInput().getName(); - assertTrue("includeHiperlinkPage1Tests.jsp".equals(fileName)); - } - = - public static final String FACELETS_XHTML_TEST_FILE =3D OPENON_TEST_PROJE= CT + "/WebContent/faceletsHiperlinkTests.xhtml"; - - = - public void testJspXmlElementNameOpenOn() throws CoreException, BadLocati= onException { - IEditorPart editor =3D WorkbenchUtils.openEditor(FACELETS_XHTML_TEST_FIL= E); - assertTrue(editor instanceof JSPMultiPageEditor); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - - IRegion reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSou= rceEditor().getTextViewer().getDocument()).find(0, - "message", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - String fileName =3D editor.getEditorInput().getName(); - assertTrue("html_basic.tld".equals(fileName)); - } - = - public static final String JSP_XMLNS_TEST_FILE =3D OPENON_TEST_PROJECT + = "/WebContent/jspXmlFormatTests.jsp"; - - = - public void testJspXmlnsNameOpenOn() throws CoreException, BadLocationExc= eption { - IEditorPart editor =3D WorkbenchUtils.openEditor(FACELETS_XHTML_TEST_FIL= E); - assertTrue(editor instanceof JSPMultiPageEditor); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - - IRegion reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSou= rceEditor().getTextViewer().getDocument()).find(0, - "http://java.sun.com/jsf/html", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - String fileName =3D editor.getEditorInput().getName(); - assertTrue("html_basic.tld".equals(fileName)); - } - - public static final String TLD_ATTRIBUTE_NAME_TEST_FILE =3D OPENON_TEST_P= ROJECT + "/WebContent/WEB-INF/tldAttributeNameOpenOnTests.tld"; - - public void testTldAttributeNameOpenOn() throws CoreException, BadLocatio= nException { - IEditorPart editor =3D WorkbenchUtils.openEditor(TLD_ATTRIBUTE_NAME_TEST= _FILE); - assertTrue(editor instanceof DefaultMultipageEditor); - DefaultMultipageEditor tldEditor =3D (DefaultMultipageEditor) editor; - tldEditor.selectPageByName("Source"); - ISourceViewer viewer =3D tldEditor.getSourceEditor().getTextViewer(); - - IRegion reg =3D new FindReplaceDocumentAdapter(tldEditor.getSourceEditor= ().getTextViewer().getDocument()).find(0, - "attr1", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - ITextSelection selection =3D (ITextSelection)viewer.getSelectionProvider= ().getSelection(); - assertEquals("", selection.getText()); - } - = - public static final String FACELET_TAGLIB_TEST_FILE =3D OPENON_TEST_PROJE= CT + "/WebContent/WEB-INF/faceletTaglibOpenOnTests.taglib.xml"; - - public void testFaceletTaglibTypeOpenOn() throws CoreException, BadLocati= onException { - IEditorPart editor =3D WorkbenchUtils.openEditor(FACELET_TAGLIB_TEST_FIL= E); - editor =3D ((EditorPartWrapper)editor).getEditor(); - JobUtils.waitForIdle(); - DefaultMultipageEditor faceletEditor =3D (DefaultMultipageEditor) editor; - faceletEditor.selectPageByName("Source"); - ISourceViewer viewer =3D faceletEditor.getSourceEditor().getTextViewer(); - - // find a region that matches java.lang.String - IRegion reg =3D new FindReplaceDocumentAdapter(faceletEditor.getSourceEd= itor().getTextViewer().getDocument()).find(0, - "java.lang.String", true, true, false, false); - - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length !=3D 0); - - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - String title =3D editor.getTitle(); - assertTrue("java.lang.String declaration should be opened, but \'" + tit= le + "\' is actially openned in active editor", = - title.startsWith("String.")); - } - = - public static final String XHTML_STYLE_CLASS_NAME_TEST_FILE =3D OPENON_TE= ST_PROJECT + "/WebContent/xhtmlStyleClassHiperlinkTests.xhtml"; - - = - public void testFacletsStyleClassOpenOnJbide2890() throws BadLocationExce= ption { - IEditorPart editor =3D WorkbenchUtils.openEditor(XHTML_STYLE_CLASS_NAME_= TEST_FILE); - assertTrue(editor instanceof JSPMultiPageEditor); - JSPMultiPageEditor jspMultyPageEditor =3D (JSPMultiPageEditor) editor; - ISourceViewer viewer =3D jspMultyPageEditor.getSourceEditor().getTextVie= wer(); - - IRegion reg =3D new FindReplaceDocumentAdapter(jspMultyPageEditor.getSou= rceEditor().getTextViewer().getDocument()).find(0, - "style-class1", true, true, false, false); - IHyperlink[] links =3D HyperlinkDetector.getInstance().detectHyperlinks(= viewer, reg, false); - assertNotNull(links); - assertTrue(links.length!=3D0); - //assertNotNull(links[0].getHyperlinkText()); - assertNotNull(links[0].toString()); - links[0].open(); - JobUtils.waitForIdle(); - editor =3D PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActiv= ePage().getActiveEditor(); - = - String fileName =3D editor.getEditorInput().getName(); - assertTrue("style1.css".equals(fileName)); = - } -} Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/= jst/web/test/JstWebAllTests.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/we= b/test/JstWebAllTests.java 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/we= b/test/JstWebAllTests.java 2010-05-28 21:52:35 UTC (rev 22423) @@ -17,7 +17,7 @@ = public static Test suite() { TestSuite suite =3D new TestSuite(JstWebAllTests.class.getName()); - suite.addTest(WebContentAssistProviderTest.suite()); + suite.addTestSuite(WebContentAssistProviderTest.class); return suite; } } \ No newline at end of file Modified: trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/= jst/web/test/WebContentAssistProviderTest.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/we= b/test/WebContentAssistProviderTest.java 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/we= b/test/WebContentAssistProviderTest.java 2010-05-28 21:52:35 UTC (rev 22423) @@ -27,63 +27,15 @@ import org.jboss.tools.jst.web.project.list.WebPromptingProvider; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.TestProjectProvider; - +/** + * Tests were moved to jsf.test plugin to fix tycho junit test errors + * @author eskimo + * + */ public class WebContentAssistProviderTest extends TestCase { = - TestProjectProvider provider =3D null; - IProject project =3D null; - boolean makeCopy =3D true; - XModel projectModel; - WebPromptingProvider webPromptingProvider; - - public static Test suite() { - return new TestSuite(WebContentAssistProviderTest.class); - } - - public void testTlds() { - // Wait all the builders to finish - JobUtils.waitForIdle(2000); - - List tldList =3D webPromptingProvider.getList(projectModel, WebPrompting= Provider.JSF_GET_TAGLIBS, "", null); - assertTrue("TLD list does not contain expected TLD in XModel.", tldList.= contains("http://jboss.com/products/seam/taglib")); - } - - public void testJsfBeanPropertyList() { - // seam beans list - List beanList =3D webPromptingProvider.getList(projectModel, WebPromptin= gProvider.JSF_BEAN_PROPERTIES, "facesManagedBean", new Properties()); - assertTrue("Bean property list does not contain Managed bean property in= XModel.", beanList.contains("property1")); - } - - public void testBundles() { - // bundle name list - List bundleList =3D webPromptingProvider.getList(projectModel, WebPrompt= ingProvider.JSF_BUNDLES, "", null); - assertTrue("Bundle name list does not contain expected name in XModel.",= bundleList.contains("org.jboss.seam.example.numberguess.test")); - // bundle property list - List bundlePropertyList =3D webPromptingProvider.getList(projectModel, W= ebPromptingProvider.JSF_BUNDLE_PROPERTIES, "org.jboss.seam.example.numbergu= ess.test", null); - assertTrue("Bundle property list does not contain expected property in X= Model.", bundlePropertyList.contains("bundleProperty1")); - } - - public void setUp() throws Exception { - provider =3D new TestProjectProvider("org.jboss.tools.jst.web.test", nul= l, "TestsWebArtefacts", makeCopy); = - project =3D provider.getProject(); - project.refreshLocal(IResource.DEPTH_INFINITE, null); - project.build(IncrementalProjectBuilder.FULL_BUILD,null); - XModelObject xmo =3D EclipseResourceUtil.getObjectByResource(project); - assertNotNull("Can't get XModel Object for test project.", xmo); - projectModel =3D xmo.getModel(); - Watcher.getInstance(projectModel).forceUpdate(); - projectModel.update(); - assertNotNull("Can't get XModel for test project.", projectModel); - - // Wait all the builders to finish - JobUtils.waitForIdle(2000); + public void testJstComponentRelatedFunctionality() { = - webPromptingProvider =3D WebPromptingProvider.getInstance(); } = - protected void tearDown() throws Exception { - if(provider !=3D null) { - provider.dispose(); - } - } } \ No newline at end of file Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.ecl= ipse.jdt.core.prefs =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.eclipse.j= dt.core.prefs 2010-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/.settings/org.eclipse.j= dt.core.prefs 2010-05-28 21:52:35 UTC (rev 22423) @@ -1,4 +1,4 @@ -#Mon Aug 31 15:12:26 CEST 2009 +#Fri May 28 11:59:32 PDT 2010 eclipse.preferences.version=3D1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=3Denabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=3D1.5 Modified: trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST= .MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF 20= 10-05-28 20:44:53 UTC (rev 22422) +++ trunk/jst/tests/org.jboss.tools.ui.bot.ext.test/META-INF/MANIFEST.MF 20= 10-05-28 21:52:35 UTC (rev 22423) @@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: WebService SWTBot Tests Bundle-SymbolicName: org.jboss.tools.ws.ui.bot.test -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 3.1.0.qualifier Bundle-Activator: org.jboss.tools.ui.bot.ext.test.Activator Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, --===============7159644460682353608==-- From jbosstools-commits at lists.jboss.org Fri May 28 17:53:15 2010 Content-Type: multipart/mixed; boundary="===============2695140033138447265==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22424 - in trunk/jmx: site and 1 other directory. Date: Fri, 28 May 2010 17:53:15 -0400 Message-ID: <201005282153.o4SLrFZQ012017@svn01.web.mwc.hst.phx2.redhat.com> --===============2695140033138447265== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-28 17:53:14 -0400 (Fri, 28 May 2010) New Revision: 22424 Added: trunk/jmx/site/ trunk/jmx/site/pom.xml trunk/jmx/site/site.xml Modified: trunk/jmx/pom.xml Log: add site Modified: trunk/jmx/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/pom.xml 2010-05-28 21:52:35 UTC (rev 22423) +++ trunk/jmx/pom.xml 2010-05-28 21:53:14 UTC (rev 22424) @@ -15,6 +15,7 @@ features plugins tests + site - = \ No newline at end of file + = Added: trunk/jmx/site/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/site/pom.xml (rev 0) +++ trunk/jmx/site/pom.xml 2010-05-28 21:53:14 UTC (rev 22424) @@ -0,0 +1,13 @@ + + 4.0.0 = + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + jmx.site = + 0.0.1-SNAPSHOT + eclipse-update-site + Added: trunk/jmx/site/site.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jmx/site/site.xml (rev 0) +++ trunk/jmx/site/site.xml 2010-05-28 21:53:14 UTC (rev 22424) @@ -0,0 +1,12 @@ + + + To install these features, point Eclipse at this site. + + + JBoss Tools jmx Nightly Build Update Site: contains all fea= tures in this build. + + + + + + --===============2695140033138447265==-- From jbosstools-commits at lists.jboss.org Fri May 28 18:01:07 2010 Content-Type: multipart/mixed; boundary="===============6242057157495203079==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22425 - in trunk/common: site and 1 other directory. Date: Fri, 28 May 2010 18:01:06 -0400 Message-ID: <201005282201.o4SM16e8013019@svn01.web.mwc.hst.phx2.redhat.com> --===============6242057157495203079== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-28 18:01:06 -0400 (Fri, 28 May 2010) New Revision: 22425 Added: trunk/common/site/ trunk/common/site/pom.xml trunk/common/site/site.xml Modified: trunk/common/pom.xml Log: add site Modified: trunk/common/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/pom.xml 2010-05-28 21:53:14 UTC (rev 22424) +++ trunk/common/pom.xml 2010-05-28 22:01:06 UTC (rev 22425) @@ -15,6 +15,7 @@ features plugins tests + site - = \ No newline at end of file + = Added: trunk/common/site/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/site/pom.xml (rev 0) +++ trunk/common/site/pom.xml 2010-05-28 22:01:06 UTC (rev 22425) @@ -0,0 +1,13 @@ + + 4.0.0 = + + ../../parent-pom.xml + org.jboss.tools + org.jboss.tools.parent.pom + 0.0.1-SNAPSHOT + + org.jboss.tools + common.site = + 0.0.1-SNAPSHOT + eclipse-update-site + Added: trunk/common/site/site.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/common/site/site.xml (rev 0) +++ trunk/common/site/site.xml 2010-05-28 22:01:06 UTC (rev 22425) @@ -0,0 +1,27 @@ + + + To install these features, point Eclipse at this site. + + + JBoss Tools common Nightly Build Update Site: contains all = features in this build. + + + + + + + + + + + + + + + + + + + + + --===============6242057157495203079==-- From jbosstools-commits at lists.jboss.org Fri May 28 18:01:54 2010 Content-Type: multipart/mixed; boundary="===============2882502257610503742==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22426 - trunk/tests. Date: Fri, 28 May 2010 18:01:54 -0400 Message-ID: <201005282201.o4SM1saB013160@svn01.web.mwc.hst.phx2.redhat.com> --===============2882502257610503742== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-28 18:01:54 -0400 (Fri, 28 May 2010) New Revision: 22426 Modified: trunk/tests/pom.xml Log: add site Modified: trunk/tests/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/tests/pom.xml 2010-05-28 22:01:06 UTC (rev 22425) +++ trunk/tests/pom.xml 2010-05-28 22:01:54 UTC (rev 22426) @@ -14,6 +14,7 @@ features plugins + site - = \ No newline at end of file + = --===============2882502257610503742==-- From jbosstools-commits at lists.jboss.org Fri May 28 18:34:22 2010 Content-Type: multipart/mixed; boundary="===============0836666142120498823==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22427 - trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF. Date: Fri, 28 May 2010 18:34:21 -0400 Message-ID: <201005282234.o4SMYLmi022569@svn01.web.mwc.hst.phx2.redhat.com> --===============0836666142120498823== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: nickboldt Date: 2010-05-28 18:34:21 -0400 (Fri, 28 May 2010) New Revision: 22427 Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST.= MF Log: remove range Modified: trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MA= NIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST= .MF 2010-05-28 22:01:54 UTC (rev 22426) +++ trunk/drools/tests/org.jboss.tools.drools.ui.bot.test/META-INF/MANIFEST= .MF 2010-05-28 22:34:21 UTC (rev 22427) @@ -13,7 +13,7 @@ org.junit4;bundle-version=3D"4.5.0", org.jboss.tools.ui.bot.ext, org.drools.eclipse;bundle-version=3D"5.1.0", - org.eclipse.swtbot.eclipse.gef.finder;bundle-version=3D"0.1.0", + org.eclipse.swtbot.eclipse.gef.finder, org.apache.log4j;bundle-version=3D"1.2.13" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 --===============0836666142120498823==-- From jbosstools-commits at lists.jboss.org Sat May 29 00:00:22 2010 Content-Type: multipart/mixed; boundary="===============8449392706163336176==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22428 - in trunk/vpe/tests: org.jboss.tools.vpe.html.test/META-INF and 8 other directories. Date: Sat, 29 May 2010 00:00:21 -0400 Message-ID: <201005290400.o4T40L7V026865@svn01.web.mwc.hst.phx2.redhat.com> --===============8449392706163336176== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dgolovin Date: 2010-05-29 00:00:19 -0400 (Sat, 29 May 2010) New Revision: 22428 Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/build.properties Log: https://jira.jboss.org/browse/JBDS-1202 problems running tests vpe component tests fix: - manifests were updated to let tycho find test classes Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2010= -05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/META-INF/MANIFEST.MF 2010= -05-29 04:00:19 UTC (rev 22428) @@ -19,7 +19,6 @@ org.mozilla.xpcom;bundle-version=3D"1.9.1", org.jboss.tools.vpe.ui.test Bundle-ActivationPolicy: lazy -Bundle-ClassPath: html-test.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties 2010-05-= 28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.html.test/build.properties 2010-05-= 29 04:00:19 UTC (rev 22428) @@ -1,5 +1,4 @@ bin.includes =3D META-INF/,\ - html-test.jar,\ resources/,\ plugin.xml,\ plugin.properties @@ -7,6 +6,8 @@ build.properties,\ src/,\ resources/ -jars.compile.order =3D html-test.jar -source.html-test.jar =3D src/ +jars.compile.order =3D html-test.jar,\ + . output.html-test.jar =3D bin/ +source.. =3D src/ +output.. =3D bin/ Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2010-= 05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/META-INF/MANIFEST.MF 2010-= 05-29 04:00:19 UTC (rev 22428) @@ -17,7 +17,6 @@ org.mozilla.xpcom;bundle-version=3D"1.9.1" Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.vpe.jsp.test -Bundle-ClassPath: jsp-tests.jar Bundle-Vendor: %Bundle-Vendor.0 Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties 2010-05-2= 8 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.jsp.test/build.properties 2010-05-2= 9 04:00:19 UTC (rev 22428) @@ -1,12 +1,11 @@ bin.includes =3D META-INF/,\ - jsp-tests.jar,\ plugin.xml,\ resources/,\ plugin.properties -jars.compile.order =3D jsp-tests.jar -source.jsp-tests.jar =3D src/ -output.jsp-tests.jar =3D bin/ +jars.compile.order =3D . src.includes =3D META-INF/,\ build.properties,\ src/,\ resources/ +source.. =3D src/ +output.. =3D bin/ Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2010-05-2= 8 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/META-INF/MANIFEST.MF 2010-05-2= 9 04:00:19 UTC (rev 22428) @@ -15,7 +15,6 @@ Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.vpe.editor.template, org.jboss.tools.vpe.test -Bundle-ClassPath: vpe-tests.jar Import-Package: org.eclipse.ui.part Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties 2010-05-28 22= :34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/build.properties 2010-05-29 04= :00:19 UTC (rev 22428) @@ -2,7 +2,6 @@ testOk-plugin.xml,\ testFailure-plugin.xml,\ templates/,\ - vpe-tests.jar,\ scheme/,\ plugin.properties,\ plugin.xml @@ -12,4 +11,6 @@ templates/,\ testFailure-plugin.xml,\ testOk-plugin.xml -source.vpe-tests.jar =3D src/ +jars.compile.order =3D . +source.. =3D src/ +output.. =3D bin/ Modified: trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml 2010-05-28 22:34:21 UT= C (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.test/pom.xml 2010-05-29 04:00:19 UT= C (rev 22428) @@ -11,4 +11,17 @@ org.jboss.tools.vpe.test = 3.1.0-SNAPSHOT eclipse-test-plugin + + + + org.sonatype.tycho + maven-osgi-test-plugin + + + org.jboss.tools.vpe.test + + + + + = Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-0= 5-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/META-INF/MANIFEST.MF 2010-0= 5-29 04:00:19 UTC (rev 22428) @@ -22,10 +22,10 @@ org.eclipse.jface.text, org.jboss.tools.common.model.ui;bundle-version=3D"2.0.0", org.jboss.tools.tests;bundle-version=3D"2.0.0";visibility:=3Dreexport, - org.jboss.tools.common.resref.core;bundle-version=3D"1.0.0" + org.jboss.tools.common.resref.core;bundle-version=3D"1.0.0", + org.mozilla.xulrunner.gtk.linux.x86;bundle-version=3D"1.9.1";resolution:= =3Doptional Bundle-ActivationPolicy: lazy -Bundle-ClassPath: vpe-ui-test.jar, - lib/jmock-2.5.1/jmock-2.5.1.jar, +Bundle-ClassPath: lib/jmock-2.5.1/jmock-2.5.1.jar, lib/jmock-2.5.1/hamcrest-core-1.1.jar, lib/jmock-2.5.1/hamcrest-library-1.1.jar Export-Package: org.hamcrest, Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties 2010-05-28= 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/build.properties 2010-05-29= 04:00:19 UTC (rev 22428) @@ -2,7 +2,7 @@ bin.includes =3D META-INF/,\ plugin.xml,\ plugin.properties,\ - vpe-ui-test.jar,\ resources/,\ lib/ -source.vpe-ui-test.jar =3D src/ +jars.compile.order =3D . +source.. =3D src/ Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2010-05-28 22:34:21= UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/pom.xml 2010-05-29 04:00:19= UTC (rev 22428) @@ -11,4 +11,20 @@ org.jboss.tools.vpe.ui.test = 3.1.0-SNAPSHOT eclipse-test-plugin + + + + org.sonatype.tycho + maven-osgi-test-plugin + + + org.jboss.tools.vpe.ui.test + org.mozilla.xulrunner.gtk.linux.x86 + org.jboss.tools.xulrunner.initializer + + + + + + = Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIF= EST.MF =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF= 2010-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/META-INF/MANIFEST.MF= 2010-05-29 04:00:19 UTC (rev 22428) @@ -14,5 +14,4 @@ Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.vpe.xulrunner.test, org.jboss.tools.vpe.xulrunner.view -Bundle-ClassPath: vpe-mozilla-tests.jar Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/build.properti= es =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/build.properties 201= 0-05-28 22:34:21 UTC (rev 22427) +++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/build.properties 201= 0-05-29 04:00:19 UTC (rev 22428) @@ -1,11 +1,11 @@ output.. =3D bin/ bin.includes =3D META-INF/,\ plugin.xml,\ - vpe-mozilla-tests.jar,\ plugin.properties src.includes =3D src/,\ plugin.xml,\ build.properties,\ META-INF/,\ plugin.properties -source.vpe-mozilla-tests.jar =3D src/ +jars.compile.order =3D . +source.. =3D src/ --===============8449392706163336176==-- From jbosstools-commits at lists.jboss.org Sat May 29 00:45:47 2010 Content-Type: multipart/mixed; boundary="===============6186755174609871432==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22429 - branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core. Date: Sat, 29 May 2010 00:45:47 -0400 Message-ID: <201005290445.o4T4jlnL005433@svn01.web.mwc.hst.phx2.redhat.com> --===============6186755174609871432== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-29 00:45:47 -0400 (Sat, 29 May 2010) New Revision: 22429 Modified: branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/src/org= /jboss/tools/esb/core/ESBProjectConstant.java branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/src/org= /jboss/tools/esb/core/ESBProjectCorePlugin.java Log: JBIDE-6221 - allows making esb project a child project to have the proper d= efault extension Modified: branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/= src/org/jboss/tools/esb/core/ESBProjectConstant.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/src/or= g/jboss/tools/esb/core/ESBProjectConstant.java 2010-05-29 04:00:19 UTC (rev= 22428) +++ branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/src/or= g/jboss/tools/esb/core/ESBProjectConstant.java 2010-05-29 04:45:47 UTC (rev= 22429) @@ -12,6 +12,7 @@ = public class ESBProjectConstant { = + public final static String ESB_EXTENSION =3D ".esb"; public final static String ESB_PROJECT_FACET =3D "jst.jboss.esb"; public final static String ESB_PROJECT_FACET_TEMPLATE =3D "template.jst.j= boss.esb"; public final static String BUILD_CLASSES =3D "build/classes"; Modified: branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/= src/org/jboss/tools/esb/core/ESBProjectCorePlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/src/or= g/jboss/tools/esb/core/ESBProjectCorePlugin.java 2010-05-29 04:00:19 UTC (r= ev 22428) +++ branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/src/or= g/jboss/tools/esb/core/ESBProjectCorePlugin.java 2010-05-29 04:45:47 UTC (r= ev 22429) @@ -14,6 +14,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.ui.plugin.AbstractUIPlugin; +import org.eclipse.wst.common.componentcore.internal.util.VirtualReference= Utilities; import org.jboss.tools.esb.core.runtime.JBossRuntimeManager; import org.osgi.framework.BundleContext; = @@ -42,6 +43,7 @@ super.start(context); plugin =3D this; JBossRuntimeManager.loadParsers(); + VirtualReferenceUtilities.INSTANCE.addDefaultExtension(ESBProjectConstan= t.ESB_PROJECT_FACET, ESBProjectConstant.ESB_EXTENSION); } = /* --===============6186755174609871432==-- From jbosstools-commits at lists.jboss.org Sat May 29 02:37:03 2010 Content-Type: multipart/mixed; boundary="===============2181336511165441155==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22430 - trunk/jsf/docs/userguide/en-US/images/visual_page. Date: Sat, 29 May 2010 02:37:03 -0400 Message-ID: <201005290637.o4T6b3wr030281@svn01.web.mwc.hst.phx2.redhat.com> --===============2181336511165441155== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-29 02:37:02 -0400 (Sat, 29 May 2010) New Revision: 22430 Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/export_template.png trunk/jsf/docs/userguide/en-US/images/visual_page/import_template.png Log: https://jira.jboss.org/browse/TOOLSDOC-8 - updated the images as the wizard= titles were changed. Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/export_template= .png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/jsf/docs/userguide/en-US/images/visual_page/import_template= .png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============2181336511165441155==-- From jbosstools-commits at lists.jboss.org Sat May 29 03:06:16 2010 Content-Type: multipart/mixed; boundary="===============6313550581674595700==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22431 - trunk/esb/docs/esb_ref_guide/en-US. Date: Sat, 29 May 2010 03:06:15 -0400 Message-ID: <201005290706.o4T76F6Q007302@svn01.web.mwc.hst.phx2.redhat.com> --===============6313550581674595700== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-29 03:06:15 -0400 (Sat, 29 May 2010) New Revision: 22431 Added: trunk/esb/docs/esb_ref_guide/en-US/reference.xml trunk/esb/docs/esb_ref_guide/en-US/summary.xml trunk/esb/docs/esb_ref_guide/en-US/tasks.xml Modified: trunk/esb/docs/esb_ref_guide/en-US/introduction.xml trunk/esb/docs/esb_ref_guide/en-US/master.xml Log: https://jira.jboss.org/browse/TOOLSDOC-77 - guide restructuring. Modified: trunk/esb/docs/esb_ref_guide/en-US/introduction.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/docs/esb_ref_guide/en-US/introduction.xml 2010-05-29 06:37:02= UTC (rev 22430) +++ trunk/esb/docs/esb_ref_guide/en-US/introduction.xml 2010-05-29 07:06:15= UTC (rev 22431) @@ -18,15 +18,18 @@ =
    = - What is ESB? + What is ESB and JBoss ESB Tools? = - ESB (Enterprise Service Bus) - an abstraction layer on top o= f implementation of an - enterprise messaging system that provides the features Service= Oriented + ESB (Enterprise Service Bus) is an abstraction layer on top = of the implementation of an + enterprise messaging system that provides the features that Se= rvice Oriented Architectures may be implemented with. - If you want to develop applications using ESB technology JBo= ss ESB also meets your - needs. The JBoss Tools provide an ESB editor and all necessary= wizards for creating an ESB + If you want to develop applications using ESB technology JBoss ESB also meets your + needs. Read more about Jboss ESB at http://www.jboss.org/jbossesb. + = + = + JBoss ESB Tools provide an ESB editor a= nd necessary wizard for creating an ESB file. - In this guide we provide you with the information on JBoss E= SB support (installation, configuration and deployment) and usage of ESB Ed= itor which allows you to + In this guide we provide you with the information on JBoss ESB Tools (installation, configuration and deployment) = and usage of ESB Editor which allows you to develop an ESB file much faster and with far fewer errors so s= paring your time. =
    @@ -58,7 +61,7 @@ JBoss Tools Project Examples Wizard Some kinds of projects with predefined st= ructure are available for usage. - Creating ESB = Project using JBoss Tools Project Examples Wizard + Using ESB Pro= ject Examples = @@ -66,7 +69,7 @@ JBoss Enterprise SOA Platform The SOA Platform integrates specific vers= ions of JBoss ESB, jBPM, Drools and the JBoss Enterprise Application Platfo= rm that are certified to work together in a single supported enterprise dis= tribution. - using and configuring = SOA Platform + Using and configuring = SOA Platform = @@ -82,37 +85,20 @@ =
    - = =
    = - =
    - Other relevant resources on the topic - - You can find a set of benefits and other extra information o= n: - - - - JBoss ESB= - - - - - JBo= ss Wiki - - - - - JBoss ESB - Documentation Library - - - - - The latest JBoss Tools/JBoss Developer Studio documentation - builds are available JBoss Tools nightly documentation page. - + Requirements and Installation + = + This section will provide you with the information on how to= install + JBoss ESB plugin into Eclipse. + = + ESB Tools come as one module of JBoss Tools project. Since E= SB Tools have a + dependence on other JBoss Tools modules we recommend you to in= stall a bundle + of all JBoss + Tools plug-ins. You can find all necessary instal= lation instructions on JBoss Wiki in the InstallingJBossTools section.
    + =     Modified: trunk/esb/docs/esb_ref_guide/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/docs/esb_ref_guide/en-US/master.xml 2010-05-29 06:37:02 UTC (= rev 22430) +++ trunk/esb/docs/esb_ref_guide/en-US/master.xml 2010-05-29 07:06:15 UTC (= rev 22431) @@ -3,8 +3,9 @@ "http://www.docbook.org/xml/4.3/docbookx.dtd" = [ - - + + + = @@ -22,7 +23,7 @@ = - ESB Tools Reference Guide + JBoss ESB Tools User Guide = @@ -59,7 +60,8 @@ = = &introduction; - &esb_support; - &esb_editor; = + &tasks; + &reference; = + &summary; = = Added: trunk/esb/docs/esb_ref_guide/en-US/reference.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/docs/esb_ref_guide/en-US/reference.xml = (rev 0) +++ trunk/esb/docs/esb_ref_guide/en-US/reference.xml 2010-05-29 07:06:15 UT= C (rev 22431) @@ -0,0 +1,396 @@ +=EF=BB=BF + + + + + JBoss ESB + Editor + ESB + + + + Reference + = + This chapter includes detailed reference information about JBoss ESB Tools    . + = +
    + + JBoss ESB Editor + = + ESB editor has lots of useful features, they are described = in details in this chapter. + = + ESB File Editor is a powerful and custo= mizable tool which + allows developing an application using ESB technology. + + ESB file editor has two tabs: Tree and Source. + = +
    + Source View + = + You can easily switch from Tree to Source by selecting t= he Source tab at the bottom of + the editor and work in Source view. + = +
    + Source View + + + + + +
    + = + The Source view for the editor displays a text content o= f the ESB file. It is always + synchronized with Tree view, so any c= hanges made in one of the + views will immediately appear in the other. + = + No matter what view you select, you get full integration= with Outline + view. For example, you can work in the Source v= iew with the help of the + Outline view. The Outline view shows a tree structure of t= he ESB file. Simply select any + element in the Outline view and it wi= ll jump to the same place in + the Source editor, so you can navigate through the source = code with Outline view. +
    + Outline View + + + + + +
    + = +
    = + = +
    + Tree View + = + You can switch to Tree. The Tree view for the editor dis= plays all ESB artifacts in a + tree format. By selecting any node you can see and edit it= s properties which will appear + in the right-hand area. For example, a Provider: +
    + Tree View + + + + + +
    + = + Some properties are represented as links to the associat= ed editors. + = +
    + Property Link to the Associated Editor + + + + + +
    + Now when editing ESB actions which refer to other files = (Drools, Groovy, Smooks, etc.), + the label for the field turns into a link to launch the ed= itor associated with that type of file. = +
    + Property Link to the Associated Editor + + + + + +
    + = + Adding, editing or deleting of some artifacts operations= are available right in the + Tree view . Right-click any node and = select one of the + available actions in the context menu. For example, you ca= n easily add a new Provider: + +
    + Adding New Provider + + + + + +
    + Then you can add Channels and Properties for the Provide= rs the same way or using the forms with Add, Edit and + Remove buttons to the right. + = + You can easily add a new Service too: +
    + Adding New Service + + + + + +
    + = + The same way you can create a listener for service and o= ther elements of ESB: +
    + Adding New Listener for Service + + + + + +
    + The same actions can be done in the right part of Tree view tab + (Form editor) using Add, Ed= it and + Remove buttons. + = + Filter can be also edited this way + = +
    + Editing Filter + + + + + +
    + = + = + In order to add a new custom Action to your ESB XML file= you should select the + Actions node under the Services, then right-click and choo= se + New > Custom Action. <= /para> + = +
    + Adding New Custom Action in the Tree View + + + + + +
    + = + Or instead make use of + Add... + button in the Form editor on = the left. +
    + Adding New Custom Action in the Form Editor + + + + + +
    + = + + Note: + Some new components are available to support ESB 4.7= ,such as: + new actions (XsltAction, PersistAction, BpmProcessor, = ScriptingAction), + new processors (EJBProcessor), new routers (HttpRouter= , JMSRouter, EmailRouter). + + + Then you will see Add Action wizard= . There is a need to specify Action name and Action Java class. +
    + Add Action Wizard + + + + + +
    + To get a help with finding a proper class you can select= Browse to open Select = class dialog. +
    + Select class dialog + + + + + +
    + Moreover it's possible to type a Process name<= /property> or select it with Edit Process dialog whi= ch is called out by clicking Browse. +
    + Edit Process dialog + + + + + +
    + = + As you can see on the both figures above, the context me= nu will also prompt you to + insert one of the Actions that are supplied out-of-the-box= with JBoss + ESB. After choosing one an appeared New Pre-Packed Action wizard + will ask you to fill out a name field and other fields spe= cific for each Action + property. For example, for + Content Based Router + Action the wizard looks as follows: + = +
    + Add Pre-Packed Action Wizard + + + + + +
    + = + After confirming creating the Action you can see it in t= he Tree under the + Actions + node and preview as well as edit its settings in t= he Form + editor on the left. + = +
    + Form Editor for Content Based Router + + + + + +
    + = + ESB editor can recognize some speci= fic objects. On the figure you + can see org.jboss.soa.esb.actions.ContentBasedRo= uter in the + Class + section. + = +
    + = +
    + +
    + + ESB Editor Features + JBoss ESB tooling has powerful editor features that help you= easily make use of + content and code assist. + This last chapter covers capabilities on how you can use ESB= editor. + +
    + + ESB Syntax Validation + When working in JBoss ESB editor yo= u are constantly provided + with feedback and contextual error checking as you type. I= n the Source viewer, if at + any point a tag is incorrect or incomplete, an error will = be indicated next to the + line and also in the Problems view be= low. + = +
    + +
    + Support for XML Schema + + JBoss ESB Framework fully s= upports XML files based on + schemas as well as DTDs. + The schema checks the child elements of any kind of prov= ider element; the ESB generates errors on startup if you attempt to define = an incorrect combination (e.g.: a jms-bus inside an ftp-provider). + Note: + The schema used behind ESB editor now uses the lates= t version available (from SOA-P 4.3). This removes the errors/warnings some= users have reported seeing when using SOA-P specific esb.xml files.= + = +
    + + + +
    + + Content Assist for ESB XML File + + When you work with any ESB XML file Content As= sist is + available to help you. It provides pop-up tip to help you = complete your code + statements. It allows you to write your code faster and wi= th more accuracy. Content + assist is always available in the Source mode. Simply type= + Ctrl-Space + to see what is available. + + Content Assist for ESB XML file: +
    + Content Assist for ESB XML file + + + + + +
    + + Content Assist for attributes: +
    + Content Assist for attributes + + + + + +
    + +
    + = +
    + OpenOn for ESB XML File + ESB file comes with the OpenOn feature that allows to make use= of multiple file references in the file just with a click and the + Ctrl key hold down. + = + The OpenOn is implemented for different types of files/pages i= nside the <action> tag: .xsd, .xml, etc. + = +
    + OpenOn for smooks configuration file + + + + + +
    + = + It is also available for classes: + = +
    + OpenOn for classes + + + + + +
    +
    + +
    + + Synchronized Source and Visual Editing + + ESB file can be edited in either source or extra visual = modes at the same time. + + JBoss Tools provide you two different editors to speed y= our development: a + graphical view (Tree) and source (Source). + At the same time, you always have full control over esb so= urce file. Any changes you + make in the source view will immediately appear in the tre= e view. Both views are + synchronized, you can edit the file in any view. + +
    + Two Views are Synchronized + + + + + +
    + = + = +
    +
    + Added: trunk/esb/docs/esb_ref_guide/en-US/summary.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/docs/esb_ref_guide/en-US/summary.xml = (rev 0) +++ trunk/esb/docs/esb_ref_guide/en-US/summary.xml 2010-05-29 07:06:15 UTC = (rev 22431) @@ -0,0 +1,40 @@ + + + + Summary + = + On the whole, this reference supplies you with all necessary inform= ation on the + functionality that JBoss ESB plugin provides for work with JBoss ESB. + = + We hope, this guide helped you to get started with the JBoss ESB To= ols. For additional information you are welcome on JBoss forum. + = +
    + Other Relevant Resources on the Topic + = + You can find a set of benefits and other extra information on: + + + + JBoss ESB + + + + + JBoss Wiki + + + + + JBoss ESB + Documentation Library + + + + = + The latest JBoss Tools/JBoss Developer Studio= documentation + builds are available on the JBoss Tools nightly documentation page. + = +
    +     \ No newline at end of file Added: trunk/esb/docs/esb_ref_guide/en-US/tasks.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/docs/esb_ref_guide/en-US/tasks.xml (r= ev 0) +++ trunk/esb/docs/esb_ref_guide/en-US/tasks.xml 2010-05-29 07:06:15 UTC (r= ev 22431) @@ -0,0 +1,549 @@ + + + + + + JBoss Developer Studio + Eclipse + ESB + Java + JBoss + + + + Tasks + + In this section we will focus on all concepts that JBoss Tools     + integrate for working with JBoss ESB. + +
    + Creating a ESB Project + In this chapter we suggest a step-by-step walk-throu= gh of creating a new + ESB project. Let's try to create a new JBoss = ESB project. + + We will show you how to use the ESB Project Creation= wizard for creating a new ESB project and setting basic ESB classpath. + + Select + File >New > Project... + in the main menu bar or context menu f= or selected project and + then + ESB > ESB Project + in the dialog opened: + +
    + Select a Wizard dialog + + + + + +
    + + Clicking + Next + brings you to the JBoss ESB Project wi= zard page where a project name, ESB version and target JBoss Runtime are to= be specified. Specify, for example, + helloworld + as a Project name and accept the defau= lt ESB version. +
    + JBoss ESB Project wizard + + + + + +
    + By clicking Modify button you can op= en Project Facets Wizard page,where you can select = + facets that should be enabled for this project. + On the Project Facets Wizard page = you can also configure runtime for the application +
    + Project Facets Wizard + + + + + +
    + Next step provides you an opportunity to configure your p= roject for building a java application + = + Clicking + Next on this form + brings you to the ESB facet installati= on page where you can = + specify Java Source Directory and ESB Content Dire= ctory. ESB Content Directory is a folder that contains the most of + artifacts that an ESB archive needs. You also can= configure ESB libraries to the project by selecting a ESB runtime using on= e of the options: + + 1. Use + Server Supplied ESB Runtime + = + = + + 2. Select a ESB runtime from the JBoss ESB runtime list = predefined in the preferences. If you choose the first option, make sure th= at the project has the Target JBoss Runtime set and this runtime has a ESB = runtime installed. = + = + 3. Choose ESB Config Vertion. From the version 3.1.0 JBos= s ESB Tools supports three different jboss-esb.xsd versions: jbossesb-1.0.1= .xsd, jbossesb-1.1.0.xsd and jbossesb-1.2.0.xsd. = + Note: + If you use ESB 4.7 you should select jbossesb-1.2= .0.xsd. = +
    + Install ESB facet step + + + + + +
    + Click + Finish + and a ESB project with the default jboss-esb.xml = + will be created. + +
    + The generated ESB project structure + + + + + +
    + = +
    + = +
    + Using ESB Project Examples + JBoss Tools provides a Project Example wizard that i= s an easy way for users to create some kinds of projects to be used as exam= ples with some predefined structure. Let's start = + creating a ESB project using this wizard. + = + Before creating a ESB project example create JBoss R= untime with name + JBoss 4.2 Runtime, it will be used b= y your ESB project example. + + Select + File >New > Others + , in the main menu bar or context menu= for selected project and + then + JBoss Tools > Project Example= s + in the New dialog: + +
    + Select a wizard - Project Examples + + + + + +
    + + Clicking + Next + brings you to the wizard page where you can select a ESB p= roject example from the example list. + = +
    + Project Example Wizard</tit= le> + <mediaobject> + <imageobject> + <imagedata fileref= =3D"images/esb_project/05a_esb_project_example.png"/> + </imageobject> + </mediaobject> + </figure> + <note> + <title>Note: + Under the Projects + section you can find two categories relate= d to ESB: + = + + ESB= + ESB for SO= A-P 5.0 + + = + = + It means that if you use a runtime pointed t= o a SOA-P 5.0, you should download the examples from + the + ESB for SOA-P 5.0 + category in order to avoid the= incompatibility errors. + + + = + Every ESB example has two projects, one is a ESB pro= ject and another is a Java project used to test the ESB project. + Here is a list of ready examples available in both c= ategories (ESB and ESB for SOA-P 5.0): + = + + = + JBoss ESB = HelloWorld Example - demonstrates the minimal files necessary to= make a basic ESB component execute as well as to prove that the ESB is pro= perly configured. + JBoss ESB = HelloWorld Action Example - demonstrates the use of multiple act= ion invocations from a single configuration. You can use a single Action cl= ass and make multiple method calls or use multiple Action classes. <= /listitem> + JBoss ESB = HelloWorld File Action Example - demonstrates using the File gat= eway feature of the JBoss ESB. Files that are found in a particular directo= ry with a particular extension are sent to a JMS queue with actions for pro= cessing. + JBoss ESB = Web Service consumer1 Example - demonstrates how to consume a 18= 1 Web Service in an ESB action. + JBoss ESB = Web Service producer Example - demonstrates how to deploy a JSR1= 81 Webservice endpoint on JBossESB using the SOAPProcessor action. + JBoss ESB = Smooks CSV -> XML Example - demonstrates how to transform a c= omma separated value (CSV) file to an XML. + JBoss ESB = Smooks XML -> POJO Example - demonstrates the use of Smooks p= erforming a simple transformation by converting an XML file into Java POJOs= . + JBoss ESB = Smooks XML -> XML date-manipulation Example - demonstrates ho= w to manually define and apply a Message Transformation within JBoss ESB. = + JBoss ESB = Smooks XML -> XML Example - a very basic example of how to ma= nually define and apply a Message Transformation within JBoss ESB. It appli= es a very simple XSLT to a SampleOrder.xml message and prints the before an= d after XML to the console. + = + + = + = + + We will take as our example JBoss ESB HelloW= orld Example ESB and Client project: + = + = +
    + JBoss Tools ESB Project Examples + + + + + +
    + = + = + Choose them using the Ctrl button and then click = + Finish. As a result you will= get two projects created: +
    + JBoss ESB Project Examples: helloworld and = helloworld_testclient + + + + + +
    + = + Deploy the HelloWorld ESB project and run a test cl= ass in the client Java project to see the test result in the Console view.<= /para> +
    + +
    + Deploying a ESB Project + In this chapter you will see how to deploy a ESB pro= ject using the WTP deployment framework. + + Before deploying the project, open the Servers View = by selecting Window > Show View > Other > = + Server > Servers, = + create a JBoss Server in the Server view and start it, and= then right click the created JBoss server, = + select Add and Remove Pro= jects, = + and add the ESB projects you want to deploy from the left = side to the right side in the opened dialog. + +
    + Add and Remove Projects + + + + + +
    + = + Click Finish to add the project to the server. = + You also can drag the ESB project from the Project View to= the server. + = +
    + Servers View + + + + + +
    + = + Thus, you have just added the ESB project to the JBoss se= rver module list. Right click the JBoss Server and select Publish to publish the project on the server. + You can check the deploying result in the Console view. = + The Run and Debug options work on ESB projects c= ausing a (re)deploy for a user designated server. + You can also use the "Finger touch" for a quick restart o= f the project without restarting the server: +
    + Finger Touch button + + + + + +
    = + The "Finger" touches descriptors dependent on project (i.= e. web.xml for WAR, application.xml for EAR) and now it is also available f= or jboss-esb.xml in ESB projects. + You can also deploy your ESB project as an .esb arch= ive. Right-click on the project, choose Export: + = +
    + Export of ESB project + + + + + +
    = + = + Choose ESB > ESB File and click Ne= xt: = + = +
    Choosing ESB File + + + + + +
    = + = + And finally export the ESB project to the file system: choose the = destination, choose the target runtime if need a specific one and make the = appropriate settings for the archive. Then click Finish= . + = +
    ESB Export + + + + + +
    = + = + Your project is deployed as an .esb archive. + An ESB archive can be created for ESB projects only. It i= s also possible to deploy an .esb archive to a JBoss AS based server with J= Boss ESB installed. = + = + = +
    + = +
    + Creating a ESB File + In this chapter we suggest a step-by-step walk-throu= gh of creating your own + simple file. Let's try to organize a new ESB = file. + + We will show you how to use the Creation wizard for = creating a new ESB file. + + At first you should open any project. Select + File >New > Other... + in the main menu bar or context menu f= or selected project and + then + ESB > ESB File + in the New dialog: + +
    + Select a wizard - ESB File + + + + + +
    + + Clicking + Next + brings you to the wizard page where a = folder, a name and a version for the file should be specified. Choose, for = example, + jboss-esb.xml + as the name and accept the selected pr= ojects folder and the default + version. + = + Note: + From the version 3.1.0 JBoss ESB Tools suppor= ts three different jboss-esb.xsd versions: jbossesb-1.0.1.xsd, jbossesb-1.1= .0.xsd and jbossesb-1.2.0.xsd. + If you use ESB 4.7 you should select jbossesb= -1.2.0.xsd. + + +
    + Folder, Name and Version for ESB file</titl= e> + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/esb_s= upport/02_create_esb.png"/> + </imageobject> + </mediaobject> + </figure> + + <para>Thus, your file will be created in the selected proj= ects folder by default. If + you want to change the folder for your future file= click <emphasis> + <property>Browse...</property> + </emphasis> button to set needed folder or simply = type it.</para> + + <para>Clicking on <emphasis> + <property>Finish</property> + </emphasis> results in the file being generated. T= he wizard creates one xml + file.</para> + + </section> + <section id=3D"creating_esb_action"> + <title>Creating a ESB Action + From this chapter you will find out how to create a= ESB Action Java File. + At first you need to open a ESB= or simple Java project. Then you should select File > New>Other in the main menu or fr= om the context project menu. Then click ESB > ESB Acti= on in the New dialog. +
    + Select a wizard - ESB Action + + + + + = + +
    + After that click Next= and you will be brought to the New ESB Acti= on wizard. In this wizard the class name should be sp= ecified, also you can set a package or add a interface as for any Java clas= s. +
    + New ESB Action wizard + + + + + = + +
    + As a result, the ESB Action Java File will be created in the selected package and it will have o= rg.jboss.soa.esb.actions.AbstractActionPipelineProcessor as supe= rclass. + Clicking on Finish will generate the ESB Action class. Also this= class will become available in ESB Editor wizards. +
    + = +
    + Configuring ESB Runtime in Preferences + In this chapter you will know how to predefine a JBo= ss ESB runtime on the Preferences page. + + You may already know, there are two ways to set JBos= s ESB runtime when creating a ESB project, + one is to use the project target JBoss runtime, and anothe= r is to select a JBoss ESB runtime predefined in JBoss Tools preferences. + Let's configure it. + + Select + Window >Preferences > JBos= s Tools > JBoss ESB Runtime + , to open the JBoss ESB Runtime Prefere= nces page where you can add, remove and Edit a JBoss ESB runtime. + +
    + JBoss ESB Runtimes + + + + + +
    + + Select Add to open a dialog where you can specify the JBoss ESB runtime location, n= ame and version number. It's also possible to define configuration if you p= oint the home location to a Jboss AS or SOA-p, in case you select a standal= one ESB runtime location, the configuration combo will be empty and should = be ignored. = + You can also customize the libraries of the runti= me by checking the Customize JBoss ESB Runtime jars checkbox. + = +
    + Configure new JBoss ESB Runtime + + + + + +
    + + The new JBoss ESB Runtime will be configured. Click <= property>OK to finish and save the preferences. + You can use the configuration when creating a JBoss ESB project. + When a ESB runtime is configured for your ESB proje= ct you are able to change it to any other using the classpath container pag= e for ESB runtime. To do that, turn to the Package Explorer view and right-= click the "JBoss ESB Runtime" library. Select Propertie= s and a table listing all available JBoss ESB runtime= s will appear: + = +
    + Classpath Container Page to change ESB run= time + + + + + +
    + = + = + = + Choose one of them to set to the ESB project and cl= ick Ok. + ESB container allows Source and JavaDoc locations t= o be set via the Properties dialog on each contained .jar: right-click on a= ny .jar file, select Properties. = Choose Java Source Attachment and= select location (folder, JAR or zip) containing new source for the chosen = .jar using one of the suggested options (workspace, external folder or file= ) or enter the path manually: + = +
    + Classpath Container: Java Source Attachmen= t + + + + + +
    + Click on Apply an= d then on Ok. + To change Javadoc Location choose Javad= oc Location and specify URL to the documentation gene= rated by Javadoc. The Javadoc location will contain a file called package-list: + = +
    + Classpath Container: Javadoc Location</tit= le> + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/esb_= project/22_Javadoc.png"/> + </imageobject> + </mediaobject> + </figure> + <para>Click on <emphasis><property>Apply</property></emph= asis> and then on <emphasis><property>Ok</property></emphasis>.</para> + = + </section> + + + <section id=3D"using_SOA"> = + <title>Using and Configuring SOA Platform + = + In this chapter you will know what is JBoss Enterpri= se SOA Platform and how you can configure it to use for your ESB projects.= + = + JBoss Enterprise SOA Platform delivers a flexible, s= tandards-based platform to integrate applications, SOA services, business e= vents and automate business processes. The SOA Platform integrates specific= versions of JBoss ESB, jBPM, Drools and the JBoss Enterprise Application P= latform that are certified to work together in a single supported enterpris= e distribution. + Having configured JBoss Enterprise SOA Platform for = your ESB project you don't need to install and configure ESB server and run= time as they are already included. + + Check here to find more details on the platform: JBoss Enterprise SO= A Platform and JBoss Enterprise SOA Platform Component Details.<= /para> + You can find out what is SOA here: Basics of SOA a= nd SO= A and EOA. + = + To configure the JBoss Enterprise SOA platform selec= t + Window > Preferences > Server >= ; Runtime Environments, that will open the Server Run= time Environments Preferences page where you can add, remove and edit a Ser= ver Runtime Environment. + = +
    + Configure new Server Runtime Environment</t= itle> + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/esb_p= roject/13NewServerRuntimeEnv.png"/> + </imageobject> + </mediaobject> + </figure> + = + <para>Select <emphasis><property>Add</property></emphasis>= , choose <emphasis><property>JBoss 4.2 Runtime</property></emphasis> as a t= ype of runtime environment, check the <emphasis><property>Create a new loca= l server</property></emphasis> checkbox and click <emphasis><property>Next<= /property></emphasis>:</para> = + <figure> + <title>Type of Server Runtime Environment + + + + + +
    + = + On the next step you can specify a name of the serve= r runtime environment and browse to its location. Click Finish to add the server runtime environment. + = + = +
    + New Server Runtime Environment Details</tit= le> + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/esb_p= roject/15AddNew.png"/> + </imageobject> + </mediaobject> + </figure> + <para>Now you have your SOA platform configured. To check = the configuration create a ESB Project using instructions described <xref l= inkend=3D"ESB_project_wizard"/>. As a result you will have two projects cre= ated:</para> + = + <figure> + <title>Helloworld Projects Created + + + + + +
    + Then you will need to add JBoss ESB libraries to you= r projects to configure the SOA server runtime exactly for your projects. R= ight-click on your project, select Build Path > Add = Libraries: + = +
    + Add Libraries + + + + + +
    + = + Choose JBoss ESB Libraries and click Next: + = +
    + ESB Libraries + + + + + +
    + = + Select the necessary runtime to add to the project c= lasspath: + = + = +
    + Select a ESB runtime + + + + + +
    + Click Finish. + Now you can deploy your Helloworld project to the s= erver and run a test class in the client Java project to see the test resul= t in the Console view. + = + = + = +
    + = + = + = + = + = + = + = + = + = + = + \ No newline at end of file --===============6313550581674595700==-- From jbosstools-commits at lists.jboss.org Sat May 29 03:06:42 2010 Content-Type: multipart/mixed; boundary="===============0187400097666186453==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22432 - trunk/esb/docs/esb_ref_guide/en-US. Date: Sat, 29 May 2010 03:06:41 -0400 Message-ID: <201005290706.o4T76fMl007312@svn01.web.mwc.hst.phx2.redhat.com> --===============0187400097666186453== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-29 03:06:41 -0400 (Sat, 29 May 2010) New Revision: 22432 Removed: trunk/esb/docs/esb_ref_guide/en-US/esb_editor.xml trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml Log: https://jira.jboss.org/browse/TOOLSDOC-77 - deleted files during guide rest= ructuring. Deleted: trunk/esb/docs/esb_ref_guide/en-US/esb_editor.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/docs/esb_ref_guide/en-US/esb_editor.xml 2010-05-29 07:06:15 U= TC (rev 22431) +++ trunk/esb/docs/esb_ref_guide/en-US/esb_editor.xml 2010-05-29 07:06:41 U= TC (rev 22432) @@ -1,389 +0,0 @@ -=EF=BB=BF - - - - - JBoss ESB - Editor - ESB - - - - ESB Editor - - ESB editor has lots of useful features, they are described in d= etails in this chapter. In - addition you'll get to know how ESB Editor uses combined - visual and source editing of esb files. - -
    - - ESB File Editor - ESB File Editor is a powerful and custo= mizable tool. ESB File - Editor allows developing an application using ESB technology.<= /para> - - ESB file editor has two tabs: Tree and Source. - - You can switch to Tree. The Tree view for the editor display= s all ESB artifacts in a - tree format. By selecting any node you can see and edit its pr= operties which will appear - in the right-hand area. For example, a Provider: -
    - Tree View - - - - - -
    - = - Some properties are represented as links to the associated e= ditors. - = -
    - Property Link to the Associated Editor - - - - - -
    - Now when editing ESB actions which refer to other files (Dro= ols, Groovy, Smooks, etc.), - the label for the field turns into a link to launch the editor= associated with that type of file. = -
    - Property Link to the Associated Editor - - - - - -
    - You can easily switch from Tree to Source by selecting the S= ource tab at the bottom of - the editor and work in Source view. - -
    - Source View - - - - - -
    - - The Source view for the editor displays a text content of th= e ESB file. It is always - synchronized with Tree view, so any chang= es made in one of the - views will immediately appear in the other. - - No matter what view you select, you get full integration wit= h Outline - view. For example, you can work in the Source view = with the help of the - Outline view. The Outline view shows a tree structure of the E= SB file. Simply select any - element in the Outline view and it will j= ump to the same place in - the Source editor, so you can navigate through the source code= with Outline view. -
    - Outline View - - - - - -
    - - Adding, editing or deleting of some artifacts operations are= available right in the - Tree view . Right-click any node and = select one of the - available actions in the context menu. For example, you can ea= sily add a new Provider: - -
    - Adding New Provider - - - - - -
    - Then you can add Channels and Properties for the Providers t= he same way or using the forms with Add, Edi= t and - Remove buttons to the right. - - You can easily add a new Service too: -
    - Adding New Service - - - - - -
    - = - The same way you can create a listener for service and other= elements of ESB: -
    - Adding New Listener for Service - - - - - -
    - The same actions can be done in the right part of = Tree view tab - (Form editor) using Add, Edit and - Remove buttons. - = - Filter can be also edited this way - = -
    - Editing Filter - - - - - -
    - - - In order to add a new custom Action to your ESB XML file you= should select the - Actions node under the Services, then right-click and choose <= emphasis> - New > Custom Action. - -
    - Adding New Custom Action in the Tree View - - - - - -
    - - Or instead make use of - Add... - button in the Form editor on = the left. -
    - Adding New Custom Action in the Form Editor - - - - - -
    - = - - Note: - Some new components are available to support ESB 4.7,such a= s: - new actions (XsltAction, PersistAction, BpmProcessor, Scripti= ngAction), - new processors (EJBProcessor), new routers (HttpRouter, JMSRo= uter, EmailRouter). - - - Then you will see Add Action wizard. Th= ere is a need to specify Action name and Ac= tion Java class. -
    - Add Action Wizard - - - - - -
    - To get a help with finding a proper class you can select Browse to open Select clas= s dialog. -
    - Select class dialog - - - - - -
    - Moreover it's possible to type a Process name or select it with Edit Process dialog which i= s called out by clicking Browse. = -
    - Edit Process dialog - - - - - -
    - - As you can see on the both figures above, the context menu w= ill also prompt you to - insert one of the Actions that are supplied out-of-the-box wit= h JBoss - ESB. After choosing one an appeared N= ew Pre-Packed Action wizard - will ask you to fill out a name field and other fields specifi= c for each Action - property. For example, for - Content Based Router - Action the wizard looks as follows: - -
    - Add Pre-Packed Action Wizard - - - - - -
    - - After confirming creating the Action you can see it in the T= ree under the - Actions - node and preview as well as edit its settings in t= he Form - editor on the left. - -
    - Form Editor for Content Based Router - - - - - -
    - - ESB editor can recognize some specific = objects. On the figure you - can see org.jboss.soa.esb.actions.ContentBasedRouter= in the - Class - section. - -
    - -
    - - ESB Editors Features - JBoss ESB tooling has powerful editor features that help you= easily make use of - content and code assist. - This last chapter covers capabilities on how you can use ESB= editor. - -
    - - ESB syntax validation - When working in JBoss ESB editor yo= u are constantly provided - with feedback and contextual error checking as you type. I= n the Source viewer, if at - any point a tag is incorrect or incomplete, an error will = be indicated next to the - line and also in the Problems view be= low. - = -
    - -
    - Support for XML Schema - - JBoss ESB Framework fully s= upports XML files based on - schemas as well as DTDs. - The schema checks the child elements of any kind of prov= ider element; the ESB generates errors on startup if you attempt to define = an incorrect combination (e.g.: a jms-bus inside an ftp-provider). - Note: - The schema used behind ESB editor now uses the lates= t version available (from SOA-P 4.3). This removes the errors/warnings some= users have reported seeing when using SOA-P specific esb.xml files.= - = -
    - - - -
    - - Content Assist for ESB XML file - - When you work with any ESB XML file Content As= sist is - available to help you. It provides pop-up tip to help you = complete your code - statements. It allows you to write your code faster and wi= th more accuracy. Content - assist is always available in the Source mode. Simply type= - Ctrl-Space - to see what is available. - - Content Assist for ESB XML file: -
    - Content Assist for ESB XML file - - - - - -
    - - Content Assist for attributes: -
    - Content Assist for attributes - - - - - -
    - -
    - = -
    - OpenOn for ESB XML file - ESB file comes with the OpenOn feature that allows to make use= of multiple file references in the file just with a click and the - Ctrl key hold down. - = - The OpenOn is implemented for different types of files/pages i= nside the <action> tag: .xsd, .xml, etc. - = -
    - OpenOn for smooks configuration file - - - - - -
    - = - It is also available for classes: - = -
    - OpenOn for classes - - - - - -
    -
    - -
    - - Synchronized Source and Visual Editing - - ESB file can be edited in either source or extra visual = modes at the same time. - - JBoss Tools provide you two different editors to speed y= our development: a - graphical view (Tree) and source (Source). - At the same time, you always have full control over esb so= urce file. Any changes you - make in the source view will immediately appear in the tre= e view. Both views are - synchronized, you can edit the file in any view. - -
    - Two Views are Synchronized - - - - - -
    - = - In summary, this reference supplies you with all necessa= ry information on the - functionality that JBoss ESB Editor provides for work with JBo= ss ESB. - = - We hope, this guide helped you to get started with the J= Boss ESB Tools. Besides, for additional information you are welcome on JBoss forum. - = -
    -
    -     Deleted: trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml 2010-05-29 07:06:15 = UTC (rev 22431) +++ trunk/esb/docs/esb_ref_guide/en-US/esb_support.xml 2010-05-29 07:06:41 = UTC (rev 22432) @@ -1,562 +0,0 @@ - - - - - - JBoss Developer Studio - Eclipse - ESB - Java - JBoss - - - - ESB Support - - In this section we will focus on all concepts that JBoss Tools     - integrate for working with JBoss ESB. - -
    - ESB Tools Installation - - This chapter will provide you with the information o= n how to install - JBoss ESB plugin into Eclipse. - - ESB Tools come as one module of JBoss Tools project.= Since ESB Tools have a - dependence on other JBoss Tools modules we recomme= nd you to install a bundle - of all JBoss - Tools plug-ins. You can find all = necessary installation instructions on JBoss Wiki in the InstallingJBossTools section. -
    - -
    - Creating a ESB Project - In this chapter we suggest a step-by-step walk-throu= gh of creating a new - ESB project. Let's try to create a new JBoss = ESB project. - - We will show you how to use the ESB Project Creation= wizard for creating a new ESB project and setting basic ESB classpath. - - Select - File >New > Project... - in the main menu bar or context menu f= or selected project and - then - ESB > ESB Project - in the dialog opened: - -
    - Select a Wizard dialog - - - - - -
    - - Clicking - Next - brings you to the JBoss ESB Project wi= zard page where a project name, ESB version and target JBoss Runtime are to= be specified. Specify, for example, - helloworld - as a Project name and accept the defau= lt ESB version. -
    - JBoss ESB Project wizard - - - - - -
    - By clicking Modify button you can op= en Project Facets Wizard page,where you can select = - facets that should be enabled for this project. - On the Project Facets Wizard page = you can also configure runtime for the application -
    - Project Facets Wizard - - - - - -
    - Next step provides you an opportunity to configure your p= roject for building a java application - = - Clicking - Next on this form - brings you to the ESB facet installati= on page where you can = - specify Java Source Directory and ESB Content Dire= ctory. ESB Content Directory is a folder that contains the most of - artifacts that an ESB archive needs. You also can= configure ESB libraries to the project by selecting a ESB runtime using on= e of the options: - - 1. Use - Server Supplied ESB Runtime - = - = - - 2. Select a ESB runtime from the JBoss ESB runtime list = predefined in the preferences. If you choose the first option, make sure th= at the project has the Target JBoss Runtime set and this runtime has a ESB = runtime installed. = - = - 3. Choose ESB Config Vertion. From the version 3.1.0 JBos= s ESB Tools supports three different jboss-esb.xsd versions: jbossesb-1.0.1= .xsd, jbossesb-1.1.0.xsd and jbossesb-1.2.0.xsd. = - Note: - If you use ESB 4.7 you should select jbossesb-1.2= .0.xsd. = -
    - Install ESB facet step - - - - - -
    - Click - Finish - and a ESB project with the default jboss-esb.xml = - will be created. - -
    - The generated ESB project structure - - - - - -
    - = -
    - = -
    - Creating ESB Project using JBoss Tools Project Exam= ples Wizard - JBoss Tools provides a Project Example wizard that i= s an easy way for users to create some kinds of projects to be used as exam= ples with some predefined structure. Let's start = - creating a ESB project using this wizard. - = - Before creating a ESB project example create JBoss R= untime with name - JBoss 4.2 Runtime, it will be used b= y your ESB project example. - - Select - File >New > Others - , in the main menu bar or context menu= for selected project and - then - JBoss Tools > Project Example= s - in the New dialog: - -
    - Select a wizard - Project Examples - - - - - -
    - - Clicking - Next - brings you to the wizard page where you can select a ESB p= roject example from the example list. - = -
    - Project Example Wizard</tit= le> - <mediaobject> - <imageobject> - <imagedata fileref= =3D"images/esb_project/05a_esb_project_example.png"/> - </imageobject> - </mediaobject> - </figure> - <note> - <title>Note: - Under the Projects - section you can find two categories relate= d to ESB: - = - - ESB= - ESB for SO= A-P 5.0 - - = - = - It means that if you use a runtime pointed t= o a SOA-P 5.0, you should download the examples from - the - ESB for SOA-P 5.0 - category in order to avoid the= incompatibility errors. - - - = - Every ESB example has two projects, one is a ESB pro= ject and another is a Java project used to test the ESB project. - Here is a list of ready examples available in both c= ategories (ESB and ESB for SOA-P 5.0): - = - - = - JBoss ESB = HelloWorld Example - demonstrates the minimal files necessary to= make a basic ESB component execute as well as to prove that the ESB is pro= perly configured. - JBoss ESB = HelloWorld Action Example - demonstrates the use of multiple act= ion invocations from a single configuration. You can use a single Action cl= ass and make multiple method calls or use multiple Action classes. <= /listitem> - JBoss ESB = HelloWorld File Action Example - demonstrates using the File gat= eway feature of the JBoss ESB. Files that are found in a particular directo= ry with a particular extension are sent to a JMS queue with actions for pro= cessing. - JBoss ESB = Web Service consumer1 Example - demonstrates how to consume a 18= 1 Web Service in an ESB action. - JBoss ESB = Web Service producer Example - demonstrates how to deploy a JSR1= 81 Webservice endpoint on JBossESB using the SOAPProcessor action. - JBoss ESB = Smooks CSV -> XML Example - demonstrates how to transform a c= omma separated value (CSV) file to an XML. - JBoss ESB = Smooks XML -> POJO Example - demonstrates the use of Smooks p= erforming a simple transformation by converting an XML file into Java POJOs= . - JBoss ESB = Smooks XML -> XML date-manipulation Example - demonstrates ho= w to manually define and apply a Message Transformation within JBoss ESB. = - JBoss ESB = Smooks XML -> XML Example - a very basic example of how to ma= nually define and apply a Message Transformation within JBoss ESB. It appli= es a very simple XSLT to a SampleOrder.xml message and prints the before an= d after XML to the console. - = - - = - = - - We will take as our example JBoss ESB HelloW= orld Example ESB and Client project: - = - = -
    - JBoss Tools ESB Project Examples - - - - - -
    - = - = - Choose them using the Ctrl button and then click = - Finish. As a result you will= get two projects created: -
    - JBoss ESB Project Examples: helloworld and = helloworld_testclient - - - - - -
    - = - Deploy the HelloWorld ESB project and run a test cl= ass in the client Java project to see the test result in the Console view.<= /para> -
    - -
    - Deploying a ESB Project - In this chapter you will see how to deploy a ESB pro= ject using the WTP deployment framework. - - Before deploying the project, open the Servers View = by selecting Window > Show View > Other > = - Server > Servers, = - create a JBoss Server in the Server view and start it, and= then right click the created JBoss server, = - select Add and Remove Pro= jects, = - and add the ESB projects you want to deploy from the left = side to the right side in the opened dialog. - -
    - Add and Remove Projects - - - - - -
    - = - Click Finish to add the project to the server. = - You also can drag the ESB project from the Project View to= the server. - = -
    - Servers View - - - - - -
    - = - Thus, you have just added the ESB project to the JBoss se= rver module list. Right click the JBoss Server and select Publish to publish the project on the server. - You can check the deploying result in the Console view. = - The Run and Debug options work on ESB projects c= ausing a (re)deploy for a user designated server. - You can also use the "Finger touch" for a quick restart o= f the project without restarting the server: -
    - Finger Touch button - - - - - -
    = - The "Finger" touches descriptors dependent on project (i.= e. web.xml for WAR, application.xml for EAR) and now it is also available f= or jboss-esb.xml in ESB projects. - You can also deploy your ESB project as an .esb arch= ive. Right-click on the project, choose Export: - = -
    - Export of ESB project - - - - - -
    = - = - Choose ESB > ESB File and click Ne= xt: = - = -
    Choosing ESB File - - - - - -
    = - = - And finally export the ESB project to the file system: choose the = destination, choose the target runtime if need a specific one and make the = appropriate settings for the archive. Then click Finish= . - = -
    ESB Export - - - - - -
    = - = - Your project is deployed as an .esb archive. - An ESB archive can be created for ESB projects only. It i= s also possible to deploy an .esb archive to a JBoss AS based server with J= Boss ESB installed. = - = - = -
    - = -
    - Creating a ESB File - In this chapter we suggest a step-by-step walk-throu= gh of creating your own - simple file. Let's try to organize a new ESB = file. - - We will show you how to use the Creation wizard for = creating a new ESB file. - - At first you should open any project. Select - File >New > Other... - in the main menu bar or context menu f= or selected project and - then - ESB > ESB File - in the New dialog: - -
    - Select a wizard - ESB File - - - - - -
    - - Clicking - Next - brings you to the wizard page where a = folder, a name and a version for the file should be specified. Choose, for = example, - jboss-esb.xml - as the name and accept the selected pr= ojects folder and the default - version. - = - Note: - From the version 3.1.0 JBoss ESB Tools suppor= ts three different jboss-esb.xsd versions: jbossesb-1.0.1.xsd, jbossesb-1.1= .0.xsd and jbossesb-1.2.0.xsd. - If you use ESB 4.7 you should select jbossesb= -1.2.0.xsd. - - -
    - Folder, Name and Version for ESB file</titl= e> - <mediaobject> - <imageobject> - <imagedata fileref=3D"images/esb_s= upport/02_create_esb.png"/> - </imageobject> - </mediaobject> - </figure> - - <para>Thus, your file will be created in the selected proj= ects folder by default. If - you want to change the folder for your future file= click <emphasis> - <property>Browse...</property> - </emphasis> button to set needed folder or simply = type it.</para> - - <para>Clicking on <emphasis> - <property>Finish</property> - </emphasis> results in the file being generated. T= he wizard creates one xml - file.</para> - - </section> - <section id=3D"creating_esb_action"> - <title>Creating a ESB Action - From this chapter you will find out how to create a= ESB Action Java File. - At first you need to open a ESB= or simple Java project. Then you should select File > New>Other in the main menu or fr= om the context project menu. Then click ESB > ESB Acti= on in the New dialog. -
    - Select a wizard - ESB Action - - - - - = - -
    - After that click Next= and you will be brought to the New ESB Acti= on wizard. In this wizard the class name should be sp= ecified, also you can set a package or add a interface as for any Java clas= s. -
    - New ESB Action wizard - - - - - = - -
    - As a result, the ESB Action Java File will be created in the selected package and it will have o= rg.jboss.soa.esb.actions.AbstractActionPipelineProcessor as supe= rclass. - Clicking on Finish will generate the ESB Action class. Also this= class will become available in ESB Editor wizards. -
    - = -
    - Configuring ESB Runtime in Preferences - In this chapter you will know how to predefine a JBo= ss ESB runtime on the Preferences page. - - You may already know, there are two ways to set JBos= s ESB runtime when creating a ESB project, - one is to use the project target JBoss runtime, and anothe= r is to select a JBoss ESB runtime predefined in JBoss Tools preferences. - Let's configure it. - - Select - Window >Preferences > JBos= s Tools > JBoss ESB Runtime - , to open the JBoss ESB Runtime Prefere= nces page where you can add, remove and Edit a JBoss ESB runtime. - -
    - JBoss ESB Runtimes - - - - - -
    - - Select Add to open a dialog where you can specify the JBoss ESB runtime location, n= ame and version number. It's also possible to define configuration if you p= oint the home location to a Jboss AS or SOA-p, in case you select a standal= one ESB runtime location, the configuration combo will be empty and should = be ignored. = - You can also customize the libraries of the runti= me by checking the Customize JBoss ESB Runtime jars checkbox. - = -
    - Configure new JBoss ESB Runtime - - - - - -
    - - The new JBoss ESB Runtime will be configured. Click <= property>OK to finish and save the preferences. - You can use the configuration when creating a JBoss ESB project. - When a ESB runtime is configured for your ESB proje= ct you are able to change it to any other using the classpath container pag= e for ESB runtime. To do that, turn to the Package Explorer view and right-= click the "JBoss ESB Runtime" library. Select Propertie= s and a table listing all available JBoss ESB runtime= s will appear: - = -
    - Classpath Container Page to change ESB run= time - - - - - -
    - = - = - = - Choose one of them to set to the ESB project and cl= ick Ok. - ESB container allows Source and JavaDoc locations t= o be set via the Properties dialog on each contained .jar: right-click on a= ny .jar file, select Properties. = Choose Java Source Attachment and= select location (folder, JAR or zip) containing new source for the chosen = .jar using one of the suggested options (workspace, external folder or file= ) or enter the path manually: - = -
    - Classpath Container: Java Source Attachmen= t - - - - - -
    - Click on Apply an= d then on Ok. - To change Javadoc Location choose Javad= oc Location and specify URL to the documentation gene= rated by Javadoc. The Javadoc location will contain a file called package-list: - = -
    - Classpath Container: Javadoc Location</tit= le> - <mediaobject> - <imageobject> - <imagedata fileref=3D"images/esb_= project/22_Javadoc.png"/> - </imageobject> - </mediaobject> - </figure> - <para>Click on <emphasis><property>Apply</property></emph= asis> and then on <emphasis><property>Ok</property></emphasis>.</para> - = - </section> - - - <section id=3D"using_SOA"> = - <title>Using and Configuring SOA Platform - = - In this chapter you will know what is JBoss Enterpri= se SOA Platform and how you can configure it to use for your ESB projects.= - = - JBoss Enterprise SOA Platform delivers a flexible, s= tandards-based platform to integrate applications, SOA services, business e= vents and automate business processes. The SOA Platform integrates specific= versions of JBoss ESB, jBPM, Drools and the JBoss Enterprise Application P= latform that are certified to work together in a single supported enterpris= e distribution. - Having configured JBoss Enterprise SOA Platform for = your ESB project you don't need to install and configure ESB server and run= time as they are already included. - - Check here to find more details on the platform: JBoss Enterprise SO= A Platform and JBoss Enterprise SOA Platform Component Details.<= /para> - You can find out what is SOA here: Basics of SOA a= nd SO= A and EOA. - = - To configure the JBoss Enterprise SOA platform selec= t - Window > Preferences > Server >= ; Runtime Environments, that will open the Server Run= time Environments Preferences page where you can add, remove and edit a Ser= ver Runtime Environment. - = -
    - Configure new Server Runtime Environment</t= itle> - <mediaobject> - <imageobject> - <imagedata fileref=3D"images/esb_p= roject/13NewServerRuntimeEnv.png"/> - </imageobject> - </mediaobject> - </figure> - = - <para>Select <emphasis><property>Add</property></emphasis>= , choose <emphasis><property>JBoss 4.2 Runtime</property></emphasis> as a t= ype of runtime environment, check the <emphasis><property>Create a new loca= l server</property></emphasis> checkbox and click <emphasis><property>Next<= /property></emphasis>:</para> = - <figure> - <title>Type of Server Runtime Environment - - - - - -
    - = - On the next step you can specify a name of the serve= r runtime environment and browse to its location. Click Finish to add the server runtime environment. - = - = -
    - New Server Runtime Environment Details</tit= le> - <mediaobject> - <imageobject> - <imagedata fileref=3D"images/esb_p= roject/15AddNew.png"/> - </imageobject> - </mediaobject> - </figure> - <para>Now you have your SOA platform configured. To check = the configuration create a ESB Project using instructions described <xref l= inkend=3D"ESB_project_wizard"/>. As a result you will have two projects cre= ated:</para> - = - <figure> - <title>Helloworld Projects Created - - - - - -
    - Then you will need to add JBoss ESB libraries to you= r projects to configure the SOA server runtime exactly for your projects. R= ight-click on your project, select Build Path > Add = Libraries: - = -
    - Add Libraries - - - - - -
    - = - Choose JBoss ESB Libraries and click Next: - = -
    - ESB Libraries - - - - - -
    - = - Select the necessary runtime to add to the project c= lasspath: - = - = -
    - Select a ESB runtime - - - - - -
    - Click Finish. - Now you can deploy your Helloworld project to the s= erver and run a test class in the client Java project to see the test resul= t in the Console view. - = - = - = -
    - = - = - = - = - = - = - = - = - = - = - \ No newline at end of file --===============0187400097666186453==-- From jbosstools-commits at lists.jboss.org Sat May 29 12:00:25 2010 Content-Type: multipart/mixed; boundary="===============4266631440857190316==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22433 - trunk/jbpm/docs/reference/en-US. Date: Sat, 29 May 2010 12:00:24 -0400 Message-ID: <201005291600.o4TG0ObB018148@svn01.web.mwc.hst.phx2.redhat.com> --===============4266631440857190316== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-29 12:00:24 -0400 (Sat, 29 May 2010) New Revision: 22433 Modified: trunk/jbpm/docs/reference/en-US/the_views.xml Log: Authenticated deployment is documented https://jira.jboss.org/browse/TOOLSDOC-80 Modified: trunk/jbpm/docs/reference/en-US/the_views.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/the_views.xml 2010-05-29 07:06:41 UTC (= rev 22432) +++ trunk/jbpm/docs/reference/en-US/the_views.xml 2010-05-29 16:00:24 UTC (= rev 22433) @@ -367,10 +367,16 @@ = - The button - Test Connections - is necessary to make sure whether all your set= tings are valid before + The Test Connections button can be = used to check whether all your settings are valid before deploying the process. + + To deploy the process on the server you should click = the Delpoy Process Archive button. + + However, prior to testing the connection and deplo= ying the process on the server you need to + make sure the server is configured to support jBPM funct= ionality and is running. = + + Please, also note that if authentication for deplo= yment is required you may use the process deployer that is available at /gpd-deployer/upload    . + = Now that we've seen how to work with jPDL perspective, let's pass on to the project testi= ng. --===============4266631440857190316==-- From jbosstools-commits at lists.jboss.org Sat May 29 12:00:51 2010 Content-Type: multipart/mixed; boundary="===============1259358152845094598==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22434 - trunk/jbpm/docs/reference/en-US/images/the_views. Date: Sat, 29 May 2010 12:00:50 -0400 Message-ID: <201005291600.o4TG0oBR018222@svn01.web.mwc.hst.phx2.redhat.com> --===============1259358152845094598== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: abogachuk Date: 2010-05-29 12:00:50 -0400 (Sat, 29 May 2010) New Revision: 22434 Modified: trunk/jbpm/docs/reference/en-US/images/the_views/the_views_10.png Log: Authenticated deployment is documented https://jira.jboss.org/browse/TOOLSDOC-80 Modified: trunk/jbpm/docs/reference/en-US/images/the_views/the_views_10.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============1259358152845094598==-- From jbosstools-commits at lists.jboss.org Sun May 30 20:04:29 2010 Content-Type: multipart/mixed; boundary="===============2789307709861241772==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22435 - trunk/jsf/plugins/org.jboss.tools.jsf.doc.user. Date: Sun, 30 May 2010 20:04:29 -0400 Message-ID: <201005310004.o4V04TEM000493@svn01.web.mwc.hst.phx2.redhat.com> --===============2789307709861241772== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: benlc Date: 2010-05-30 20:04:28 -0400 (Sun, 30 May 2010) New Revision: 22435 Added: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/doc.zip trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/doc_orig.zip Removed: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/doc.zip Modified: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/JSFContextHelp.xml Log: 'committing contect help trial/example files' Modified: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/JSFContextHelp.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/JSFContextHelp.xml 2010-= 05-29 16:00:50 UTC (rev 22434) +++ trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/JSFContextHelp.xml 2010-= 05-31 00:04:28 UTC (rev 22435) @@ -1,40 +1,60 @@ - - - Faces Config Editor - - - - - New JSF Project Wizard - - - - - Import JSF Project Wizard - - - - Add JSF Project Template Wizard - - - - New Managed Bean Wizard - - - - Add Property Wizard - - - - Add Converter Wizard - - - - Add Validator Wizard - - - - Add Referenced Bean Wizard - - - \ No newline at end of file + + + The configuration file can be edited using a graphical= interface. + + + + + + This wizard creates a new JSF project. Type the approp= riate values for the project and click Next. + + = + + + Import JSF Project Wizard + + + + + This wizard creates a new faces-config.xml file. Type t= he appropriate values for the file and click Finish to render the file edit= or. + + + + = + + Add JSF Project Template Wizard + + + + New Managed Bean Wizard + + + + Add Property Wizard + + + + Add Converter Wizard + + + + Add Validator Wizard + + + + Add Referenced Bean Wizard + + + Deleted: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/doc.zip =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Added: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/doc.zip =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/doc.zip ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Copied: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/doc_orig.zip (from r= ev 22434, trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/doc.zip) =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============2789307709861241772==-- From jbosstools-commits at lists.jboss.org Sun May 30 20:44:14 2010 Content-Type: multipart/mixed; boundary="===============3116913095511017246==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22436 - trunk/jsf/plugins/org.jboss.tools.jsf.doc.user. Date: Sun, 30 May 2010 20:44:14 -0400 Message-ID: <201005310044.o4V0iEN8004910@svn01.web.mwc.hst.phx2.redhat.com> --===============3116913095511017246== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: benlc Date: 2010-05-30 20:44:14 -0400 (Sun, 30 May 2010) New Revision: 22436 Modified: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/JSFContextHelp.xml Log: ' slight modifications to JSFContectHelp.xml for demo' Modified: trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/JSFContextHelp.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/JSFContextHelp.xml 2010-= 05-31 00:04:28 UTC (rev 22435) +++ trunk/jsf/plugins/org.jboss.tools.jsf.doc.user/JSFContextHelp.xml 2010-= 05-31 00:44:14 UTC (rev 22436) @@ -29,8 +29,7 @@ This wizard creates a new faces-config.xml file. Type t= he appropriate values for the file and click Finish to render the file edit= or. - - + = --===============3116913095511017246==-- From jbosstools-commits at lists.jboss.org Mon May 31 02:57:11 2010 Content-Type: multipart/mixed; boundary="===============1102925247213123989==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22437 - branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers. Date: Mon, 31 May 2010 02:57:10 -0400 Message-ID: <201005310657.o4V6vA3Z018080@svn01.web.mwc.hst.phx2.redhat.com> --===============1102925247213123989== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-31 02:57:10 -0400 (Mon, 31 May 2010) New Revision: 22437 Modified: branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/o= rg/jboss/ide/eclipse/as/core/publishers/JstPublisher.java branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/o= rg/jboss/ide/eclipse/as/core/publishers/PublishUtil.java Log: JBIDE-6222 - delete old deployments during a rename Modified: branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbos= score/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/= org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2010-05-31 00:44= :14 UTC (rev 22436) +++ branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/= org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2010-05-31 06:57= :10 UTC (rev 22437) @@ -24,7 +24,6 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.model.IModuleResource; @@ -38,10 +37,10 @@ import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil; import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.LocalCopyC= allback; import org.jboss.ide.eclipse.as.core.util.FileUtil; -import org.jboss.ide.eclipse.as.core.util.IConstants; -import org.jboss.ide.eclipse.as.core.util.ServerConverter; import org.jboss.ide.eclipse.as.core.util.FileUtil.FileUtilListener; import org.jboss.ide.eclipse.as.core.util.FileUtil.IFileUtilListener; +import org.jboss.ide.eclipse.as.core.util.IConstants; +import org.jboss.ide.eclipse.as.core.util.ServerConverter; = /** * This class provides a default implementation for packaging different ty= pes of @@ -63,8 +62,8 @@ public boolean accepts(String type, IServer server, IModule[] module) { IDeployableServer ds =3D ServerConverter.getDeployableServer(server); boolean shouldAccept =3D ds !=3D null && LocalPublishMethod.LOCAL_PUBLIS= H_METHOD.equals(type) - && ModuleCoreNature.isFlexibleProject(module[0].getProject()) - && !ds.zipsWTPDeployments(); + && !ds.zipsWTPDeployments() + && PublishUtil.isModuleCoreProject(module); return shouldAccept; } = Modified: branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbos= score/org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/= org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-05-31 00:44:= 14 UTC (rev 22436) +++ branches/3.2.helios/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/= org/jboss/ide/eclipse/as/core/publishers/PublishUtil.java 2010-05-31 06:57:= 10 UTC (rev 22437) @@ -12,6 +12,7 @@ = import java.io.File; import java.io.IOException; +import java.util.ArrayList; = import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; @@ -21,7 +22,9 @@ import org.eclipse.core.runtime.Path; import org.eclipse.core.runtime.Status; import org.eclipse.jst.server.core.IEnterpriseApplication; +import org.eclipse.wst.common.componentcore.ModuleCoreNature; import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.internal.DeletedModule; import org.eclipse.wst.server.core.model.IModuleFile; import org.eclipse.wst.server.core.model.IModuleFolder; import org.eclipse.wst.server.core.model.IModuleResource; @@ -149,6 +152,26 @@ = } = + public static ArrayList moduleCoreFactories =3D new ArrayList(); + static { + moduleCoreFactories.add("org.eclipse.jst.j2ee.server"); //$NON-NLS-1$ + moduleCoreFactories.add("org.eclipse.jst.jee.server"); //$NON-NLS-1$ + } + public static void addModuleCoreFactory(String s) { + if( !moduleCoreFactories.contains(s)) + moduleCoreFactories.add(s); + } + public static boolean isModuleCoreProject(IModule[] module) { + IModule lastmod =3D module[module.length-1]; + if( lastmod.getProject() =3D=3D null && lastmod instanceof DeletedModule= ) { + int colon =3D lastmod.getId().indexOf(':'); + String factory =3D lastmod.getId().substring(0,colon =3D=3D -1 ? lastmo= d.getId().length() : colon); + return moduleCoreFactories.contains(factory); + } + return ModuleCoreNature.isFlexibleProject(lastmod.getProject()); + } + + = private static String getSuffix(String type) { String suffix =3D null; if( IJBossServerConstants.FACET_EAR.equals(type)) = --===============1102925247213123989==-- From jbosstools-commits at lists.jboss.org Mon May 31 03:00:21 2010 Content-Type: multipart/mixed; boundary="===============8526596577978829745==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22438 - branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core. Date: Mon, 31 May 2010 03:00:21 -0400 Message-ID: <201005310700.o4V70LlE018511@svn01.web.mwc.hst.phx2.redhat.com> --===============8526596577978829745== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: rob.stryker(a)jboss.com Date: 2010-05-31 03:00:21 -0400 (Mon, 31 May 2010) New Revision: 22438 Modified: branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/src/org= /jboss/tools/esb/core/ESBProjectCorePlugin.java Log: JBIDE-6222 - delete old deployments during a rename Modified: branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/= src/org/jboss/tools/esb/core/ESBProjectCorePlugin.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/src/or= g/jboss/tools/esb/core/ESBProjectCorePlugin.java 2010-05-31 06:57:10 UTC (r= ev 22437) +++ branches/3.2.helios/esb/plugins/org.jboss.tools.esb.project.core/src/or= g/jboss/tools/esb/core/ESBProjectCorePlugin.java 2010-05-31 07:00:21 UTC (r= ev 22438) @@ -15,6 +15,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.wst.common.componentcore.internal.util.VirtualReference= Utilities; +import org.jboss.ide.eclipse.as.core.publishers.PublishUtil; import org.jboss.tools.esb.core.runtime.JBossRuntimeManager; import org.osgi.framework.BundleContext; = @@ -44,6 +45,7 @@ plugin =3D this; JBossRuntimeManager.loadParsers(); VirtualReferenceUtilities.INSTANCE.addDefaultExtension(ESBProjectConstan= t.ESB_PROJECT_FACET, ESBProjectConstant.ESB_EXTENSION); + PublishUtil.addModuleCoreFactory("org.jboss.tools.esb.project.core.modul= eFactory"); } = /* --===============8526596577978829745==-- From jbosstools-commits at lists.jboss.org Mon May 31 06:16:49 2010 Content-Type: multipart/mixed; boundary="===============2395357890868514410==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22439 - trunk/jbpm/docs/reference/en-US. Date: Mon, 31 May 2010 06:16:48 -0400 Message-ID: <201005311016.o4VAGmsK032066@svn01.web.mwc.hst.phx2.redhat.com> --===============2395357890868514410== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-31 06:16:48 -0400 (Mon, 31 May 2010) New Revision: 22439 Modified: trunk/jbpm/docs/reference/en-US/tasks.xml Log: https://jira.jboss.org/browse/TOOLSDOC-23- = Reviewed restructured jbpm guide.Resolved some text issues and mistakes. Modified: trunk/jbpm/docs/reference/en-US/tasks.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/tasks.xml 2010-05-31 07:00:21 UTC (rev = 22438) +++ trunk/jbpm/docs/reference/en-US/tasks.xml 2010-05-31 10:16:48 UTC (rev = 22439) @@ -1,671 +1,671 @@ - - - - - - jBPM - designer - process - JBoss Developer Studio - jBPM runtime - JBoss - Process - Definition - - - - Tasks -
    - - JBoss jBPM Runtime Installation - The main purpose of this chapter is to let you know how to launc= h the JBoss - jBPM (business process management). - The jBPM plugin (jBPM Designer) is already included in the JBoss Tools. - To make it work, you should only download the jBPM runtime (jbpm-jpdl-3.2.3 currently) and specify the directory = where you extracted the runtime - either when you create a jBPM project or by using the jBPM prefere= nce pages. - = - - Note: - Try to avoid using spaces in the names of installation folde= rs. It can provoke problems in - some situations with Sun-based VMs. - - = - Navigate to - Window > Preferences > JBoss jBPM > Runtime Loc= ations. - Here you can add, edit and remove JBoss jBPM installation = locations. Click - Add - button. In the dialog that appeared enter a name for a new= ly added jBPM runtime and - point to the correct location of this package on your harddrive. C= lick - OK - then click - OK - again. - = -
    - Adding jBPM Location - - - - - -
    - Now, when you have a runtime installed, we are going to demonstr= ate some powerful features of - the jBPM. -
    -
    - - - A Guided Tour of JBoss jBPM GPD - In this chapter we suggest a step-by-step walk-through of cr= eating and configuring your - own simple process. Let's try to organize a new jBPM project.<= /para> - A wizard for creating a jBPM project is included in the GPD = plugin. We have opted to - create a project based on a template already containing a numb= er of advanced artifacts that - we will ignore for this section. In the future we will elabora= te this wizard and offer the - possibility to create an empty jBPM project as well as project= s based on templates taken - from the jBPM tutorial. -
    - - Creating a jBPM Project - This section will show you how to use the Creation wizar= d for creating a new jBPM - project with already included source folders. - At first you should select - File >New Project... - and then - JBoss jBPM > Process Project - in the New Project dialog: -
    - New Project Dialog - - - - - -
    - Clicking - Next - brings us to the wizard page where it's neces= sary to specify the - name and location for the project. We choose, for example,= - HellojBPM - as the name and accept the default location. <= /para> -
    - Process Name and Location - - - - - -
    - Thus, our project will be created in the workspace root = directory by default. If you - want to change the directory for your future project, dese= lect - Use default location - and click - Browse... - button to set needed location or simply type i= t. - On the next screen you'll be prompted to select the= core jBPM location that - we have defined in the previous chapter. -
    - Core jBPM Location Specifying - - - - - -
    - Clicking on - Finish - results in the project being generated. The wizard= creates four source - folders: one for the processes ( - src/main/jpdl - ), one for the java sources ( - src/main/java - ), one for the unit tests ( - src/test/java - ) and one for the resources such as the jbpm.pr= operties and the - hibernate.properties files ( - src/main/config - ). In addition a classpath container with all t= he core jBPM libraries is - added to the project -
    - Layout of the Process Project - - - - - -
    - Looking inside the different source folders will reveal = a number of other artifacts - that were generated, but we will leave these untouched for= the moment. Instead, we will - look at another wizard that enables us to create an empty = process definition. -
    -
    - - Creating an Empty Process Definition - Now when the project is set up, we can use a Creation wi= zard to create an empty - process definition. Bring up the - New - wizard by clicking the - File > New > Other... - menu item. The wizard opens on the - Select Wizard - page. -
    - The Select Wizard Page - - - - - -
    - Selecting the - JBoss jBPM - category, then the - Process Definition - item and clicking on the - Next - button brings us to the - Create Process Definition - page. -
    - The Create New Process Defining Page - - - - - -
    - We choose - hello - as the name of the process archive file. Click on = the - Finish - button to end the wizard and open the process defi= nition editor. -
    - The Process Definition Editor - - - - - -
    - = - = - You can see in the Package Explorer that creating a proc= ess definition involves - creating a folder with the name of the process definition = and populating this folder - with two .xml files : - gpd.xml - , - processdefinition.xml = and a .jpg file: - processimage.jpg.<= /para> - The - gpd.xml - contains the graphical information used by the pro= cess definition editor. - The - processdefinition.xml - file contains the actual process definition in= fo. - The graphical view of the process is automatically saved i= n - processimage.jpg = - file. - At present, the GPD assumes that these three files are sib= lings. More - sophisticated configuration will be supported later. - = -
    - - A Minimal Process Definition - Now we are ready to create a very simple process def= inition consisting of a begin - state, an intermediate state and an end state. - To make the configuration of actions much easier it&= apos;s better to use the - >"jBPM jPDL 3" perspective. It provides the tabbed Properties Editor which allows to co= nfigure - all the relevant properties of the current selected it= em. - = -
    - - Adding the Nodes - At first select respectively - Start, - - State - and - End - on the tools palette and click on the = canvas to add these nodes to - the process definition. The result should look sim= ilar to this: -
    - A Simple Process With Three Nodes - - - - - -
    -
    -
    - - Adding Transitions - Then, we will connect the nodes with transitions= . To do that select the - Transition - tool in the tools palette and click on the= - Start - node, then move to the - State - node and click again to see the transition= being drawn. Perform the - same steps to create a transition from the - State - node to the - End - node. The result will look like: -
    - A Simple Process With Transitions - - - - - -
    - Now, when you've got background knowledge o= f simple project creation, - let's move to more advanced tools. -
    -
    -
    -
    -
    - - - Actions : The JBoss jBPM Integration Mechanism - = - In this chapter we will show how to do software integration= with JBoss - jBPM. The standard mechanism to implement this is t= o wrap the functionality you - want to integrate in a class that implements the - ActionHandler - interface. In order to demonstrate it let's specif= y Hello World action for our - process. - = -
    - Creating a Hello World Action - = - Each Hello World process should integrate one or more He= llo World actions, so this is - what we will be doing. We can integrate custom code at dif= ferent points in the process - definition. To do this we have to specify an action handle= r, represented by an - implementation of the - ActionHandler - interface, and attach this piece of code to a = particular event. These events - are amongst others, going over a transition, leaving or en= tering nodes, after and before - signalling. - = - To make things a little bit more concrete, let's c= reate a new class called - HelloActionHandler. - For that firstly we'll create a new package <= emphasis> - com.jbay.action - in the - src/java/main - folder of our project. Then, we should call New Cl= ass Creation wizard as - usual by right-clicking and navigating - New > Class. - - = -
    - Creating HelloActionHendler Class - = - - - - - -
    - = - Notice that two first gaps have been filled automaticall= y. Here, instead of - Package - option - Enclose type - option can be selected where a type in which to en= close a new class should - be specified. - = - In our case, we leave everything as it is, just type - HelloActionHandler - as a name of new class and add - org.jbpm.graph.ActionHendler - interface as it's shown in the picture above.= - = - Thus, our - HelloActionHandler - implements the - ActionHandler - interface including the - execute - method as shown in the next figure. Here, we add a= variable named - greeting - to the collection of process variables and put = a message in it : - "Hello from ActionHandler".= - = -
    - A Simple Hello Action - = - - - - - -
    - = - Now, as we have - HelloActionHandler - class defined, let's explore how we can handl= e it. -
    - = -
    - Integrating the Hello World Action - = - The main purpose of this chapter is to provide you with = the steps associating our - Hello World action with a particular event and test the co= rrectness of our actions as - well. - = - As good Testcity citizens we will first create a Unit T= est that proves the behaviour - we want to achieve by adding the - ActionHandler - to the process. So we implement another test.<= /para> - = - At first, let's return to the - code we already saw in the pr= evious chapter and add new test method - testActionHendler to i= t. - = -
    - Create the Hello Action Test - = - - - - - -
    - = - We assert - that no variable called - greeting - exist. Then we give the process a signal to mo= ve it to the auction state. We - want to associate the execution of the action with the eve= nt of going over the - transition from the start state to the auction state. So a= fter the signal, the process - should be in the auction state as in the previous scenario= . But moreover, the - greeting - variable should exist and contain the string <= emphasis>"Hello from - ActionHandler". That's what we as= sert in the last lines of the test - method. - = - = - = - Running the tests now results in a failure. The point i= s that we did not associate - the action with any particular event in the process defini= tion, so the process variable - did not get set. - = -
    - Test Results Before Integration - = - - - - - -
    - = - Let's do something about it and add an action to t= he first transition of our - sample process. To do this you can use the Actions tab in = the Properties Editor that is - under the graphical canvas. Bring up the popup menu of the= action element container and - chose New Action as it's shown on the figure below. The ot= her way to add an action - to the transition is simply to use the dropdown menu that = is available under the action - icon in the right upper corner of the Properties View. - = -
    - Adding an Action to a Transition - = - - - - - -
    - = - After adding the action a tabbed view with three pages w= ill appear. - = -
    - Configuration Dialog for an Action - = - - - - - -
    - = - The first of these three pages allows you to give the Ac= tion a name. The last page - contains some advanced attributes such as whether the Acti= on is asynchronous. The - Details page is the most important. It allows to choose an= d configure the actual action - handler implementation. - = -
    - The Details page of an Action Configuration Dialog<= /title> - = - <mediaobject> - <imageobject> - <imagedata fileref=3D"images/The_JBoss_jBPM_Int_Me= ch/jboss_jbpm_int_mech_7.png" scale=3D"80"/> - </imageobject> - </mediaobject> - </figure> - = - = - <para>Clicking on the <emphasis> - <property>Search...</property> - </emphasis> button brings us to a Choose Class dialog.</para> - = - = - <figure> - <title>The Choose Action Handler Dialog - = - - - - - -
    - = - = - We choose our previously created 'HelloActionHandl= er' class and - push the OK button. After the selecti= on of the action handler for - the action, we can run the test and observe it gives us a = green light. - = -
    - Test Results - = - - - - - -
    - = - There we are. The above objective has been achieved. -
    - = -
    - Integration Points - = - The different integration points in a process definitio= n are thoroughly documented in - the JBoss= jBPM User Guide. Instance nodes can contain many action - elements. Each of these will appear in the Action element = list of the Actions tab. But - each Action also has a properties view of itself. You can = navigate to this view by - selecting the added Action in the outline view. - = -
    -
    -
    - - = - Quick Howto Guide - = - This chapter contains additional information related to the = JBoss - jBPM. - = -
    - Change the Default Core jBPM Installation - = - You can change the default jBPM in= stallation by means of the - Eclipse preference mechanism. Open the Preferences dialog = by selecting - Window > Preferences - and select the - JBoss jBPM > Runtime Location - category. Using this page you can add multiple= jBPM - installation locations and change the default one. The def= ault installation is used for - the classpath settings when creating a new Process Project= . Changing the preferences has - no influence on already created projects. Getting rid of a= jBPM - installation that's being referenced by a project how= ever will cause the - classpath to contain errors. - = - = -
    - The jBPM Preferences Page - = - - - - - -
    -
    - = -
    - Configuring Task Nodes - = - Here, we'll examine how you can configure the Task = nodes in jBPM jPDL GPD. - = - You can add Tasks to Task nodes and then configure them= in a similar manner as the - Action configuration mechanism. Let's consider the pr= ocess definition similar - to the previous one that contains three nodes: Start state= , Task node and End state. The - Properties view for selected Task nod= e includes several tabs. - = -
    - The Properties View of the selected Task Node</titl= e> - <mediaobject> - <imageobject> - <imagedata fileref=3D"images/Quick_Howto_Guide/qui= ck_howto_guide_2.png" - scale=3D"75"/> - </imageobject> - </mediaobject> - </figure> - = - <para>We should choose the Task tab and then bring up the cont= ext menu or click the button - in the top right corner of the view to add a Task to our T= ask node.</para> - = - <figure> - <title>Adding a Task to the Task Node - - - - - -
    - = - Every added Task has its own configuration possibilities= . You can access them through - the Properties view as well. - = -
    - The Task properties - - - - - -
    - = - The General page is a place where y= ou can specify the name of a - Task and its description. For instance, let it be - approve oder - with appropriate description that you can see = in the figure below. - = -
    - The Task General Page - - - - - -
    - = - Now, look at Details page. First, y= ou should specify the due date - that is a mandatory property for the Task. The due date is= the date on which the task - should be accomplished. Here you can also set a Task prior= ity as well as signalling, - notifying or blocking. The - Blocking - attribute indicates that the process will not = be able to continue if this - task is still unaccomplished. The - Generate Form... - button is for creating a simple task form that= can be rendered by the jBPM - console. - = -
    - The Task Details Page - - - - - -
    - = - For our example, we specify the due date as 2 business d= ays, choose the high priority - and also check the - Signalling - and - Notify - attributes. It means that the Task should be a= ccomplished in 2 business days - and the assignee will be notified by email when the task i= s assigned. To specify how the - Task should be assigned switch on to the Assignm= ent page. - = -
    - The Task Assignment Page - - - - - -
    - = - On the Reminder page you can specif= y whether the assignee will be reminded of the task - that awaits him. - = -
    - The Task Reminder Page - - - - - -
    - = - In our case, the assignee will be reminded by email afte= r two business hours and - continue to get reminding every business hour after that.<= /para> - In the next figure you can see our configuring generated= into XML. -
    - The Task Reminder Page - - - - - -
    - We hope, our guide will help you to get started with the= jPDL process language and jBPM - workflow on the whole. Besides, for additional information= you are welcome on JBoss forum. -
    -
    - = + + + + + + jBPM + designer + process + JBoss Developer Studio + jBPM runtime + JBoss + Process + Definition + + + + Tasks +
    + + JBoss jBPM Runtime Installation + The main purpose of this chapter is to let you know how to launc= h the JBoss + jBPM (business process management). + The jBPM plugin (jBPM Designer) is already included into the JBoss Tools. + To make it work, you should only download the jBPM runtime (jbpm-jpdl-3.2.3 currently) and specify the directory = where you extracted the runtime + either when you create a jBPM project or by using the jBPM prefere= nce pages. + = + + Note: + Try to avoid using spaces in the names of installation folde= rs. It can provoke problems in + some situations with Sun-based VMs. + + = + Navigate to + Window > Preferences > JBoss jBPM > Runtime Loc= ations. + Here you can add, edit and remove JBoss jBPM installation = locations. Click + Add + button. In the dialog that appeared enter a name for a new= ly added jBPM runtime and + point to the correct location of this package on your harddrive. C= lick + OK + then click + OK + again. + = +
    + Adding jBPM Location + + + + + +
    + Now, when you have a runtime installed, we are going to demonstr= ate some powerful features of + the jBPM. +
    +
    + + + A Guided Tour of JBoss jBPM GPD + In this chapter we suggest a step-by-step walk-through of cr= eating and configuring your + own simple process. Let's try to organize a new jBPM project.<= /para> + A wizard for creating a jBPM project is included in the GPD = plugin. We have opted to + create a project based on a template already containing a numb= er of advanced artifacts that + we will ignore for this section. In the future we will elabora= te this wizard and offer the + possibility to create an empty jBPM project as well as project= s based on templates taken + from the jBPM tutorial. +
    + + Creating a jBPM Project + This section will show you how to use the Creation wizar= d for creating a new jBPM + project with already included source folders. + At first you should select + File >New Project... + and then + JBoss jBPM > Process Project + in the New Project dialog: +
    + New Project Dialog + + + + + +
    + Clicking + Next + brings us to the wizard page where it's neces= sary to specify the + name and location for the project. We choose, for example,= + HellojBPM + as the name and accept the default location. <= /para> +
    + Process Name and Location + + + + + +
    + Thus, our project will be created in the workspace root = directory by default. If you + want to change the directory for your future project, dese= lect + Use default location + and click + Browse... + button to set needed location or simply type i= t. + On the next screen you'll be prompted to select the= core jBPM location that + we have defined in the previous chapter. +
    + Core jBPM Location Specifying + + + + + +
    + Clicking on + Finish + results in the project being generated. The wizard= creates four source + folders: one for the processes ( + src/main/jpdl + ), one for the java sources ( + src/main/java + ), one for the unit tests ( + src/test/java + ) and one for the resources such as the jbpm.pr= operties and the + hibernate.properties files ( + src/main/config + ). In addition a classpath container with all t= he core jBPM libraries is + added to the project +
    + Layout of the Process Project + + + + + +
    + Looking inside the different source folders will reveal = a number of other artifacts + that were generated, but we will leave these untouched for= the moment. Instead, we will + look at another wizard that enables us to create an empty = process definition. +
    +
    + + Creating an Empty Process Definition + Now when the project is set up, we can use a Creation wi= zard to create an empty + process definition. Bring up the + New + wizard by clicking the + File > New > Other... + menu item. The wizard opens on the + Select Wizard + page. +
    + The Select Wizard Page + + + + + +
    + Selecting the + JBoss jBPM + category, then the + Process Definition + item and clicking on the + Next + button brings us to the + Create Process Definition + page. +
    + The Create New Process Defining Page + + + + + +
    + We choose + hello + as the name of the process archive file. Click on = the + Finish + button to end the wizard and open the process defi= nition editor. +
    + The Process Definition Editor + + + + + +
    + = + = + You can see in the Package Explorer that creating a proc= ess definition involves + creating a folder with the name of the process definition = and populating this folder + with two .xml files : + gpd.xml + , + processdefinition.xml = and a .jpg file: + processimage.jpg.<= /para> + The + gpd.xml + contains the graphical information used by the pro= cess definition editor. + The + processdefinition.xml + file contains the actual process definition in= fo. + The graphical view of the process is automatically saved i= n + processimage.jpg = + file. + At present, the GPD assumes that these three files are sib= lings. More + sophisticated configuration will be supported later. + = +
    + + A Minimal Process Definition + Now we are ready to create a very simple process def= inition consisting of a begin + state, an intermediate state and an end state. + To make the configuration of actions much easier it&= apos;s better to use the + >"jBPM jPDL 3" perspective. It provides the tabbed Properties Editor which allows to co= nfigure + all the relevant properties of the current selected it= em. + = +
    + + Adding the Nodes + At first select respectively + Start, + + State + and + End + on the tools palette and click on the = canvas to add these nodes to + the process definition. The result should look sim= ilar to this: +
    + A Simple Process With Three Nodes + + + + + +
    +
    +
    + + Adding Transitions + Then, we will connect the nodes with transitions= . To do that select the + Transition + tool in the tools palette and click on the= + Start + node, then move to the + State + node and click again to see the transition= being drawn. Perform the + same steps to create a transition from the + State + node to the + End + node. The result will look like: +
    + A Simple Process With Transitions + + + + + +
    + Now, when you've got background knowledge o= f simple project creation, + let's move to more advanced tools. +
    +
    +
    +
    +
    + + + Actions : The JBoss jBPM Integration Mechanism + = + In this chapter we will show how to do software integration= with JBoss + jBPM. The standard mechanism to implement this is t= o wrap the functionality you + want to integrate in a class that implements the + ActionHandler + interface. In order to demonstrate it let's specif= y Hello World action for our + process. + = +
    + Creating a Hello World Action + = + Each Hello World process should integrate one or more He= llo World actions, so this is + what we will be doing. We can integrate custom code at dif= ferent points in the process + definition. To do this we have to specify an action handle= r, represented by an + implementation of the + ActionHandler + interface, and attach this piece of code to a = particular event. These events + are amongst others, going over a transition, leaving or en= tering nodes, after and before + signalling. + = + To make things a little bit more concrete, let's c= reate a new class called + HelloActionHandler. + For that firstly we'll create a new package <= emphasis> + com.jbay.action + in the + src/java/main + folder of our project. Then, we should call New Cl= ass Creation wizard as + usual by right-clicking and navigating + New > Class. + + = +
    + Creating HelloActionHendler Class + = + + + + + +
    + = + Notice that two first gaps have been filled automaticall= y. Here, instead of + Package + option + Enclose type + option can be selected where a type in which to en= close a new class should + be specified. + = + In our case, we leave everything as it is, just type + HelloActionHandler + as a name of new class and add + org.jbpm.graph.ActionHendler + interface as it's shown in the picture above.= + = + Thus, our + HelloActionHandler + implements the + ActionHandler + interface including the + execute + method as shown in the next figure. Here, we add a= variable named + greeting + to the collection of process variables and put = a message in it : + "Hello from ActionHandler".= + = +
    + A Simple Hello Action + = + + + + + +
    + = + Now, as we have + HelloActionHandler + class defined, let's explore how we can handl= e it. +
    + = +
    + Integrating the Hello World Action + = + The main purpose of this chapter is to provide you with = the steps associating our + Hello World action with a particular event and test the co= rrectness of our actions as + well. + = + As good Testcity citizens we will first create a Unit T= est that proves the behaviour + we want to achieve by adding the + ActionHandler + to the process. So we implement another test.<= /para> + = + At first, let's return to the + code we already saw in the pr= evious chapter and add new test method + testActionHendler to i= t. + = +
    + Create the Hello Action Test + = + + + + + +
    + = + We assert + that no variable called + greeting + exist. Then we give the process a signal to mo= ve it to the auction state. We + want to associate the execution of the action with the eve= nt of going over the + transition from the start state to the auction state. So a= fter the signal, the process + should be in the auction state as in the previous scenario= . But moreover, the + greeting + variable should exist and contain the string <= emphasis>"Hello from + ActionHandler". That's what we as= sert in the last lines of the test + method. + = + = + = + Running the tests now results in a failure. The point i= s that we did not associate + the action with any particular event in the process defini= tion, so the process variable + did not get set. + = +
    + Test Results Before Integration + = + + + + + +
    + = + Let's do something about it and add an action to t= he first transition of our + sample process. To do this you can use the Actions tab in = the Properties Editor that is + under the graphical canvas. Bring up the popup menu of the= action element container and + chose New Action as it's shown on the figure below. The ot= her way to add an action + to the transition is simply to use the dropdown menu that = is available under the action + icon in the right upper corner of the Properties View. + = +
    + Adding an Action to a Transition + = + + + + + +
    + = + After adding the action a tabbed view with three pages w= ill appear. + = +
    + Configuration Dialog for an Action + = + + + + + +
    + = + The first of these three pages allows you to give the Ac= tion a name. The last page + contains some advanced attributes such as whether the Acti= on is asynchronous. The + Details page is the most important. It allows to choose an= d configure the actual action + handler implementation. + = +
    + The Details page of an Action Configuration Dialog<= /title> + = + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/The_JBoss_jBPM_Int_Me= ch/jboss_jbpm_int_mech_7.png" scale=3D"80"/> + </imageobject> + </mediaobject> + </figure> + = + = + <para>Clicking on the <emphasis> + <property>Search...</property> + </emphasis> button brings us to a Choose Class dialog.</para> + = + = + <figure> + <title>The Choose Action Handler Dialog + = + + + + + +
    + = + = + We choose our previously created 'HelloActionHandl= er' class and + push the OK button. After the selecti= on of the action handler for + the action, we can run the test and observe it gives us a = green light. + = +
    + Test Results + = + + + + + +
    + = + There we are. The above objective has been achieved. +
    + = +
    + Integration Points + = + The different integration points in a process definitio= n are thoroughly documented in + the JBoss= jBPM User Guide. Instance nodes can contain many action + elements. Each of these will appear in the Action element = list of the Actions tab. But + each Action also has a properties view of itself. You can = navigate to this view by + selecting the added Action in the outline view. + = +
    +
    +
    + + = + Quick Howto Guide + = + This chapter contains additional information related to the = JBoss + jBPM. + = +
    + Change the Default Core jBPM Installation + = + You can change the default jBPM in= stallation by means of the + Eclipse preference mechanism. Open the Preferences dialog = by selecting + Window > Preferences + and select the + JBoss jBPM > Runtime Location + category. Using this page you can add multiple= jBPM + installation locations and change the default one. The def= ault installation is used for + the classpath settings when creating a new Process Project= . Changing the preferences has + no influence on already created projects. Getting rid of a= jBPM + installation that's being referenced by a project how= ever will cause the + classpath to contain errors. + = + = +
    + The jBPM Preferences Page + = + + + + + +
    +
    + = +
    + Configuring Task Nodes + = + Here, we'll examine how you can configure the Task = nodes in jBPM jPDL GPD. + = + You can add Tasks to Task nodes and then configure them= in a similar manner as the + Action configuration mechanism. Let's consider the pr= ocess definition similar + to the previous one that contains three nodes: Start state= , Task node and End state. The + Properties view for selected Task nod= e includes several tabs. + = +
    + The Properties View of the selected Task Node</titl= e> + <mediaobject> + <imageobject> + <imagedata fileref=3D"images/Quick_Howto_Guide/qui= ck_howto_guide_2.png" + scale=3D"75"/> + </imageobject> + </mediaobject> + </figure> + = + <para>We should choose the Task tab and then bring up the cont= ext menu or click the button + in the top right corner of the view to add a Task to our T= ask node.</para> + = + <figure> + <title>Adding a Task to the Task Node + + + + + +
    + = + Every added Task has its own configuration possibilities= . You can access them through + the Properties view as well. + = +
    + The Task properties + + + + + +
    + = + The General page is a place where y= ou can specify the name of a + Task and its description. For instance, let it be + approve oder + with appropriate description that you can see = in the figure below. + = +
    + The Task General Page + + + + + +
    + = + Now, look at Details page. First, y= ou should specify the due date + that is a mandatory property for the Task. The due date is= the date on which the task + should be accomplished. Here you can also set a Task prior= ity as well as signalling, + notifying or blocking. The + Blocking + attribute indicates that the process will not = be able to continue if this + task is still unaccomplished. The + Generate Form... + button is for creating a simple task form that= can be rendered by the jBPM + console. + = +
    + The Task Details Page + + + + + +
    + = + For our example, we specify the due date as 2 business d= ays, choose the high priority + and also check the + Signalling + and + Notify + attributes. It means that the Task should be a= ccomplished in 2 business days + and the assignee will be notified by email when the task i= s assigned. To specify how the + Task should be assigned switch on to the Assignm= ent page. + = +
    + The Task Assignment Page + + + + + +
    + = + On the Reminder page you can specif= y whether the assignee will be reminded of the task + that awaits him. + = +
    + The Task Reminder Page + + + + + +
    + = + In our case, the assignee will be reminded by email afte= r two business hours and + continue to get reminding every business hour after that.<= /para> + In the next figure you can see our configuring generated= into XML. +
    + The Task Reminder Page + + + + + +
    + We hope, our guide will help you to get started with the= jPDL process language and jBPM + workflow on the whole. Besides, for additional information= you are welcome on JBoss forum. +
    +
    + =     \ No newline at end of file --===============2395357890868514410==-- From jbosstools-commits at lists.jboss.org Mon May 31 06:24:34 2010 Content-Type: multipart/mixed; boundary="===============3316970910854855590==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22440 - trunk/jbpm/docs/reference/en-US. Date: Mon, 31 May 2010 06:24:34 -0400 Message-ID: <201005311024.o4VAOYpo000691@svn01.web.mwc.hst.phx2.redhat.com> --===============3316970910854855590== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-31 06:24:33 -0400 (Mon, 31 May 2010) New Revision: 22440 Modified: trunk/jbpm/docs/reference/en-US/the_views.xml Log: https://jira.jboss.org/browse/TOOLSDOC-23- = Reviewed restructured jbpm guide.Resolved some text issues and mistakes. Modified: trunk/jbpm/docs/reference/en-US/the_views.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/the_views.xml 2010-05-31 10:16:48 UTC (= rev 22439) +++ trunk/jbpm/docs/reference/en-US/the_views.xml 2010-05-31 10:24:33 UTC (= rev 22440) @@ -1,385 +1,385 @@ - - - - - jBPM - - - Reference -
    - Wizards -
    - Process Project Wizard - This wizard helps to create new jBPM project.It is availa= ble with clicking - File->New->Other->jBPM 3 Project in th= e menu bar. -
    - New Process Project Wizard - - - - - -
    - It consists of several pages: - - On the first page you can adjust the name o= f the project and the directory where it will be created. - If "Use default" option is c= hecked the output directory will be the workspace, - othervise the user should specify it by himself usi= ng Browse button. -
    - New Process Project Wizard - - - - - -
    -     - On the second page you should point the loc= ation of your jbpm runtime. - The last page is only available for unablin= g/disabling = - Generate simple process definition,action han= dling and Unit test. -     - = -
    -
    - New JBPM Action Wizard - This wizard is available by clicking = - File->New->Other->jBPM 3 Action Handler. - = -
    - New JBPM Action Wizard - - - - - -
    - It includes the next options to adjust: - = - - New JBPM Action Wizard. Options. = - - - - - = - - - Option = - Description - Default - - - - = - - Source folder - The path to the source folder relative = to the selected project - The source folder of the project select= ed in the Project field - = - = - - Package - Enter a package to contain an Action Ha= ndler. - Either type a valid package name or click = - Browse - to select a package via the dialog box. - <blank> - = - = - - Enclosing type - Select the enclosing type of your jBPM = action using - Browse - button. - <blank> - - - Modifiers - Select the modifiers that will be added= to the generated class. - Public - = - - Name - Type a name for a new Action Handler - <blank> - = - = - - Superclass - Type or click Brows= e - to select a superclass for an Action Handl= er - org.jbpm.graph.def.ActionHandler - = - = - - Interface - Type or click Add - to select an interface/interfaces for an A= ction Handler - org.jbpm.graph.def.ActionHandler - = - - - Which method stubs you would like to cr= eate? - Select the stubs that you would like to= be created automatically. - - Constructors from supercla= ss - Inherited abstract methods= - - - = - = - - Do you want to add comments? - Select Generate comments check box if you want comment mask = - to be generated before the class definiti= on. - - <blank> - = - - -
    -
    - = - = -
    - = -
    - - The views - Here, it will be explained how to work with views and editors pr= ovided by JBDS. - The views are used for representation and navigation the resourc= es you are working on at - the moment. One of the advantages of all the views is that all mod= ifications made in the - current active file are immediately displayed in them. Let=E2=80= =99s get acquainted more closely - with those that the jPDL perspective provides= . - -
    - The jPDL Perspective Views and Editors - - - - - -
    - - As you can see in the picture above, the jPDL perspect= ive contains a - complete set of functionality that's necessary for working on= the jBPM project. - -
    - - The Outline View - To have a way to quickly see an outline of the process use t= he - Outline view - that is presented as the classical tree. If it is = not visible select - Window > Show view > Outline. <= /emphasis> - -
    - The Overview View - - - - - -
    -
    - -
    - - The Overview - The main advantage of this view is that it gives visual repr= esentation of the whole - current developing process. Besides, the - Overview - comes as a scrollable thumbnail which enables a be= tter navigation of the - process structure if it's too large. - -
    - The Overview - - - - - -
    -
    - -
    - - The Properties View - Here, we dwell on the JBDS Properties view. - Notice if it's not visible you can access it by navigat= ing - Window > Show view > Properties= . - The view shows the relevant properties of the selected item = in the tabbed form. Every - item has its own set of properties, which can be directly edit= able in the Properties - view or by brining up the context menu. - -
    - The Properties View of selected Transition - - - - - -
    - - For example, on the picture above the Properties view displa= ys all the properties for - a selected transition. Its name has been changed to - to_auction. We've do= ne it directly in - active General tab of the view. The same way let's change= the name for the - second transition to - to_end. - If no one item is selected, the view represents the properti= es of the whole process - definition. - -
    - The Properties View of Process Definition - - - - - -
    - - In this case, it contains six tabs. The first one is the - General. It allows to spec= ify a process name and add - necessary description. To illustrate let's change the pro= cess definition name - to - jbay. -
    - -
    - - The jBPM Graphical Process Designer editor. - The jBPM GPD editor includes four modes= : Diagram, Deployment, - Design and Source, which are available as switchable tabs at t= he bottom of the editor. - Let's dwell on each of them. - -
    - The Diagram mode - In this mode we define the process in the form of a dia= gram by means of tools - provided on the left-hand side of the jBPM GPD. - -
    - The Diagram mode - - - - - -
    - - Besides, some properties can be directly edited in the <= property>Diagram - mode of the graphical editor. One example of th= is is the - name - property of nodes. You can edit this directly = by selecting the node of - which you want to change the name and then click once insi= de this node. This enables - an editor in the node. We change the name of the node to <= emphasis> - auction. -
    - -
    - - The Source Mode - Now, that we have defined a simple process definition, w= e can have a look at the - XML that is being generated under the covers. To see this = XML click on the Source - tab of the graphical process designer editor. - -
    - The Source Mode - - - - - -
    - The Source mode enables to easily m= anipulate our XML. That is - manually inserting and editing necessary elements or attri= butes. In addition, here - you can take advantage of content assist. - = - A template is added to better render the jBPM task forms= in the Visual editor. = - Now the jBPM Graphical Process designer can create facel= ets that are associated with tasks and are rendered in the jBPM console. -
    - A task form in VPE - - - - - -
    -
    - -
    - - The Design Mode - One more way to edit your file is to use Desig= n mode. You can - see it in the next picture: -
    - The Design Mode - - - - - -
    - - As you can see above, this mode looks like a table in th= e first column of which - the process structure is performed. Here, you can also ins= ert, remove and edit - elements or attributes, moreover add comments and instruct= ions. Their values can be - directly edited in the second column of the Design mode ta= ble. - For instance, let=E2=80=99s add a comment on the second = transition. For that, you should - bring up the context menu for it and choose - Add Before > Comment. = - -
    - Adding a Comment - - - - - -
    - Then, we can put the text This transition lead= s to the end - state in the right column as its value. - -
    - Comment is added - - - - - -
    - -
    - -
    - - The Deployment Mode - Finally, to adjust the deployment settings of the projec= t you should switch on to - the tab that opens the Deployment mode. On the picture below - the Deployment mode is performed with= default settings. Here, - you can easily modify them or, if the settings won't = match your needs, to - reset defaults. -
    - The Deployment Mode - - - - - -
    - - The Test Connections button can be = used to check whether all your settings are valid before - deploying the process. - - To deploy the process on the server you should click = the Delpoy Process Archive button. - - However, prior to testing the connection and deplo= ying the process on the server you need to - make sure the server is configured to support jBPM funct= ionality and is running. = - - Please, also note that if authentication for deplo= yment is required you may use the process deployer that is available at /gpd-deployer/upload. - = - Now that we've seen how to work with jPDL - perspective, let's pass on to the project testi= ng. -
    -
    -
    + + + + + jBPM + + + Reference +
    + Wizards +
    + Process Project Wizard + This wizard helps to create new jBPM project.It is availa= ble with clicking + File->New->Other->jBPM 3 Project in th= e menu bar. +
    + New Process Project Wizard + + + + + +
    + It consists of several pages: + + On the first page you can adjust the name o= f the project and the directory where it will be created. + If "Use default" option is c= hecked the output directory will be the workspace, + othervise the user should specify it by himself usi= ng Browse button. +
    + New Process Project Wizard + + + + + +
    +     + On the second page you should point the loc= ation of your jbpm runtime. + The last page is only available for unablin= g/disabling = + Generate simple process definition,action han= dling and Unit test.If you unable the option all the mentioned c= ode will be generated automatically. +     + = +
    +
    + New JBPM Action Wizard + This wizard is available by clicking = + File->New->Other->jBPM 3 Action Handler. + = +
    + New JBPM Action Wizard + + + + + +
    + It includes the next options to adjust: + = + + New JBPM Action Wizard. Options. = + + + + + = + + + Option = + Description + Default + + + + = + + Source folder + The path to the source folder relative = to the selected project + The source folder of the project select= ed in the Project field + = + = + + Package + Enter a package to contain an Action Ha= ndler. + Either type a valid package name or click = + Browse + to select a package via the dialog box. + <blank> + = + = + + Enclosing type + Select the enclosing type of your jBPM = action using + Browse + button. + <blank> + + + Modifiers + Select the modifiers that will be added= to the generated class. + Public + = + + Name + Type a name for a new Action Handler + <blank> + = + = + + Superclass + Type or click Brows= e + to select a superclass for an Action Handl= er + org.jbpm.graph.def.ActionHandler + = + = + + Interface + Type or click Add + to select an interface/interfaces for an A= ction Handler + org.jbpm.graph.def.ActionHandler + = + + + Which method stubs you would like to cr= eate? + Select the stubs that you would like to= be created automatically. + + Constructors from supercla= ss + Inherited abstract methods= + + + = + = + + Do you want to add comments? + Select Generate comments check box if you want comment mask = + to be generated before the class definiti= on. + + <blank> + = + + +
    +
    + = + = +
    + = +
    + + The views + Here, it will be explained how to work with views and editors pr= ovided by JBDS. + The views are used for representation and navigation the resourc= es you are working on at + the moment. One of the advantages of all the views is that all mod= ifications made in the + current active file are immediately displayed in them. Let=E2=80= =99s get acquainted more closely + with those that the jPDL perspective provides= . + +
    + The jPDL Perspective Views and Editors + + + + + +
    + + As you can see in the picture above, the jPDL perspect= ive contains a + complete set of functionality that's necessary for working on= the jBPM project. + +
    + + The Outline View + To have a way to quickly see an outline of the process use t= he + Outline view + that is presented as the classical tree. If it is = not visible select + Window > Show view > Outline. <= /emphasis> + +
    + The Overview View + + + + + +
    +
    + +
    + + The Overview + The main advantage of this view is that it gives visual repr= esentation of the whole + current developing process. Besides, the + Overview + comes as a scrollable thumbnail which enables a be= tter navigation of the + process structure if it's too large. + +
    + The Overview + + + + + +
    +
    + +
    + + The Properties View + Here, we dwell on the JBDS Properties view. + Notice if it's not visible you can access it by navigat= ing + Window > Show view > Properties= . + The view shows the relevant properties of the selected item = in the tabbed form. Every + item has its own set of properties, which can be directly edit= able in the Properties + view or by brining up the context menu. + +
    + The Properties View of selected Transition + + + + + +
    + + For example, on the picture above the Properties view displa= ys all the properties for + a selected transition. Its name has been changed to + to_auction. We've do= ne it directly in + active General tab of the view. The same way let's change= the name for the + second transition to + to_end. + If no one item is selected, the view represents the properti= es of the whole process + definition. + +
    + The Properties View of Process Definition + + + + + +
    + + In this case, it contains six tabs. The first one is the + General. It allows to spec= ify a process name and add + necessary description. To illustrate let's change the pro= cess definition name + to + jbay. +
    + +
    + + The jBPM Graphical Process Designer editor. + The jBPM GPD editor includes four modes= : Diagram, Deployment, + Design and Source, which are available as switchable tabs at t= he bottom of the editor. + Let's dwell on each of them. + +
    + The Diagram mode + In this mode we define the process in the form of a dia= gram by means of tools + provided on the left-hand side of the jBPM GPD. + +
    + The Diagram mode + + + + + +
    + + Besides, some properties can be directly edited in the <= property>Diagram + mode of the graphical editor. One example of th= is is the + name + property of nodes. You can edit this directly = by selecting the node of + which you want to change the name and then click once insi= de this node. This enables + an editor in the node. We change the name of the node to <= emphasis> + auction. +
    + +
    + + The Source Mode + Now, that we have defined a simple process definition, w= e can have a look at the + XML that is being generated under the covers. To see this = XML click on the Source + tab of the graphical process designer editor. + +
    + The Source Mode + + + + + +
    + The Source mode enables to easily m= anipulate our XML. That is + manually inserting and editing necessary elements or attri= butes. In addition, here + you can take advantage of content assist. + = + A template is added to better render the jBPM task forms= in the Visual editor. = + Now the jBPM Graphical Process designer can create facel= ets that are associated with tasks and are rendered in the jBPM console. +
    + A task form in VPE + + + + + +
    +
    + +
    + + The Design Mode + One more way to edit your file is to use Desig= n mode. You can + see it in the next picture: +
    + The Design Mode + + + + + +
    + + As you can see above, this mode looks like a table in th= e first column of which + the process structure is performed. Here, you can also ins= ert, remove and edit + elements or attributes, moreover add comments and instruct= ions. Their values can be + directly edited in the second column of the Design mode ta= ble. + For instance, let=E2=80=99s add a comment on the second = transition. For that, you should + bring up the context menu for it and choose + Add Before > Comment. = + +
    + Adding a Comment + + + + + +
    + Then, we can put the text This transition lead= s to the end + state in the right column as its value. + +
    + Comment is added + + + + + +
    + +
    + +
    + + The Deployment Mode + Finally, to adjust the deployment settings of the projec= t you should switch on to + the tab that opens the Deployment mode. On the picture below + the Deployment mode is performed with= default settings. Here, + you can easily modify them or, if the settings won't = match your needs, to + reset defaults. +
    + The Deployment Mode + + + + + +
    + + The Test Connections button can be = used to check whether all your settings are valid before + deploying the process. + + To deploy the process on the server you should click = the Delpoy Process Archive button. + + However, prior to testing the connection and deplo= ying the process on the server you need to + make sure the server is configured to support jBPM funct= ionality and is running. = + + Please, also note that if authentication for deplo= yment is required you may use the process deployer that is available at /gpd-deployer/upload. + = + Now that we've seen how to work with jPDL + perspective, let's pass on to the project testi= ng. +
    +
    +
     \ No newline at end of file --===============3316970910854855590==-- From jbosstools-commits at lists.jboss.org Mon May 31 10:19:49 2010 Content-Type: multipart/mixed; boundary="===============5126008019390457702==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22441 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe: editor/mozilla and 2 other directories. Date: Mon, 31 May 2010 10:19:49 -0400 Message-ID: <201005311419.o4VEJnfq018491@svn01.web.mwc.hst.phx2.redhat.com> --===============5126008019390457702== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: dmaliarevich Date: 2010-05-31 10:19:48 -0400 (Mon, 31 May 2010) New Revision: 22441 Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dia= log/ExternalizeStringsWizard.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dia= log/ExternalizeStringsWizardPage.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/dia= log/ExternalizeStringsDialog.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/moz= illa/MozillaEditor.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/uti= l/Constants.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/V= peUIMessages.java trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/m= essages.properties Log: https://jira.jboss.org/browse/JBIDE-6287 , update TitleAreaDialog to Wizard= Dialog in order to use validation. Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/dialog/ExternalizeStringsDialog.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/di= alog/ExternalizeStringsDialog.java 2010-05-31 10:24:33 UTC (rev 22440) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/di= alog/ExternalizeStringsDialog.java 2010-05-31 14:19:48 UTC (rev 22441) @@ -10,286 +10,24 @@ *************************************************************************= *****/ package org.jboss.tools.vpe.editor.dialog; = -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.core.resources.IFile; -import org.eclipse.jface.dialogs.TitleAreaDialog; -import org.eclipse.jface.text.IDocument; -import org.eclipse.jface.text.TextSelection; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Combo; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.jface.wizard.WizardDialog; +import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Group; -import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.texteditor.IDocumentProvider; -import org.eclipse.wst.sse.ui.StructuredTextEditor; -import org.jboss.tools.common.model.ui.ModelUIImages; -import org.jboss.tools.jst.jsp.outline.cssdialog.common.Constants; -import org.jboss.tools.vpe.VpePlugin; -import org.jboss.tools.vpe.editor.VpeController; -import org.jboss.tools.vpe.editor.bundle.BundleMap; -import org.jboss.tools.vpe.editor.bundle.BundleMap.BundleEntry; -import org.jboss.tools.vpe.messages.VpeUIMessages; -import org.w3c.dom.Attr; = -public class ExternalizeStringsDialog extends TitleAreaDialog { +public class ExternalizeStringsDialog extends WizardDialog { = - private final int DIALOG_WIDTH =3D 450; - private final int DIALOG_HEIGHT =3D 300; - private VpeController vpeController; - private Text textStringValue; - private Text propsKey; - private Text propsValue; - private Text propsFile; - private Combo rbCombo; - private BundleMap bm; - = - public ExternalizeStringsDialog(Shell parentShell, - VpeController vpeController) { - super(parentShell); - this.vpeController =3D vpeController; - this.bm =3D vpeController.getPageContext().getBundle(); - setHelpAvailable(false); + public ExternalizeStringsDialog(Shell parentShell, IWizard newWizard) { + super(parentShell, newWizard); } - + = @Override - protected Control createDialogArea(Composite parent) { - /* - * Setting dialog Title, Message, Image. - */ - getShell().setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE); - setTitle(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE); - setTitleImage(ModelUIImages.getImageDescriptor( - ModelUIImages.WIZARD_DEFAULT).createImage(null)); - setMessage(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_DESCRIPTION); - - Composite composite =3D new Composite(parent, SWT.NONE); - composite.setLayout(new GridLayout(1, false)); - - GridData gd =3D new GridData(SWT.FILL, SWT.FILL, true, true); - gd.widthHint =3D DIALOG_WIDTH; - gd.heightHint =3D DIALOG_HEIGHT; - composite.setLayoutData(gd); - - /* - * Create dialog area separator - */ - Label dialogAreaSeparator =3D new Label(composite, SWT.HORIZONTAL | SWT.= SEPARATOR); - dialogAreaSeparator.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true,= false)); - = - /* - * Create properties string group - */ - Group propsStringGroup =3D new Group(composite, SWT.SHADOW_ETCHED_IN); - propsStringGroup.setLayout(new GridLayout(3, false)); - propsStringGroup.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, fa= lse, 1, 1)); - propsStringGroup.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPS_S= TRINGS_GROUP); - = - /* - * Create Text String label - */ - Label textStringLabel =3D new Label(propsStringGroup, SWT.NONE); - textStringLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, f= alse, 1, 1)); - textStringLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TEXT_STR= ING); - /* - * Create Text String value - */ - textStringValue =3D new Text(propsStringGroup, SWT.BORDER); - textStringValue.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, fal= se, 2, 1)); - textStringValue.setText("Not initialized"); //$NON-NLS-1$ - textStringValue.setEditable(false); - - /* - * Create Properties Key label - */ - Label propsKeyLabel =3D new Label(propsStringGroup, SWT.NONE); - propsKeyLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, fal= se, 1, 1)); - propsKeyLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTIES= _KEY); - /* - * Create Properties Key value - */ - propsKey =3D new Text(propsStringGroup, SWT.BORDER); - propsKey.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, = 1)); - propsKey.setText("key"); //$NON-NLS-1$ - /* - * Create Properties Value label - */ - Label propsValueLabel =3D new Label(propsStringGroup, SWT.NONE); - propsValueLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, f= alse, 1, 1)); - propsValueLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTI= ES_VALUE); - /* - * Create Properties Value value - */ - propsValue =3D new Text(propsStringGroup, SWT.BORDER); - propsValue.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2= , 1)); - propsValue.setText("value"); //$NON-NLS-1$ - - /* - * Create properties string group - */ - Group propsFilesGroup =3D new Group(composite, SWT.SHADOW_ETCHED_IN); - propsFilesGroup.setLayout(new GridLayout(3, false)); - propsFilesGroup.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, fal= se, 1, 1)); - propsFilesGroup.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPS_FI= LES_GROUP); - = - /* - * Create Resource Bundles List label - */ - Label rbListLabel =3D new Label(propsFilesGroup, SWT.NONE); - rbListLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, false= , 1, 1)); - rbListLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_RESOURCE_BUN= DLE_LIST); - /* - * Create Resource Bundles combobox - */ - rbCombo =3D new Combo(propsFilesGroup, SWT.NONE); - rbCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, 1= )); -// rbCombo.add(Constants.EMPTY); - rbCombo.addSelectionListener(new SelectionAdapter() { - @Override - public void widgetSelected(SelectionEvent e) { - IFile bundleFile =3D bm.getBundleFile(rbCombo.getText()); - String bundlePath =3D Constants.EMPTY; - if (bundleFile !=3D null) { - bundlePath =3D bundleFile.getFullPath().toString(); - } = - propsFile.setText(bundlePath); - } - }); - = - /* - * Create Properties File label - */ - Label propsFileLabel =3D new Label(propsFilesGroup, SWT.NONE); - propsFileLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false,fal= se, 1, 1)); - propsFileLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTIE= S_FILE); - /* - * Create Properties File path field - */ - propsFile =3D new Text(propsFilesGroup, SWT.BORDER); - propsFile.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true,false, 2, = 1)); - propsFile.setText(Constants.EMPTY); - propsFile.setEditable(false); - = - /* - * Initialize all fields with real values. - */ - initializeTextFields(); - - return composite; + protected void createButtonsForButtonBar(Composite parent) { + super.createButtonsForButtonBar(parent); + Button finishButton =3D getButton(IDialogConstants.FINISH_ID); + finishButton.setText(IDialogConstants.OK_LABEL); } = - private void initializeTextFields() { - ISelection sel =3D vpeController.getSourceEditor().getSelectionProvider() - .getSelection(); - if ((textStringValue !=3D null) && (propsKey !=3D null) - && isSelectionCorrect(sel)) { - String stringToUpdate =3D Constants.EMPTY; - TextSelection textSelection =3D null; - String text =3D null; - IStructuredSelection structuredSelection =3D (IStructuredSelection) sel; - textSelection =3D (TextSelection) sel; - text =3D textSelection.getText(); - Object selectedElement =3D structuredSelection.getFirstElement(); - /* - * Parse selected element and find a string to replace - */ - if (selectedElement instanceof org.w3c.dom.Text) { - org.w3c.dom.Text textNode =3D (org.w3c.dom.Text) selectedElement; - if ((textNode.getNodeValue().trim().length() > 0) - && (text.trim().length() > 0)) { - stringToUpdate =3D textNode.getNodeValue(); - } - } else if (selectedElement instanceof Attr) { - Attr attrNode =3D (Attr) selectedElement; - if ((attrNode.getNodeValue().trim().length() > 0) - && (text.trim().length() > 0)) { - stringToUpdate =3D attrNode.getNodeValue(); - } - } else { - VpePlugin.getDefault().logWarning( - VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR); - } - /* - * Update text string field - */ - textStringValue.setText(text); - = - /* - * Initialize bundle messages field - */ - BundleEntry[] bundles =3D bm.getBundles(); - Set uriSet =3D new HashSet(); = - for (BundleEntry bundleEntry : bundles) { - if (!uriSet.contains(bundleEntry.uri)) { - uriSet.add(bundleEntry.uri); - rbCombo.add(bundleEntry.uri); - } - } - } else { - VpePlugin.getDefault().logWarning( - VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR); - } - } - - @Override - protected void okPressed() { - StructuredTextEditor editor =3D vpeController.getSourceEditor(); - IDocumentProvider prov =3D editor.getDocumentProvider(); - IDocument doc =3D prov.getDocument(editor.getEditorInput()); - ISelection sel =3D editor.getSelectionProvider().getSelection(); - if (isSelectionCorrect(sel)) { - try { - /* - * Get source text and new text - */ - final TextSelection textSel =3D (TextSelection) sel; - String newText =3D "\n" + propsKey.getText() + Constants.EQUAL + props= Value.getText() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ - /* - * Add "key=3Dvalue" to the bundle - */ - IFile bundleFile =3D bm.getBundleFile(rbCombo.getText()); - if ((bundleFile !=3D null) && (bundleFile.exists())) { - InputStream is =3D new ByteArrayInputStream(newText.getBytes()); - bundleFile.appendContents(is, false, true, null); - } = - /* - * Replace text in the editor with "key.value" - */ - String bundlePrefix =3D Constants.EMPTY; - for (BundleEntry be : bm.getBundles()) { - if (be.uri.equalsIgnoreCase(rbCombo.getText())) { - bundlePrefix =3D be.prefix; - } - } - newText =3D "#{" + bundlePrefix + Constants.DOT + propsKey.getText() += "}"; //$NON-NLS-1$ //$NON-NLS-2$ - doc.replace(textSel.getOffset(), textSel.getLength(), newText); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - super.okPressed(); - } - - private boolean isSelectionCorrect(ISelection sel) { - if ((sel instanceof TextSelection) - && (sel instanceof IStructuredSelection) - && (((IStructuredSelection) sel).size() =3D=3D 1)) { - return true; - } else { - return false; - } - } - } Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor= /dialog/ExternalizeStringsWizard.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/di= alog/ExternalizeStringsWizard.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/di= alog/ExternalizeStringsWizard.java 2010-05-31 14:19:48 UTC (rev 22441) @@ -0,0 +1,45 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2010 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.vpe.editor.dialog; + +import org.eclipse.jface.wizard.Wizard; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.messages.VpeUIMessages; + +public class ExternalizeStringsWizard extends Wizard { + = + VpeController vpeController =3D null; + ExternalizeStringsWizardPage page =3D null; + = + public ExternalizeStringsWizard(VpeController vpeController) { + super(); + setHelpAvailable(false); + setWindowTitle(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE); + this.vpeController =3D vpeController; = + } + = + @Override + public void addPages() { + page =3D new ExternalizeStringsWizardPage(vpeController); + addPage(page); + } + + @Override + public boolean canFinish() { + return page.isPageComplete(); + } + + @Override + public boolean performFinish() { + return page.performFinish(); + } + +} Added: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor= /dialog/ExternalizeStringsWizardPage.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/di= alog/ExternalizeStringsWizardPage.java (rev 0) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/di= alog/ExternalizeStringsWizardPage.java 2010-05-31 14:19:48 UTC (rev 22441) @@ -0,0 +1,340 @@ +/*************************************************************************= ****** + * Copyright (c) 2007-2010 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + *************************************************************************= *****/ +package org.jboss.tools.vpe.editor.dialog; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.TextSelection; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.IStructuredSelection; +import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.swt.SWT; +import org.eclipse.swt.events.ModifyEvent; +import org.eclipse.swt.events.ModifyListener; +import org.eclipse.swt.events.SelectionAdapter; +import org.eclipse.swt.events.SelectionEvent; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.widgets.Combo; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Group; +import org.eclipse.swt.widgets.Label; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.texteditor.IDocumentProvider; +import org.eclipse.wst.sse.ui.StructuredTextEditor; +import org.jboss.tools.common.model.ui.ModelUIImages; +import org.jboss.tools.vpe.VpePlugin; +import org.jboss.tools.vpe.editor.VpeController; +import org.jboss.tools.vpe.editor.bundle.BundleMap; +import org.jboss.tools.vpe.editor.bundle.BundleMap.BundleEntry; +import org.jboss.tools.vpe.editor.util.Constants; +import org.jboss.tools.vpe.messages.VpeUIMessages; +import org.w3c.dom.Attr; + +public class ExternalizeStringsWizardPage extends WizardPage { + + private final int DIALOG_WIDTH =3D 450; + private final int DIALOG_HEIGHT =3D 300; + private VpeController vpeController; + private Text textStringValue; + private Text propsKey; + private Text propsValue; + private Text propsFile; + private Combo rbCombo; + private BundleMap bm; + = + public ExternalizeStringsWizardPage(VpeController vpeController) { + /* + * Setting dialog Title, Description, Image. + */ + super(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE, + VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TITLE, = + ModelUIImages.getImageDescriptor(ModelUIImages.WIZARD_DEFAULT)); + setDescription(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_DESCRIPTION); + setPageComplete(false); + this.vpeController =3D vpeController; + this.bm =3D vpeController.getPageContext().getBundle(); + } + + public ExternalizeStringsWizardPage(String pageName) { + super(pageName); + } + + public void createControl(Composite parent) { + + Composite composite =3D new Composite(parent, SWT.NONE); + composite.setLayout(new GridLayout(1, false)); + + GridData gd =3D new GridData(SWT.FILL, SWT.FILL, true, true); + gd.widthHint =3D DIALOG_WIDTH; + gd.heightHint =3D DIALOG_HEIGHT; + composite.setLayoutData(gd); + = + /* + * Create properties string group + */ + Group propsStringGroup =3D new Group(composite, SWT.SHADOW_ETCHED_IN); + propsStringGroup.setLayout(new GridLayout(3, false)); + propsStringGroup.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, fa= lse, 1, 1)); + propsStringGroup.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPS_S= TRINGS_GROUP); + = + /* + * Create Text String label + */ + Label textStringLabel =3D new Label(propsStringGroup, SWT.NONE); + textStringLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, f= alse, 1, 1)); + textStringLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_TEXT_STR= ING); + /* + * Create Text String value + */ + textStringValue =3D new Text(propsStringGroup, SWT.BORDER); + textStringValue.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, fal= se, 2, 1)); + textStringValue.setText("Not initialized"); //$NON-NLS-1$ + textStringValue.setEditable(false); + + /* + * Create Properties Key label + */ + Label propsKeyLabel =3D new Label(propsStringGroup, SWT.NONE); + propsKeyLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, fal= se, 1, 1)); + propsKeyLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTIES= _KEY); + /* + * Create Properties Key value + */ + propsKey =3D new Text(propsStringGroup, SWT.BORDER); + propsKey.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, = 1)); + propsKey.setText("key"); //$NON-NLS-1$ + propsKey.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + if ((propsKey.getText() =3D=3D null) = + || (Constants.EMPTY.equalsIgnoreCase(propsKey.getText().trim()))) { + setErrorMessage(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_KEY_MUST_BE_S= ET); + } else { + setErrorMessage(null); + } + setPageComplete(isPageComplete()); + } + }); + /* + * Create Properties Value label + */ + Label propsValueLabel =3D new Label(propsStringGroup, SWT.NONE); + propsValueLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, f= alse, 1, 1)); + propsValueLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTI= ES_VALUE); + /* + * Create Properties Value value + */ + propsValue =3D new Text(propsStringGroup, SWT.BORDER); + propsValue.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2= , 1)); + propsValue.setText("value"); //$NON-NLS-1$ + propsValue.addModifyListener(new ModifyListener() { + public void modifyText(ModifyEvent e) { + if ((propsValue.getText() =3D=3D null) + || (Constants.EMPTY.equalsIgnoreCase(propsValue.getText().trim()))) { + setErrorMessage(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_VALUE_MUST_BE= _SET); + } else { + setErrorMessage(null); + } + setPageComplete(isPageComplete()); + } + }); + + /* + * Create properties string group + */ + Group propsFilesGroup =3D new Group(composite, SWT.SHADOW_ETCHED_IN); + propsFilesGroup.setLayout(new GridLayout(3, false)); + propsFilesGroup.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, fal= se, 1, 1)); + propsFilesGroup.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPS_FI= LES_GROUP); + = + /* + * Create Resource Bundles List label + */ + Label rbListLabel =3D new Label(propsFilesGroup, SWT.NONE); + rbListLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false, false= , 1, 1)); + rbListLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_RESOURCE_BUN= DLE_LIST); + /* + * Create Resource Bundles combobox + */ + rbCombo =3D new Combo(propsFilesGroup, SWT.NONE); + rbCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false, 2, 1= )); + rbCombo.add(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PLEASE_SELECT_BUNDLE= ); + rbCombo.select(0); + rbCombo.addSelectionListener(new SelectionAdapter() { + @Override + public void widgetSelected(SelectionEvent e) { + IFile bundleFile =3D bm.getBundleFile(rbCombo.getText()); + String bundlePath =3D Constants.EMPTY; + if (bundleFile !=3D null) { + bundlePath =3D bundleFile.getFullPath().toString(); + } = + propsFile.setText(bundlePath); + setPageComplete(isPageComplete()); + } + }); + = + /* + * Create Properties File label + */ + Label propsFileLabel =3D new Label(propsFilesGroup, SWT.NONE); + propsFileLabel.setLayoutData(new GridData(SWT.RIGHT, SWT.NONE, false,fal= se, 1, 1)); + propsFileLabel.setText(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PROPERTIE= S_FILE); + /* + * Create Properties File path field + */ + propsFile =3D new Text(propsFilesGroup, SWT.BORDER); + propsFile.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true,false, 2, = 1)); + propsFile.setText(Constants.EMPTY); + propsFile.setEditable(false); + = + /* + * Initialize all fields with real values. + */ + initializeTextFields(); + = + /* + * Wizard Page control should be initialized. + */ + setControl(composite); + } + + private void initializeTextFields() { + if ((vpeController =3D=3D null) || (bm =3D=3D null)){ + VpePlugin.getDefault().logWarning( + VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR); + } else { + ISelection sel =3D vpeController.getSourceEditor().getSelectionProvider= ().getSelection(); + if ((textStringValue !=3D null) && (propsKey !=3D null) + && isSelectionCorrect(sel)) { + String stringToUpdate =3D Constants.EMPTY; + TextSelection textSelection =3D null; + String text =3D null; + IStructuredSelection structuredSelection =3D (IStructuredSelection) se= l; + textSelection =3D (TextSelection) sel; + text =3D textSelection.getText(); + if (text.trim().length() < 1) { + setErrorMessage(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_SELECTED_TEXT= _IS_EMPTY); + } else if ((text.indexOf(Constants.GT) !=3D -1) || (text.indexOf(Cons= tants.LT) !=3D -1)) { + setErrorMessage(VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTE= D_TEXT); + } + Object selectedElement =3D structuredSelection.getFirstElement(); + /* + * Parse selected element and find a string to replace + */ + if (selectedElement instanceof org.w3c.dom.Text) { + org.w3c.dom.Text textNode =3D (org.w3c.dom.Text) selectedElement; + if ((textNode.getNodeValue().trim().length() > 0) + && (text.trim().length() > 0)) { + stringToUpdate =3D textNode.getNodeValue(); + } + } else if (selectedElement instanceof Attr) { + Attr attrNode =3D (Attr) selectedElement; + if ((attrNode.getNodeValue().trim().length() > 0) + && (text.trim().length() > 0)) { + stringToUpdate =3D attrNode.getNodeValue(); + } + } else { + VpePlugin.getDefault().logWarning( + VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR); + } + /* + * Update text string field + */ + textStringValue.setText(text); + = + /* + * Initialize bundle messages field + */ + BundleEntry[] bundles =3D bm.getBundles(); + Set uriSet =3D new HashSet(); = + for (BundleEntry bundleEntry : bundles) { + if (!uriSet.contains(bundleEntry.uri)) { + uriSet.add(bundleEntry.uri); + rbCombo.add(bundleEntry.uri); + } + } + } else { + VpePlugin.getDefault().logWarning( + VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR); + } + } + } + = + private boolean isSelectionCorrect(ISelection sel) { + if ((sel instanceof TextSelection) + && (sel instanceof IStructuredSelection) + && (((IStructuredSelection) sel).size() =3D=3D 1)) { + return true; + } else { + return false; + } + } + = + @Override + public boolean isPageComplete() { + boolean isPageComplete =3D false; + /* + * The page is ready when there are no error messages = + * and the bundle is selected + * and "key=3Dvalue" exists. + */ + if ((getErrorMessage() =3D=3D null) + && (!VpeUIMessages.EXTRNALIZE_STRINGS_DIALOG_PLEASE_SELECT_BUNDLE + .equalsIgnoreCase(rbCombo.getItem(rbCombo.getSelectionIndex())))) { + isPageComplete =3D true; + } + return isPageComplete; + } + = + public boolean performFinish() { + StructuredTextEditor editor =3D vpeController.getSourceEditor(); + IDocumentProvider prov =3D editor.getDocumentProvider(); + IDocument doc =3D prov.getDocument(editor.getEditorInput()); + ISelection sel =3D editor.getSelectionProvider().getSelection(); + if (isSelectionCorrect(sel)) { + try { + /* + * Get source text and new text + */ + final TextSelection textSel =3D (TextSelection) sel; + String newText =3D "\n" + propsKey.getText() + Constants.EQUAL + props= Value.getText() + "\n"; //$NON-NLS-1$ //$NON-NLS-2$ + /* + * Add "key=3Dvalue" to the bundle + */ + IFile bundleFile =3D bm.getBundleFile(rbCombo.getText()); + if ((bundleFile !=3D null) && (bundleFile.exists())) { + InputStream is =3D new ByteArrayInputStream(newText.getBytes()); + bundleFile.appendContents(is, false, true, null); + } = + /* + * Replace text in the editor with "key.value" + */ + String bundlePrefix =3D Constants.EMPTY; + for (BundleEntry be : bm.getBundles()) { + if (be.uri.equalsIgnoreCase(rbCombo.getText())) { + bundlePrefix =3D be.prefix; + } + } + newText =3D "#{" + bundlePrefix + Constants.DOT + propsKey.getText() += "}"; //$NON-NLS-1$ //$NON-NLS-2$ + doc.replace(textSel.getOffset(), textSel.getLength(), newText); + } catch (Exception ex) { + ex.printStackTrace(); + } + } + return false; + } + = +} Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/mozilla/MozillaEditor.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEditor.java 2010-05-31 10:24:33 UTC (rev 22440) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/mo= zilla/MozillaEditor.java 2010-05-31 14:19:48 UTC (rev 22441) @@ -66,6 +66,7 @@ import org.jboss.tools.vpe.VpePlugin; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.dialog.ExternalizeStringsDialog; +import org.jboss.tools.vpe.editor.dialog.ExternalizeStringsWizard; import org.jboss.tools.vpe.editor.mozilla.listener.EditorLoadWindowListene= r; import org.jboss.tools.vpe.editor.mozilla.listener.MozillaResizeListener; import org.jboss.tools.vpe.editor.mozilla.listener.MozillaTooltipListener; @@ -95,6 +96,8 @@ import org.mozilla.interfaces.nsIHTMLInlineTableEditor; import org.mozilla.interfaces.nsIHTMLObjectResizer; import org.mozilla.interfaces.nsIPlaintextEditor; +import org.w3c.dom.Attr; +import org.w3c.dom.Node; = public class MozillaEditor extends EditorPart implements IReusableEditor { protected static final File INIT_FILE =3D new File(VpePlugin.getDefault()= .getResourcePath("ve"), "init.html"); //$NON-NLS-1$ //$NON-NLS-2$ @@ -477,12 +480,13 @@ * otherwise show warning message. */ ISelection sel =3D controller.getSourceEditor().getSelectionProvider()= .getSelection(); + = if ((sel instanceof TextSelection) && (sel instanceof IStructuredSelection) && (((IStructuredSelection) sel).size() =3D=3D 1)) { ExternalizeStringsDialog dlg =3D new ExternalizeStringsDialog( PlatformUI.getWorkbench().getDisplay().getActiveShell(), - controller); + new ExternalizeStringsWizard(controller)); dlg.open(); } else { MessageDialog.openWarning( Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/edi= tor/util/Constants.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut= il/Constants.java 2010-05-31 10:24:33 UTC (rev 22440) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/ut= il/Constants.java 2010-05-31 14:19:48 UTC (rev 22441) @@ -26,7 +26,11 @@ public static final String PIXEL =3D "px"; //$NON-NLS-1$ public static final String PERCENT =3D "%"; //$NON-NLS-1$ public static final String COMMA =3D ","; //$NON-NLS-1$ + public static final String DOT =3D "."; //$NON-NLS-1$ public static final String FILE_PREFIX =3D "file://"; //$NON-NLS-1$ public static final String UNDERSCORE =3D "_"; //$NON-NLS-1$ public static final String ZERO_STRING =3D "0"; //$NON-NLS-1$ + public static final String EQUAL =3D "=3D"; //$NON-NLS-1$ + public static final String GT =3D ">"; //$NON-NLS-1$ + public static final String LT =3D "<"; //$NON-NLS-1$ } Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/VpeUIMessages.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= VpeUIMessages.java 2010-05-31 10:24:33 UTC (rev 22440) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= VpeUIMessages.java 2010-05-31 14:19:48 UTC (rev 22441) @@ -169,6 +169,11 @@ public static String EXTRNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP; public static String EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR; public static String EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTION; + public static String EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTED_TEXT; + public static String EXTRNALIZE_STRINGS_DIALOG_PLEASE_SELECT_BUNDLE; + public static String EXTRNALIZE_STRINGS_DIALOG_SELECTED_TEXT_IS_EMPTY; + public static String EXTRNALIZE_STRINGS_DIALOG_KEY_MUST_BE_SET; + public static String EXTRNALIZE_STRINGS_DIALOG_VALUE_MUST_BE_SET; = public static String COULD_NOT_OPEN_VPE_RESOURCES_DIALOG; = Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/mes= sages/messages.properties =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-31 10:24:33 UTC (rev 22440) +++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/messages/= messages.properties 2010-05-31 14:19:48 UTC (rev 22441) @@ -157,6 +157,11 @@ EXTRNALIZE_STRINGS_DIALOG_PROPS_FILES_GROUP=3DHandle properties file EXTRNALIZE_STRINGS_DIALOG_INITIALIZATION_ERROR=3DCould not initialize exte= rnalization dialog! EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTION=3DWrong selection! Please select= correct string. +EXTRNALIZE_STRINGS_DIALOG_WRONG_SELECTED_TEXT=3DWrong selected text. Pleas= e select correct string. +EXTRNALIZE_STRINGS_DIALOG_PLEASE_SELECT_BUNDLE=3D- Please select bundle - +EXTRNALIZE_STRINGS_DIALOG_SELECTED_TEXT_IS_EMPTY=3DSelected text is empty +EXTRNALIZE_STRINGS_DIALOG_KEY_MUST_BE_SET=3DKey must be set +EXTRNALIZE_STRINGS_DIALOG_VALUE_MUST_BE_SET=3DValue must be set = # Other messages CANNOT_LOAD_TAGLIBS_FROM_PAGE_CONTEXT=3DCannot load taglibs from PageConte= xt! --===============5126008019390457702==-- From jbosstools-commits at lists.jboss.org Mon May 31 11:33:33 2010 Content-Type: multipart/mixed; boundary="===============0757494326017469833==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22442 - trunk/jbpm/docs/reference/en-US. Date: Mon, 31 May 2010 11:33:32 -0400 Message-ID: <201005311533.o4VFXWPe001274@svn01.web.mwc.hst.phx2.redhat.com> --===============0757494326017469833== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-31 11:33:32 -0400 (Mon, 31 May 2010) New Revision: 22442 Removed: trunk/jbpm/docs/reference/en-US/Test_Drive_Proc.xml trunk/jbpm/docs/reference/en-US/The_JBoss_jBPM_Int_Mech.xml trunk/jbpm/docs/reference/en-US/guided_tour_jboss_jbpmgpd.xml trunk/jbpm/docs/reference/en-US/jboss_jbpm_runtime_installation.xml Modified: trunk/jbpm/docs/reference/en-US/Introduction.xml Log: https://jira.jboss.org/browse/TOOLSDOC-23- = Finished the guide restructuring. Modified: trunk/jbpm/docs/reference/en-US/Introduction.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/Introduction.xml 2010-05-31 14:19:48 UT= C (rev 22441) +++ trunk/jbpm/docs/reference/en-US/Introduction.xml 2010-05-31 15:33:32 UT= C (rev 22442) @@ -43,7 +43,7 @@ Write an example process test case - If you have questions, please feel free to contact If you have any questions, please feel free to contact Koen Aers or To= m Baeyens for more information. @@ -70,7 +70,7 @@ jPDL support Enables managing workflow processes as well as human tasks an= d interactions between - them. jPDL combines the best both Java and declarative process tech= niques. + them. jPDL combines the best techniques both in Java and in declara= tive process. = Deleted: trunk/jbpm/docs/reference/en-US/Test_Drive_Proc.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/Test_Drive_Proc.xml 2010-05-31 14:19:48= UTC (rev 22441) +++ trunk/jbpm/docs/reference/en-US/Test_Drive_Proc.xml 2010-05-31 15:33:32= UTC (rev 22442) @@ -1,173 +0,0 @@ - - - - - - jBPM - - - - - - - Test Driven Process Development - - One of the most important advantages of JBoss jBPM's light= weight approach to BPM - and workflow management is that developers can easily leverage the= ir usual programming - skills and techniques. One of these well-known techniques is Unit = Testing and Test Driven - Development. - In this chapter we will show how developers, making use of the J= Boss jBPM GPD, can use a - technique we have baptized Test Driven Process Developme= nt to create - process definitions and test their correctness. - - When creating the - HellojBPM - project the Project Creation wizard has already put in= place all the library - requirements we need to start writing the jBPM unit tests. They ar= e contained in the jBPM - Library container and the most important of them is the - .jar - file containing the core jBPM classes. While working o= n the project you could - find them all in the Package Explorer. - -
    - The jBPM Libraries - - - - - - -
    - - It must be noted that it is possible to change the location of t= he core jBPM installation - by changing the preference settings. More on this see - later in this book. - - With that extra knowledge on the project settings, you can crea= te your first test. To do - this, we create the - com.jbay - package in the - test/java - source folder. Then we bring up the context menu on th= is package and select - New > Other... - - -
    - Call the JUnit Test Case Creation wizard - - - - - - -
    - - And then - Java > JUnit > JUnit Test Case - to call the specialized JUnite Test case creation wiza= rd. -
    - Call the JUnit Test Case Creation wizard - - - - - - -
    - - The wizard looks as follows: - -
    - Create Test Dialog - - - - - - -
    - - By default JUnit 3 version of testing framework is selected. Of = course, you can choose - new advanced JUnit 4 version. In this case you'll be prompted= to add new JUnit - Library to your build path. To add it automatically just click on = the appropriate link. In - the - Class under test - section you can specify the class to test. - In this guide we will use JUnit 3 version. -
    - A First Test Scenario - - - - - - -
    - - Then, we call the test class - HelloTest - and press - Finish - button to complete. - - Next, we should write a simple test scenario as shown on the ne= xt figure. Let's - study the code of this test case. - -
    - A First Test Scenario - - - - - - -
    - - In the first line of the method, a jBPM process archive object i= s created. We use a - constructor accepting the filename of the archive. In our case it = is the - hello - file we created earlier and which lives in the - src/main/jpdl - folder of our project. After asserting that this objec= t is really created, we - extract a process definition object from it. This object is fed to= the constructor of a - process instance object. We have a process instance object, but th= is process is not yet - started, so we can safely assert that its root token still resides= in the start node. After - signalling the token will move to the next state and the process w= ill be in the - auction - state. Finally another signal will end the process. - - - After writing this test we can check whether it works as expect= ed by running it . - -
    - Running the Process Test - - - - - - -
    - All went well as we have a green light: - -
    - Successful Test Run - - - - - - -
    - - Of course, this simple scenario was not very interesting, but t= he purpose of it was to - show how you can reuse your development skills in a very straightf= orward way when doing - process development. To see how more interesting processes and pro= cess test - scenario's can be developed, we suggest you to read the JBoss jBPM Us= er Guide and to - study the API reference. You can find it in the jBPM download fold= er. (To get started we - downloaded jbpm-jpdl-3.2.2 in the second - chapter. You should just remember where you extracted i= t.) All we've mentioned are in the 'javadoc- *' subfolders o= f the 'doc' folder. - Moreover, some more examples will be given later in this book. - -     Deleted: trunk/jbpm/docs/reference/en-US/The_JBoss_jBPM_Int_Mech.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/The_JBoss_jBPM_Int_Mech.xml 2010-05-31 = 14:19:48 UTC (rev 22441) +++ trunk/jbpm/docs/reference/en-US/The_JBoss_jBPM_Int_Mech.xml 2010-05-31 = 15:33:32 UTC (rev 22442) @@ -1,241 +0,0 @@ - - - - - - jBPM - - - - - - - Actions : The JBoss jBPM Integration Mechanism - - In this chapter we will show how to do software integration wit= h JBoss - jBPM. The standard mechanism to implement this is to wr= ap the functionality you - want to integrate in a class that implements the - ActionHandler - interface. In order to demonstrate it let's specify He= llo World action for our - process. - -
    - Creating a Hello World Action - - Each Hello World process should integrate one or more Hello = World actions, so this is - what we will be doing. We can integrate custom code at differe= nt points in the process - definition. To do this we have to specify an action handler, r= epresented by an - implementation of the - ActionHandler - interface, and attach this piece of code to a part= icular event. These events - are amongst others, going over a transition, leaving or enteri= ng nodes, after and before - signalling. - - To make things a little bit more concrete, let's creat= e a new class called - HelloActionHandler. - For that firstly we'll create a new package <= emphasis> - com.jbay.action - in the - src/java/main - folder of our project. Then, we should call New Cl= ass Creation wizard as - usual by right-clicking and navigating - New > Class. - - -
    - Creating HelloActionHendler Class - - - - - - -
    - - Notice that two first gaps have been filled automatically. H= ere, instead of - Package - option - Enclose type - option can be selected where a type in which to en= close a new class should - be specified. - - In our case, we leave everything as it is, just type - HelloActionHandler - as a name of new class and add - org.jbpm.graph.ActionHendler - interface as it's shown in the picture above.= - - Thus, our - HelloActionHandler - implements the - ActionHandler - interface including the - execute - method as shown in the next figure. Here, we add a= variable named - greeting - to the collection of process variables and put = a message in it : - "Hello from ActionHandler".= - -
    - A Simple Hello Action - - - - - - -
    - - Now, as we have - HelloActionHandler - class defined, let's explore how we can handl= e it. -
    - -
    - Integrating the Hello World Action - - The main purpose of this chapter is to provide you with the = steps associating our - Hello World action with a particular event and test the correc= tness of our actions as - well. - - As good Testcity citizens we will first create a Unit Test = that proves the behaviour - we want to achieve by adding the - ActionHandler - to the process. So we implement another test. - = - At first, let's return to the - code we already saw in the pre= vious chapter and add new test method - testActionHendler to it= . - = -
    - Create the Hello Action Test - = - - - - - -
    - = - We assert - that no variable called - greeting - exist. Then we give the process a signal to move i= t to the auction state. We - want to associate the execution of the action with the event o= f going over the - transition from the start state to the auction state. So after= the signal, the process - should be in the auction state as in the previous scenario. Bu= t moreover, the - greeting - variable should exist and contain the string "Hello from - ActionHandler". That's what we assert in = the last lines of the test - method. - - = - - Running the tests now results in a failure. The point is th= at we did not associate - the action with any particular event in the process definition= , so the process variable - did not get set. - -
    - Test Results Before Integration - - - - - - -
    - - Let's do something about it and add an action to the f= irst transition of our - sample process. To do this you can use the Actions tab in the = Properties Editor that is - under the graphical canvas. Bring up the popup menu of the act= ion element container and - chose New Action as it's shown on the figure below. The other = way to add an action - to the transition is simply to use the dropdown menu that is a= vailable under the action - icon in the right upper corner of the Properties View. - -
    - Adding an Action to a Transition - - - - - - -
    - - After adding the action a tabbed view with three pages will = appear. - -
    - Configuration Dialog for an Action - - - - - - -
    - - The first of these three pages allows you to give the Action= a name. The last page - contains some advanced attributes such as whether the Action i= s asynchronous. The - Details page is the most important. It allows to choose and co= nfigure the actual action - handler implementation. - -
    - The Details page of an Action Configuration Dialog</tit= le> - - <mediaobject> - <imageobject> - <imagedata fileref=3D"images/The_JBoss_jBPM_Int_Mech/j= boss_jbpm_int_mech_7.png" scale=3D"80"/> - </imageobject> - </mediaobject> - </figure> - - - <para>Clicking on the <emphasis> - <property>Search...</property> - </emphasis> button brings us to a Choose Class dialog.</para> - - - <figure> - <title>The Choose Action Handler Dialog - - - - - - -
    - - - We choose our previously created 'HelloActionHandler&a= pos; class and - push the OK button. After the selection o= f the action handler for - the action, we can run the test and observe it gives us a gree= n light. - -
    - Test Results - - - - - - -
    - - There we are. The above objective has been achieved. -
    - -
    - Integration Points - - The different integration points in a process definition ar= e thoroughly documented in - the JBoss jBP= M User Guide. Instance nodes can contain many action - elements. Each of these will appear in the Action element list= of the Actions tab. But - each Action also has a properties view of itself. You can navi= gate to this view by - selecting the added Action in the outline view. - -
    - -     Deleted: trunk/jbpm/docs/reference/en-US/guided_tour_jboss_jbpmgpd.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/guided_tour_jboss_jbpmgpd.xml 2010-05-3= 1 14:19:48 UTC (rev 22441) +++ trunk/jbpm/docs/reference/en-US/guided_tour_jboss_jbpmgpd.xml 2010-05-3= 1 15:33:32 UTC (rev 22442) @@ -1,225 +0,0 @@ - - - - - - jBPM - JBoss - Process - Definition - - - A Guided Tour of JBoss jBPM GPD - In this chapter we suggest a step-by-step walk-through of creating = and configuring your - own simple process. Let's try to organize a new jBPM project. - A wizard for creating a jBPM project is included in the GPD plugin.= We have opted to - create a project based on a template already containing a number of adva= nced artifacts that - we will ignore for this section. In the future we will elaborate this wi= zard and offer the - possibility to create an empty jBPM project as well as projects based on= templates taken - from the jBPM tutorial. -
    - - Creating a jBPM Project - This section will show you how to use the Creation wizard for crea= ting a new jBPM - project with already included source folders. - At first you should select - File >New Project... - and then - JBoss jBPM > Process Project - in the New Project dialog: -
    - New Project Dialog - - - - - -
    - Clicking - Next - brings us to the wizard page where it's necessary to s= pecify the - name and location for the project. We choose, for example, - HellojBPM - as the name and accept the default location. -
    - Process Name and Location - - - - - -
    - Thus, our project will be created in the workspace root directory = by default. If you - want to change the directory for your future project, deselect - Use default location - and click - Browse... - button to set needed location or simply type it. - On the next screen you'll be prompted to select the core jBPM= location that - we have defined in the previous chapter. -
    - Core jBPM Location Specifying - - - - - -
    - Clicking on - Finish - results in the project being generated. The wizard creates = four source - folders: one for the processes ( - src/main/jpdl - ), one for the java sources ( - src/main/java - ), one for the unit tests ( - src/test/java - ) and one for the resources such as the jbpm.properties and = the - hibernate.properties files ( - src/main/config - ). In addition a classpath container with all the core jBPM = libraries is - added to the project -
    - Layout of the Process Project - - - - - -
    - Looking inside the different source folders will reveal a number o= f other artifacts - that were generated, but we will leave these untouched for the moment. = Instead, we will - look at another wizard that enables us to create an empty process defin= ition. -
    -
    - - Creating an Empty Process Definition - Now when the project is set up, we can use a Creation wizard to cr= eate an empty - process definition. Bring up the - New - wizard by clicking the - File > New > Other... - menu item. The wizard opens on the - Select Wizard - page. -
    - The Select Wizard Page - - - - - -
    - Selecting the - JBoss jBPM - category, then the - Process Definition - item and clicking on the - Next - button brings us to the - Create Process Definition - page. -
    - The Create New Process Defining Page - - - - - -
    - We choose - hello - as the name of the process archive file. Click on the - Finish - button to end the wizard and open the process definition ed= itor. -
    - The Process Definition Editor - - - - - -
    - - - You can see in the Package Explorer that creating a process defini= tion involves - creating a folder with the name of the process definition and populatin= g this folder - with two .xml files : - gpd.xml - , - processdefinition.xml and a .jpg file= : - processimage.jpg. - The - gpd.xml - contains the graphical information used by the process defi= nition editor. - The - processdefinition.xml - file contains the actual process definition info. - The graphical view of the process is automatically saved in - processimage.jpg = - file. - At present, the GPD assumes that these three files are siblings. More - sophisticated configuration will be supported later. - -
    - - A Minimal Process Definition - Now we are ready to create a very simple process definition consi= sting of a begin - state, an intermediate state and an end state. - To make the configuration of actions much easier it's better= to use the - >"jBPM jPDL 3" perspective. = It provides the tabbed Properties Editor which allows to configure - all the relevant properties of the current selected item. - -
    - - Adding the Nodes - At first select respectively - Start, - - State - and - End - on the tools palette and click on the canvas to add these= nodes to - the process definition. The result should look similar to this: -
    - A Simple Process With Three Nodes - - - - - -
    -
    -
    - - Adding Transitions - Then, we will connect the nodes with transitions. To do that sel= ect the - Transition - tool in the tools palette and click on the - Start - node, then move to the - State - node and click again to see the transition being drawn. P= erform the - same steps to create a transition from the - State - node to the - End - node. The result will look like: -
    - A Simple Process With Transitions - - - - - -
    - Now, when you've got background knowledge of simple project= creation, - let's move to more advanced tools. -
    -
    -
    - -     Deleted: trunk/jbpm/docs/reference/en-US/jboss_jbpm_runtime_installation.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/jboss_jbpm_runtime_installation.xml 201= 0-05-31 14:19:48 UTC (rev 22441) +++ trunk/jbpm/docs/reference/en-US/jboss_jbpm_runtime_installation.xml 201= 0-05-31 15:33:32 UTC (rev 22442) @@ -1,49 +0,0 @@ - - - - - - jBPM - designer - process - JBoss Developer Studio - jBPM runtime - - - JBoss jBPM Runtime Installation - The main purpose of this chapter is to let you know how to launch t= he JBoss - jBPM (business process management). - The jBPM plugin (jBPM Designer) is already included in the JBoss Tools. - To make it work, you should only download the jBPM runtime (jbpm-jpdl-3.2.3 currently) and specify the directory where you= extracted the runtime - either when you create a jBPM project or by using the jBPM preference pa= ges. - - - Note: - Try to avoid using spaces in the names of installation folders. It= can provoke problems in - some situations with Sun-based VMs. - - - Navigate to - Window > Preferences > JBoss jBPM > Runtime Location= s. - Here you can add, edit and remove JBoss jBPM installation lo= cations. Click - Add - button. In the dialog that appeared enter a name for a newly= added jBPM runtime and - point to the correct location of this package on your harddrive. Click <= emphasis> - OK - then click - OK - again. - -
    - Adding jBPM Location - - - - - -
    - Now, when you have a runtime installed, we are going to demonstrate= some powerful features of - the jBPM. -     --===============0757494326017469833==-- From jbosstools-commits at lists.jboss.org Mon May 31 11:35:26 2010 Content-Type: multipart/mixed; boundary="===============5126682489116697149==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22443 - trunk/jbpm/docs/reference/en-US. Date: Mon, 31 May 2010 11:35:26 -0400 Message-ID: <201005311535.o4VFZQOu002170@svn01.web.mwc.hst.phx2.redhat.com> --===============5126682489116697149== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: ochikvina Date: 2010-05-31 11:35:26 -0400 (Mon, 31 May 2010) New Revision: 22443 Modified: trunk/jbpm/docs/reference/en-US/master.xml Log: https://jira.jboss.org/browse/TOOLSDOC-23- = Finished the guide restructuring. Modified: trunk/jbpm/docs/reference/en-US/master.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/jbpm/docs/reference/en-US/master.xml 2010-05-31 15:33:32 UTC (rev= 22442) +++ trunk/jbpm/docs/reference/en-US/master.xml 2010-05-31 15:35:26 UTC (rev= 22443) @@ -4,12 +4,7 @@ = = [ - - - - - @@ -81,15 +76,9 @@ = &introduction; = - = - &tasks; &the_views; = + = = - - = --===============5126682489116697149==-- From jbosstools-commits at lists.jboss.org Mon May 31 12:06:07 2010 Content-Type: multipart/mixed; boundary="===============2174991695942805082==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r22444 - in trunk/vpe: tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test and 1 other directory. Date: Mon, 31 May 2010 12:06:07 -0400 Message-ID: <201005311606.o4VG6711011575@svn01.web.mwc.hst.phx2.redhat.com> --===============2174991695942805082== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: yradtsevich Date: 2010-05-31 12:06:07 -0400 (Mon, 31 May 2010) New Revision: 22444 Added: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/v= pe/xulrunner/test/XPCOMTest.java trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/v= pe/xulrunner/test/XulRunnerAbstractTest.java Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/= xulrunner/XPCOM.java trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/v= pe/xulrunner/test/DOMCreatingTest.java trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/v= pe/xulrunner/test/XulRunnerAllTests.java trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/v= pe/xulrunner/test/XulRunnerBrowserTest.java Log: https://jira.jboss.org/browse/JBIDE-6393 Create generic queryInterface method - The method queryInterface, along with the methods getInterfaceId, getSup= portedInterfaces, printSupportedInterfaces and getInterfacesList have been = created in the XPCOM class. - XULRunner tests have been refactored. - JUnit tests for new XPCOM methods have been created. - Copyright notes have been updated. Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/too= ls/vpe/xulrunner/XPCOM.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe= /xulrunner/XPCOM.java 2010-05-31 15:35:26 UTC (rev 22443) +++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe= /xulrunner/XPCOM.java 2010-05-31 16:06:07 UTC (rev 22444) @@ -1,5 +1,5 @@ /*************************************************************************= ****** - * Copyright (c) 2007 Red Hat, Inc. + * Copyright (c) 2007-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, @@ -8,12 +8,22 @@ * Contributor: * Red Hat, Inc. - initial API and implementation *************************************************************************= *****/ - package org.jboss.tools.vpe.xulrunner; = +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.mozilla.interfaces.nsIDOMNode; +import org.mozilla.interfaces.nsISupports; +import org.mozilla.xpcom.XPCOMException; + /** - * @author Sergey Vasilyev (svasilyev(a)exadel.com) - * + * @author Sergey Vasilyev (svasilyev(a)exadel.com): initial creation. + * @author Yahor Radtsevich (yradtsevich): method {@code queryInterface} a= nd + * related stuff (JBIDE-6393). */ public final class XPCOM { private XPCOM() {} @@ -34,6 +44,1465 @@ */ public static final String NS_EDITINGSESSION_CONTRACTID=3D"@mozilla.org/e= ditor/editingsession;1"; //$NON-NLS-1$ = - public static final String NS_IWEBBROWSER_CID =3D "F1EAC761-87E9-11d3-AF= 80-00A024FFC08C"; //$NON-NLS-1$ + public static final String NS_IWEBBROWSER_CID =3D "F1EAC761-87E9-11d3-AF8= 0-00A024FFC08C"; //$NON-NLS-1$ public static final String NS_IAPPSHELL_CID =3D "2d96b3df-c051-11d1-a827-= 0040959a28c9"; //$NON-NLS-1$ + = + /**Stores all interfaces which extend nsISupports. */ + /* Lazy initialization of interfacesList is used to avoid loading + * of all these classes (>1000) by the class loader. */ + private static List> interfacesList =3D null; + = + private static Map, String> interfaceIdByType + =3D new HashMap, String>(); + + /** + * Queries given interface-type from {@code object}. + *

    + * This method is intended to simplify long boilerplate XPCOM + * interfaces casting + * 

    (nsIDOMNode) object.queryInterface(nsIDOMNode.NS_IDOMNODE_IID
+	 * by a simpler call
+	 * 
    queryInterface(object, nsIDOMNode.class)
    
+	 *  =

+	 * It is recommended to include the method using static import:
+	 * 
    import static org.jboss.tools.vpe.xulrunner.XPCOM.queryInterface<=
/pre>
+	 * =

+	 * @throws XPCOMException when the {@code object} does not support
+	 * the {@code type}.
+	 * to =

+	  =

+	 * @author Yahor Radtsevich (yradtsevich)
+	 */
+	public static  T queryInterface(
+			nsISupports object,	Class type) throws XPCOMException {
+		String interfaceId =3D getInterfaceId(type);
+		return (T) object.queryInterface(interfaceId);
+	}
+
+	/**
+	 * Returns XPCOM ID for the given {@code type}
+	 * 
    
+	 * Example:{@code getInterfaceId(nsIDOMNode.class)} will return value of
+	 * {@link nsIDOMNode#NS_IDOMNODE_IID}.
+	 *  =

+	 * @param type interface extending {@link nsISupports}
+	 * =

+	 * @author Yahor Radtsevich (yradtsevich)
+	 */
+	public static  String getInterfaceId(Class type=
) {
+		String interfaceId =3D interfaceIdByType.get(type);
+		if (interfaceId =3D=3D null) {
+			String interfaceIdFieldName =3D getInterfaceIdFieldName(type);
+			try {
+				interfaceId =3D (String) type.getField(interfaceIdFieldName).get(null);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+			interfaceIdByType.put(type, interfaceId);
+		}
+		return interfaceId;
+	}
+
+	/**
+	 * Returns field name which contains XPCOM ID for the given
+	 * interface-{@code type}.
+	 * 
    
+	 * Examples:
+	 *
       getInterfaceIdFieldName(nsIDOMNode.class)=3D"NS_IDOMNODE_IID"
+	 *   getInterfaceIdFieldName(jsdIScript.class)=3D"JSDISCRIPT_IID"
    
+	 * =

+	 * @param type interface extending {@link nsISupports}
+	 * =

+	 * @author Yahor Radtsevich (yradtsevich)
+	 */
+	private static  String getInterfaceIdFieldName(Cla=
ss type) {
+		String typeName =3D type.getSimpleName();
+
+		String interfaceIdFieldName;
+		if (typeName.startsWith("ns")) { //$NON-NLS-1$
+			// e.g. "nsIDOMNode" becomes "NS_IDOMNODE"
+			interfaceIdFieldName =3D "NS_" + typeName.substring(2).toUpperCase(); /=
/$NON-NLS-1$
+		} else {
+			// e.g. "jsdIScript" becomes "JSDISCRIPT"
+			interfaceIdFieldName =3D typeName.toUpperCase();
+		}
+		interfaceIdFieldName =3D interfaceIdFieldName + "_IID"; //$NON-NLS-1$
+		return interfaceIdFieldName;
+	}
+	=

+	 /**
+	  * Returns all interfaces supported by the {@code object}.
+	  * =

+	  * @deprecated This method tries to query every known XPCOM interface
+	  * from given object and it performs very slow (seconds).
+	  * For debug/test purposes only. Do not use it in the production code.
+	  */
+	public static List> getSupportedInterfaces(
+			nsISupports object) {
+		List> supportedInterfaces =3D
+				new ArrayList>();
+		for (Class type : getInterfacesList()) {
+			try {
+				// try to get interface
+				queryInterface(object, type);
+				=

+				// if no error is thrown, than the interface is supported
+				supportedInterfaces.add(type);
+			} catch (XPCOMException e) {
+				// it's OK
+			}
+		}
+		=

+		return supportedInterfaces;
+	}
+
+	 /**
+	  * Prints all interfaces supported by the {@code object} to the
+	  * {@code System.out}.
+	  * =

+	  * @deprecated This method tries to query every known XPCOM interface
+	  * from given object and it performs very slow (seconds).
+	  * For debug/test purposes only. Do not use it in the production code.
+	  */
+	public static void printSupportedInterfaces(nsISupports object, boolean p=
rintMethods) {
+		for (Class type : getSupportedInterfaces(object))=
 {
+			System.out.println(type.getSimpleName());
+			if (printMethods) {
+				for (Method method : type.getMethods()) {
+					System.out.println('\t' + method.getName());
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns all XPCOM interfaces which extend nsISupports.
+	 * =

+	 * @deprecated This method loads tons of classes.
+	 * For debug/test purposes only. Do not use it in the production code.
+	 */
+	public static List> getInterfacesList() {
+		if (interfacesList =3D=3D null) {
+			interfacesList =3D new ArrayList>();
+			=

+			interfacesList.add(org.mozilla.interfaces.extIApplication.class);
+			interfacesList.add(org.mozilla.interfaces.extIConsole.class);
+			interfacesList.add(org.mozilla.interfaces.extIEventItem.class);
+			interfacesList.add(org.mozilla.interfaces.extIEventListener.class);
+			interfacesList.add(org.mozilla.interfaces.extIEvents.class);
+			interfacesList.add(org.mozilla.interfaces.extIExtension.class);
+			interfacesList.add(org.mozilla.interfaces.extIExtensions.class);
+			interfacesList.add(org.mozilla.interfaces.extIPreference.class);
+			interfacesList.add(org.mozilla.interfaces.extIPreferenceBranch.class);
+			interfacesList.add(org.mozilla.interfaces.extISessionStorage.class);
+//			interfacesList.add(org.mozilla.interfaces.gfxIFormats.class);
+			interfacesList.add(org.mozilla.interfaces.gfxIImageFrame.class);
+			interfacesList.add(org.mozilla.interfaces.IDispatch.class);
+			interfacesList.add(org.mozilla.interfaces.imgICache.class);
+			interfacesList.add(org.mozilla.interfaces.imgIContainer.class);
+			interfacesList.add(org.mozilla.interfaces.imgIContainerObserver.class);
+			interfacesList.add(org.mozilla.interfaces.imgIDecoder.class);
+			interfacesList.add(org.mozilla.interfaces.imgIDecoderObserver.class);
+			interfacesList.add(org.mozilla.interfaces.imgIEncoder.class);
+			interfacesList.add(org.mozilla.interfaces.imgILoad.class);
+			interfacesList.add(org.mozilla.interfaces.imgILoader.class);
+			interfacesList.add(org.mozilla.interfaces.imgIRequest.class);
+			interfacesList.add(org.mozilla.interfaces.imgITools.class);
+			interfacesList.add(org.mozilla.interfaces.inICSSValueSearch.class);
+			interfacesList.add(org.mozilla.interfaces.inIDeepTreeWalker.class);
+			interfacesList.add(org.mozilla.interfaces.inIDOMUtils.class);
+			interfacesList.add(org.mozilla.interfaces.inIDOMView.class);
+			interfacesList.add(org.mozilla.interfaces.inIFlasher.class);
+			interfacesList.add(org.mozilla.interfaces.inISearchObserver.class);
+			interfacesList.add(org.mozilla.interfaces.inISearchProcess.class);
+			interfacesList.add(org.mozilla.interfaces.jsdICallHook.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIContext.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIContextEnumerator.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIDebuggerService.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIEphemeral.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIErrorHook.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIExecutionHook.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIFilter.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIFilterEnumerator.class);
+			interfacesList.add(org.mozilla.interfaces.jsdINestCallback.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIObject.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIProperty.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIScript.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIScriptEnumerator.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIScriptHook.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIStackFrame.class);
+			interfacesList.add(org.mozilla.interfaces.jsdIValue.class);
+			interfacesList.add(org.mozilla.interfaces.mozIJSSubScriptLoader.class);
+			interfacesList.add(org.mozilla.interfaces.mozIPersonalDictionary.class);
+			interfacesList.add(org.mozilla.interfaces.mozISpellCheckingEngine.class=
);
+			interfacesList.add(org.mozilla.interfaces.mozISpellI18NManager.class);
+			interfacesList.add(org.mozilla.interfaces.mozISpellI18NUtil.class);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageAggregateFunction.=
class);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageConnection.class);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageDataSet.class);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageError.class);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageFunction.class);
+			interfacesList.add(org.mozilla.interfaces.mozIStoragePendingStatement.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageProgressHandler.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageResultSet.class);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageRow.class);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageService.class);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageStatement.class);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageStatementCallback.=
class);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageStatementParams.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageStatementRow.class=
);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageStatementWrapper.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.mozIStorageValueArray.class);
+			interfacesList.add(org.mozilla.interfaces.mozITXTToHTMLConv.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAboutModule.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAbstractWorker.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessible.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleCaretMoveEvent.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleCoordinateType.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleDocument.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleEditableText.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleHyperLink.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleHyperText.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleImage.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleProvider.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleRelation.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleRetrieval.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleRole.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleScrollType.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleSelectable.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleStateChangeEvent=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleStates.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleTable.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleTableChangeEvent=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleText.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleTextChangeEvent.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessibleValue.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAccessNode.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAddonInstallListener.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIAddonRepository.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAddonSearchResult.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAddonSearchResultsCallback=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAddonUpdateCheckListener.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIAlertsService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAnnotationObserver.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAnnotationService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIApplicationCache.class);
+			interfacesList.add(org.mozilla.interfaces.nsIApplicationCacheChannel.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIApplicationCacheContainer.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIApplicationCacheNamespace.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIApplicationCacheService.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIApplicationUpdateService.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIAppShell.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAppShellService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAppStartup.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAppStartup2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIArray.class);
+			interfacesList.add(org.mozilla.interfaces.nsIASN1Object.class);
+			interfacesList.add(org.mozilla.interfaces.nsIASN1PrintableItem.class);
+			interfacesList.add(org.mozilla.interfaces.nsIASN1Sequence.class);
+			interfacesList.add(org.mozilla.interfaces.nsIASN1Tree.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAssociatedContentSecurity.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIAsyncInputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAsyncOutputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAsyncStreamCopier.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAtom.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAtomService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAuthInformation.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAuthPrompt.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAuthPrompt2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAuthPromptAdapterFactory.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIAuthPromptCallback.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAuthPromptProvider.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAuthPromptWrapper.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAutoCompleteController.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIAutoCompleteInput.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAutoCompleteObserver.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIAutoCompletePopup.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAutoCompleteResult.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAutoCompleteSearch.class);
+			interfacesList.add(org.mozilla.interfaces.nsIAutoCompleteSimpleResult.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIAutoCompleteSimpleResultLi=
stener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBadCertListener2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBaseWindow.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBidiKeyboard.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBidirectionalIterator.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIBinaryInputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBinaryOutputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBlocklistService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBoxObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBrowserBoxObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBrowserDOMWindow.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBrowserHistory.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBrowserHistory_MOZILLA_1_9=
_1_ADDITIONS.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBrowserInstance.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBrowserSearchService.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIBufferedInputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIBufferedOutputStream.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIByteRangeRequest.class);
+//			interfacesList.add(org.mozilla.interfaces.nsICache.class);
+			interfacesList.add(org.mozilla.interfaces.nsICacheDeviceInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsICacheEntryDescriptor.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsICacheEntryInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsICacheListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsICacheMetaDataVisitor.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsICacheService.class);
+			interfacesList.add(org.mozilla.interfaces.nsICacheSession.class);
+			interfacesList.add(org.mozilla.interfaces.nsICacheVisitor.class);
+			interfacesList.add(org.mozilla.interfaces.nsICachingChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsICancelable.class);
+			interfacesList.add(org.mozilla.interfaces.nsICategoryManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsICertificateDialogs.class);
+			interfacesList.add(org.mozilla.interfaces.nsICertOverrideService.class);
+			interfacesList.add(org.mozilla.interfaces.nsICertPickDialogs.class);
+			interfacesList.add(org.mozilla.interfaces.nsICertTree.class);
+			interfacesList.add(org.mozilla.interfaces.nsICertTreeItem.class);
+			interfacesList.add(org.mozilla.interfaces.nsICertVerificationListener.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsICertVerificationResult.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIChannelClassifier.class);
+			interfacesList.add(org.mozilla.interfaces.nsIChannelEventSink.class);
+			interfacesList.add(org.mozilla.interfaces.nsICharsetConverterManager.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsICharsetResolver.class);
+			interfacesList.add(org.mozilla.interfaces.nsIChromeRegistry.class);
+			interfacesList.add(org.mozilla.interfaces.nsICipherInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsICipherInfoService.class);
+			interfacesList.add(org.mozilla.interfaces.nsICiter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIClassInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIClientAuthDialogs.class);
+			interfacesList.add(org.mozilla.interfaces.nsIClientAuthUserDecision.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIClipboard.class);
+			interfacesList.add(org.mozilla.interfaces.nsIClipboardCommands.class);
+			interfacesList.add(org.mozilla.interfaces.nsIClipboardDragDropHookList.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIClipboardDragDropHooks.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIClipboardHelper.class);
+			interfacesList.add(org.mozilla.interfaces.nsIClipboardOwner.class);
+			interfacesList.add(org.mozilla.interfaces.nsICMSMessageErrors.class);
+			interfacesList.add(org.mozilla.interfaces.nsICMSSecureMessage.class);
+			interfacesList.add(org.mozilla.interfaces.nsICollation.class);
+			interfacesList.add(org.mozilla.interfaces.nsICollationFactory.class);
+			interfacesList.add(org.mozilla.interfaces.nsICollection.class);
+			interfacesList.add(org.mozilla.interfaces.nsICommandController.class);
+			interfacesList.add(org.mozilla.interfaces.nsICommandHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsICommandHandlerInit.class);
+			interfacesList.add(org.mozilla.interfaces.nsICommandLine.class);
+			interfacesList.add(org.mozilla.interfaces.nsICommandLineHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsICommandLineValidator.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsICommandManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsICommandParams.class);
+			interfacesList.add(org.mozilla.interfaces.nsIComponentManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIComponentManagerObsolete.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIComponentRegistrar.class);
+			interfacesList.add(org.mozilla.interfaces.nsIConsoleListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIConsoleMessage.class);
+			interfacesList.add(org.mozilla.interfaces.nsIConsoleService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContainerBoxObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContentDispatchChooser.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIContentFilter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContentHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContentPolicy.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContentPrefObserver.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContentPrefService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContentSniffer.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContentURIGrouper.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContentViewer.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContentViewerContainer.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIContentViewerEdit.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContentViewerFile.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContextMenuInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContextMenuListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIContextMenuListener2.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIController.class);
+			interfacesList.add(org.mozilla.interfaces.nsIControllerCommand.class);
+			interfacesList.add(org.mozilla.interfaces.nsIControllerCommandGroup.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIControllerCommandTable.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIControllerContext.class);
+			interfacesList.add(org.mozilla.interfaces.nsIControllers.class);
+			interfacesList.add(org.mozilla.interfaces.nsIConverterInputStream.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIConverterOutputStream.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsICookie.class);
+			interfacesList.add(org.mozilla.interfaces.nsICookie2.class);
+			interfacesList.add(org.mozilla.interfaces.nsICookieAcceptDialog.class);
+			interfacesList.add(org.mozilla.interfaces.nsICookieManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsICookieManager2.class);
+			interfacesList.add(org.mozilla.interfaces.nsICookiePermission.class);
+			interfacesList.add(org.mozilla.interfaces.nsICookiePromptService.class);
+			interfacesList.add(org.mozilla.interfaces.nsICookieService.class);
+			interfacesList.add(org.mozilla.interfaces.nsICrashReporter.class);
+			interfacesList.add(org.mozilla.interfaces.nsICRLInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsICRLManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsICryptoFIPSInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsICryptoHash.class);
+			interfacesList.add(org.mozilla.interfaces.nsICryptoHMAC.class);
+			interfacesList.add(org.mozilla.interfaces.nsICurrentCharsetListener.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDataSignatureVerifier.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDataType.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDBusHandlerApp.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDebug.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDialogParamBlock.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDirectoryEnumerator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDirectoryService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDirectoryServiceProvider.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDirectoryServiceProvider2.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIDirIndex.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDirIndexListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDirIndexParser.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDNSListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDNSRecord.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDNSService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocCharset.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocShell.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocShell_MOZILLA_1_9_1.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDocShell_MOZILLA_1_9_1_dns=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocShell_MOZILLA_1_9_1_Ses=
sionStorage.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocShellHistory.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocShellLoadInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocShellTreeItem.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocShellTreeNode.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocShellTreeOwner.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocumentCharsetInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocumentEncoder.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocumentEncoderNodeFixup.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDocumentLoader.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDocumentLoaderFactory.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDocumentStateListener.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOM3Attr.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOM3Document.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOM3DocumentEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOM3EventTarget.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOM3Node.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOM3Text.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOM3TypeInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMAbstractView.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMAttr.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMBarProp.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMBeforeUnloadEvent.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCanvasGradient.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCanvasPattern.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCanvasRenderingContext2=
D.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCDATASection.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCharacterData.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMChromeWindow.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMClientInformation.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMClientRect.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMClientRectList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCommandEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMComment.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCounter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCRMFObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCrypto.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCryptoDialogs.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSS2Properties.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSCharsetRule.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSFontFaceRule.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSImportRule.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSMediaRule.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSMozDocumentRule.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSPageRule.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSPrimitiveValue.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSRule.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSRuleList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSStyleDeclaration.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSStyleRule.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSStyleSheet.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSUnknownRule.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSValue.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMCSSValueList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDataContainerEvent.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDataTransfer.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDocument.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDocumentCSS.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDocumentEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDocumentFragment.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDocumentRange.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDocumentStyle.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDocumentTraversal.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDocumentType.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDocumentView.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDocumentXBL.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDOMConfiguration.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDOMConstructor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDOMException.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDOMImplementation.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDOMImplementationLS.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDOMStringList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMDragEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMElementCSSInlineStyle.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMEntity.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMEntityReference.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMEventGroup.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMEventListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMEventTarget.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMFile.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMFileException.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMFileList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMGeoGeolocation.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMGeoPosition.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMGeoPositionCallback.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMGeoPositionCoords.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMGeoPositionError.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMGeoPositionErrorCallbac=
k.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMGeoPositionOptions.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMGetSVGDocument.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHistory.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLAnchorElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLAppletElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLAreaElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLAudioElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLBaseElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLBaseFontElement.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLBodyElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLBRElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLButtonElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLByteRanges.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLCanvasElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLCollection.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLDirectoryElement.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLDivElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLDListElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLDocument.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLEmbedElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLFieldSetElement.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLFontElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLFormElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLFrameElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLFrameSetElement.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLHeadElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLHeadingElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLHRElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLHtmlElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLIFrameElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLImageElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLInputElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLIsIndexElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLLabelElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLLegendElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLLIElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLLinkElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLMapElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLMediaElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLMediaError.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLMenuElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLMetaElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLModElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLObjectElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLOListElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLOptGroupElement.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLOptionElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLOptionsCollection.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLParagraphElement.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLParamElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLPreElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLQuoteElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLScriptElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLSelectElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLSourceElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLStyleElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLTableCaptionElement=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLTableCellElement.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLTableColElement.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLTableElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLTableRowElement.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLTableSectionElement=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLTextAreaElement.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLTimeRanges.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLTitleElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLUListElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLVideoElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMHTMLVoidCallback.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMJSNavigator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMJSWindow.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMKeyEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLinkStyle.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLoadStatus.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLoadStatusEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLocation.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLSException.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLSInput.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLSLoadEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLSOutput.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLSParser.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLSParserFilter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLSProgressEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLSResourceResolver.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLSSerializer.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMLSSerializerFilter.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMMediaList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMMessageEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMMimeType.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMMimeTypeArray.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMModalContentWindow.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMMouseEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMMouseScrollEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMMutationEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNamedNodeMap.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNameList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNavigator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNavigatorGeolocation.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNode.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNodeFilter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNodeIterator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNodeList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNodeSelector.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNotation.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNotifyPaintEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSCSS2Properties.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSDataTransfer.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSDataTransfer_MOZILLA_=
1_9_1.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSDocument.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSDocumentStyle.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSEditableElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSEventTarget.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSFeatureFactory.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLAnchorElement.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLAnchorElement2.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLAreaElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLAreaElement2.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLButtonElement.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLDocument.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLFormControlList.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLFormElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLFrameElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLHRElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLImageElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLInputElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLOptionCollection.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLOptionElement.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLSelectElement.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSHTMLTextAreaElement.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSRange.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSRGBAColor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSUIEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSXBLFormControl.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMNSXPathExpression.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMOfflineResourceList.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMPageTransitionEvent.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMParser.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMParserJS.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMPkcs11.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMPlugin.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMPluginArray.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMPopupBlockedEvent.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMProcessingInstruction.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMProgressEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMRange.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMRangeException.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMRect.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMRGBColor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMScreen.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSerializer.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSimpleGestureEvent.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSmartCardEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMStorage.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMStorage2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMStorageEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMStorageItem.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMStorageList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMStorageManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMStorageWindow.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMStorageWindow_1_9_1.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMStyleSheet.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMStyleSheetList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAngle.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedAngle.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedBoolean.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedEnumeration.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedInteger.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedLength.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedLengthList.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedNumber.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedNumberList.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedPathData.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedPoints.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedPreserveAspe=
ctRatio.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedRect.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedString.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGAnimatedTransformLis=
t.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGCircleElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGClipPathElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGComponentTransferFun=
ctionElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGDefsElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGDescElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGDocument.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGEllipseElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGException.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEBlendElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEColorMatrixElement=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEComponentTransferE=
lement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFECompositeElement.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEConvolveMatrixElem=
ent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEDiffuseLightingEle=
ment.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEDisplacementMapEle=
ment.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEDistantLightElemen=
t.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEFloodElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEFuncAElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEFuncBElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEFuncGElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEFuncRElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEGaussianBlurElemen=
t.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEImageElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEMergeElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEMergeNodeElement.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEMorphologyElement.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEOffsetElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFEPointLightElement.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFESpecularLightingEl=
ement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFESpotLightElement.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFETileElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFETurbulenceElement.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFilterElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFilterPrimitiveStand=
ardAttributes.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGFitToViewBox.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGForeignObjectElement=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGGElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGGradientElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGImageElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGLength.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGLengthList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGLinearGradientElemen=
t.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGLineElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGLocatable.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGMarkerElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGMaskElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGMatrix.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGMetadataElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGNumber.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGNumberList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSeg.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegArcAbs.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegArcRel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegClosePath.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegCurvetoCubicA=
bs.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegCurvetoCubicR=
el.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegCurvetoCubicS=
moothAbs.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegCurvetoCubicS=
moothRel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegCurvetoQuadra=
ticAbs.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegCurvetoQuadra=
ticRel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegCurvetoQuadra=
ticSmoothAbs.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegCurvetoQuadra=
ticSmoothRel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegLinetoAbs.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegLinetoHorizon=
talAbs.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegLinetoHorizon=
talRel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegLinetoRel.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegLinetoVertica=
lAbs.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegLinetoVertica=
lRel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegMovetoAbs.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPathSegMovetoRel.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPatternElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPoint.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPointList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPolygonElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPolylineElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGPreserveAspectRatio.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGRadialGradientElemen=
t.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGRect.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGRectElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGScriptElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGStopElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGStylable.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGStyleElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGSVGElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGSwitchElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGSymbolElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGTextContentElement.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGTextElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGTextPathElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGTextPositioningEleme=
nt.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGTitleElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGTransform.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGTransformable.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGTransformList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGTSpanElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGUnitTypes.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGURIReference.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGUseElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGViewSpec.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGZoomAndPan.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMSVGZoomEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMText.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMTextMetrics.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMToString.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMTreeWalker.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMUIEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMUserDataHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMViewCSS.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMWindow.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMWindow2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMWindowCollection.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMWindowInternal.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMWindowUtils.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXMLDocument.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXPathEvaluator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXPathException.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXPathExpression.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXPathNamespace.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXPathNSResolver.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXPathResult.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULButtonElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULCheckboxElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULCommandDispatcher.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULCommandEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULContainerElement.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULContainerItemElement=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULControlElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULDescriptionElement.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULDocument.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULImageElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULLabeledControlElemen=
t.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULLabelElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULMenuListElement.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULMultiSelectControlEl=
ement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULPopupElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULSelectControlElement=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULSelectControlItemEle=
ment.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULTextBoxElement.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIDOMXULTreeElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDownload.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDownloader.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDownloadHistory.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDownloadManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDownloadManagerUI.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDownloadObserver.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDownloadProgressListener.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIDragDropHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDragService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDragSession.class);
+			interfacesList.add(org.mozilla.interfaces.nsIDynamicContainer.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEditActionListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEditingSession.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEditor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEditorBoxObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEditorDocShell.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEditorIMESupport.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEditorLogging.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEditorMailSupport.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEditorObserver.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEditorSpellCheck.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEditorStyleSheets.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEffectiveTLDService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEmbeddingSiteWindow.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEmbeddingSiteWindow2.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIEncodedChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEntityConverter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEnumerator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEnvironment.class);
+			interfacesList.add(org.mozilla.interfaces.nsIErrorService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIEventTarget.class);
+			interfacesList.add(org.mozilla.interfaces.nsIException.class);
+			interfacesList.add(org.mozilla.interfaces.nsIExceptionManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIExceptionProvider.class);
+			interfacesList.add(org.mozilla.interfaces.nsIExceptionService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIExpatSink.class);
+			interfacesList.add(org.mozilla.interfaces.nsIExtendedExpatSink.class);
+			interfacesList.add(org.mozilla.interfaces.nsIExtensionManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIExternalHelperAppService.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIExternalProtocolHandler.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIExternalProtocolService.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIFactory.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFastLoadFileControl.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFastLoadFileIO.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFastLoadReadControl.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFastLoadService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFastLoadWriteControl.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIFaviconService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFeed.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFeedContainer.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFeedElementBase.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFeedEntry.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFeedGenerator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFeedPerson.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFeedProcessor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFeedProgressListener.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIFeedResult.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFeedResultListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFeedTextConstruct.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFile.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFileChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFileInputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFileOutputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFilePicker.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFileProtocolHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFileURL.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFileView.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFind.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFindService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFlavorDataProvider.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFontEnumerator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFormatConverter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFormFillController.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFormHistory2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFormHistoryImporter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFormSigningDialog.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFormSubmitObserver.class);
+			interfacesList.add(org.mozilla.interfaces.nsIForwardIterator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFrameLoader.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFrameLoaderOwner.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFTPChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFTPEventSink.class);
+			interfacesList.add(org.mozilla.interfaces.nsIFullScreen.class);
+			interfacesList.add(org.mozilla.interfaces.nsIGConfService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIGeneratingKeypairInfoDialo=
gs.class);
+			interfacesList.add(org.mozilla.interfaces.nsIGeolocationPrompt.class);
+			interfacesList.add(org.mozilla.interfaces.nsIGeolocationProvider.class);
+			interfacesList.add(org.mozilla.interfaces.nsIGeolocationRequest.class);
+			interfacesList.add(org.mozilla.interfaces.nsIGeolocationUpdate.class);
+			interfacesList.add(org.mozilla.interfaces.nsIGlobalHistory.class);
+			interfacesList.add(org.mozilla.interfaces.nsIGlobalHistory2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIGlobalHistory3.class);
+			interfacesList.add(org.mozilla.interfaces.nsIGnomeVFSMimeApp.class);
+			interfacesList.add(org.mozilla.interfaces.nsIGnomeVFSService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHandlerApp.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHandlerInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHandlerService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHashable.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHelperAppLauncher.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHelperAppLauncherDialog.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIHistoryEntry.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHTMLAbsPosEditor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHTMLEditor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHTMLInlineTableEditor.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIHTMLObjectResizeListener.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIHTMLObjectResizer.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHttpActivityObserver.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIHttpAuthenticator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHttpAuthManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHttpChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHttpChannelInternal.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHttpEventSink.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHTTPHeaderListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHttpHeaderVisitor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHTTPIndex.class);
+			interfacesList.add(org.mozilla.interfaces.nsIHttpProtocolHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsIIdentityInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIIdleService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIIDNService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIIFrameBoxObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsIImageDocument.class);
+			interfacesList.add(org.mozilla.interfaces.nsIImageLoadingContent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIIncrementalDownload.class);
+			interfacesList.add(org.mozilla.interfaces.nsIINIParser.class);
+			interfacesList.add(org.mozilla.interfaces.nsIINIParserFactory.class);
+			interfacesList.add(org.mozilla.interfaces.nsIInlineSpellChecker.class);
+			interfacesList.add(org.mozilla.interfaces.nsIInputIterator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIInputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIInputStreamCallback.class);
+			interfacesList.add(org.mozilla.interfaces.nsIInputStreamChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIInputStreamPump.class);
+			interfacesList.add(org.mozilla.interfaces.nsIInputStreamTee.class);
+			interfacesList.add(org.mozilla.interfaces.nsIInstallLocation.class);
+			interfacesList.add(org.mozilla.interfaces.nsIInterfaceRequestor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIIOService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIIOService2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIJARChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIJARProtocolHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsIJARURI.class);
+			interfacesList.add(org.mozilla.interfaces.nsIJSCID.class);
+			interfacesList.add(org.mozilla.interfaces.nsIJSID.class);
+			interfacesList.add(org.mozilla.interfaces.nsIJSIID.class);
+			interfacesList.add(org.mozilla.interfaces.nsIJSON.class);
+			interfacesList.add(org.mozilla.interfaces.nsIJSXMLHttpRequest.class);
+			interfacesList.add(org.mozilla.interfaces.nsIJVMConfig.class);
+			interfacesList.add(org.mozilla.interfaces.nsIJVMConfigManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIJVMManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIJVMPluginInstance.class);
+			interfacesList.add(org.mozilla.interfaces.nsIKeygenThread.class);
+			interfacesList.add(org.mozilla.interfaces.nsIKeyObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsIKeyObjectFactory.class);
+			interfacesList.add(org.mozilla.interfaces.nsILineInputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIListBoxObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsILivemarkService.class);
+			interfacesList.add(org.mozilla.interfaces.nsILoadContext.class);
+			interfacesList.add(org.mozilla.interfaces.nsILoadGroup.class);
+			interfacesList.add(org.mozilla.interfaces.nsILocale.class);
+			interfacesList.add(org.mozilla.interfaces.nsILocaleService.class);
+			interfacesList.add(org.mozilla.interfaces.nsILocalFile.class);
+			interfacesList.add(org.mozilla.interfaces.nsILocalFileWin.class);
+			interfacesList.add(org.mozilla.interfaces.nsILocalHandlerApp.class);
+			interfacesList.add(org.mozilla.interfaces.nsILoginInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsILoginManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsILoginManager_MOZILLA_1_9_1=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsILoginManagerIEMigrationHel=
per.class);
+			interfacesList.add(org.mozilla.interfaces.nsILoginManagerPrompter.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsILoginManagerStorage.class);
+			interfacesList.add(org.mozilla.interfaces.nsILoginMetaInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIMarkupDocumentViewer.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIMemory.class);
+			interfacesList.add(org.mozilla.interfaces.nsIMemoryReporter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIMemoryReporterManager.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIMenuBoxObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsIMIMEHeaderParam.class);
+			interfacesList.add(org.mozilla.interfaces.nsIMIMEInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIMIMEInputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIMIMEService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIModule.class);
+			interfacesList.add(org.mozilla.interfaces.nsIModuleLoader.class);
+			interfacesList.add(org.mozilla.interfaces.nsIMozIconURI.class);
+			interfacesList.add(org.mozilla.interfaces.nsIMultiPartChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIMultiplexInputStream.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIMutable.class);
+			interfacesList.add(org.mozilla.interfaces.nsIMutableArray.class);
+			interfacesList.add(org.mozilla.interfaces.nsINativeAppSupport.class);
+			interfacesList.add(org.mozilla.interfaces.nsINavBookmarkObserver.class);
+			interfacesList.add(org.mozilla.interfaces.nsINavBookmarkObserver_MOZILL=
A_1_9_1_ADDITIONS.class);
+			interfacesList.add(org.mozilla.interfaces.nsINavBookmarksService.class);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryBatchCallback.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryContainerResultN=
ode.class);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryFullVisitResultN=
ode.class);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryObserver.class);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryObserver_MOZILLA=
_1_9_1_ADDITIONS.class);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryQuery.class);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryQueryOptions.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryQueryResultNode.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryResult.class);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryResultNode.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryResultTreeViewer=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryResultViewer.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryService.class);
+			interfacesList.add(org.mozilla.interfaces.nsINavHistoryVisitResultNode.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsINestedURI.class);
+			interfacesList.add(org.mozilla.interfaces.nsINetUtil.class);
+			interfacesList.add(org.mozilla.interfaces.nsINetworkLinkService.class);
+			interfacesList.add(org.mozilla.interfaces.nsINonBlockingAlertService.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsINSSCertCache.class);
+			interfacesList.add(org.mozilla.interfaces.nsINSSErrorsService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIObjectInputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIObjectLoadingContent.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIObjectOutputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIObserver.class);
+			interfacesList.add(org.mozilla.interfaces.nsIObserverService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIOCSPResponder.class);
+			interfacesList.add(org.mozilla.interfaces.nsIOfflineCacheUpdate.class);
+			interfacesList.add(org.mozilla.interfaces.nsIOfflineCacheUpdateObserver=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIOfflineCacheUpdateService.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIOSChromeItem.class);
+			interfacesList.add(org.mozilla.interfaces.nsIOutputIterator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIOutputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIOutputStreamCallback.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIParentalControlsService.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIPasswordManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPasswordManagerInternal.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIPermission.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPermissionManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPersistentProperties.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIPhonetic.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPipe.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPK11Token.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPK11TokenDB.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPKCS11.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPKCS11Module.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPKCS11ModuleDB.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPKCS11Slot.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPKIParamBlock.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPlaintextEditor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPluginHost.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPluginManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPluginTag.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPopupBoxObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPopupWindowManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrefBranch.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrefBranch2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrefBranchInternal.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrefetchService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrefLocalizedString.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrefService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrincipal.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrinterEnumerator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrintingPrompt.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrintingPromptService.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIPrintOptions.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrintProgress.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrintProgressParams.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrintSettings.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrintSettingsService.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIPrintStatusFeedback.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrivateBrowsingService.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIProcess.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProcess2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProfile.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProfileChangeStatus.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProfileLock.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProfileMigrator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProfileStartup.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProfileUnlocker.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProgrammingLanguage.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProgressEventSink.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPrompt.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPromptFactory.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPromptService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPromptService2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProperties.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProperty.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPropertyBag.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPropertyBag2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIPropertyElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProtectedAuthThread.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProtocolHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProtocolProxyCallback.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIProtocolProxyFilter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProtocolProxyService.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIProtocolProxyService2.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIProxiedChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProxiedProtocolHandler.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIProxyAutoConfig.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProxyInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIProxyObjectManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRandomAccessIterator.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIRandomGenerator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFBlob.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFCompositeDataSource.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFContainer.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFContainerUtils.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFDataSource.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFDate.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFDelegateFactory.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFInferDataSource.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFInMemoryDataSource.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFInt.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFLiteral.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFNode.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFObserver.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFPropagatableDataSource.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFPurgeableDataSource.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFRemoteDataSource.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFResource.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFXMLParser.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFXMLSerializer.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFXMLSink.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFXMLSinkObserver.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRDFXMLSource.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRecentBadCertsService.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIRecyclingAllocator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRefreshURI.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRelativeFilePref.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRemoteService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRequest.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRequestObserver.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRequestObserverProxy.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIResProtocolHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsIResumableChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIRunnable.class);
+			interfacesList.add(org.mozilla.interfaces.nsISafeOutputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsISaveAsCharset.class);
+			interfacesList.add(org.mozilla.interfaces.nsISAXAttributes.class);
+			interfacesList.add(org.mozilla.interfaces.nsISAXContentHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsISAXDTDHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsISAXErrorHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsISAXLexicalHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsISAXLocator.class);
+			interfacesList.add(org.mozilla.interfaces.nsISAXMutableAttributes.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsISAXXMLFilter.class);
+			interfacesList.add(org.mozilla.interfaces.nsISAXXMLReader.class);
+			interfacesList.add(org.mozilla.interfaces.nsIScreen.class);
+			interfacesList.add(org.mozilla.interfaces.nsIScreenManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIScreenManager_MOZILLA_1_9_=
1_BRANCH.class);
+			interfacesList.add(org.mozilla.interfaces.nsIScriptableDateFormat.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIScriptableInputStream.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIScriptableInterfaces.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIScriptableInterfacesByID.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIScriptableRegion.class);
+			interfacesList.add(org.mozilla.interfaces.nsIScriptableUnescapeHTML.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIScriptableUnicodeConverter=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIScriptChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIScriptError.class);
+			interfacesList.add(org.mozilla.interfaces.nsIScriptLoaderObserver.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIScriptSecurityManager.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIScrollable.class);
+			interfacesList.add(org.mozilla.interfaces.nsIScrollBoxObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsISearchableInputStream.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsISearchContext.class);
+			interfacesList.add(org.mozilla.interfaces.nsISearchEngine.class);
+			interfacesList.add(org.mozilla.interfaces.nsISearchSubmission.class);
+			interfacesList.add(org.mozilla.interfaces.nsISecretDecoderRing.class);
+			interfacesList.add(org.mozilla.interfaces.nsISecretDecoderRingConfig.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsISecureBrowserUI.class);
+			interfacesList.add(org.mozilla.interfaces.nsISecurityCheckedComponent.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsISecurityEventSink.class);
+			interfacesList.add(org.mozilla.interfaces.nsISecurityInfoProvider.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsISecurityWarningDialogs.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsISeekableStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsISelectElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsISelection.class);
+			interfacesList.add(org.mozilla.interfaces.nsISelection2.class);
+			interfacesList.add(org.mozilla.interfaces.nsISelectionController.class);
+			interfacesList.add(org.mozilla.interfaces.nsISelectionDisplay.class);
+			interfacesList.add(org.mozilla.interfaces.nsISelectionListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsISelectionPrivate.class);
+			interfacesList.add(org.mozilla.interfaces.nsISemanticUnitScanner.class);
+			interfacesList.add(org.mozilla.interfaces.nsISerializable.class);
+			interfacesList.add(org.mozilla.interfaces.nsIServerSocket.class);
+			interfacesList.add(org.mozilla.interfaces.nsIServerSocketListener.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIServiceManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsISHContainer.class);
+			interfacesList.add(org.mozilla.interfaces.nsISHEntry.class);
+			interfacesList.add(org.mozilla.interfaces.nsISHistory.class);
+			interfacesList.add(org.mozilla.interfaces.nsISHistoryInternal.class);
+			interfacesList.add(org.mozilla.interfaces.nsISHistoryListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsISHTransaction.class);
+			interfacesList.add(org.mozilla.interfaces.nsISidebar.class);
+			interfacesList.add(org.mozilla.interfaces.nsISidebarExternal.class);
+			interfacesList.add(org.mozilla.interfaces.nsISimpleEnumerator.class);
+			interfacesList.add(org.mozilla.interfaces.nsISimpleStreamListener.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsISimpleUnicharStreamFactory=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsISliderListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsISMimeCert.class);
+			interfacesList.add(org.mozilla.interfaces.nsISocketProvider.class);
+			interfacesList.add(org.mozilla.interfaces.nsISocketProviderService.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsISocketTransport.class);
+			interfacesList.add(org.mozilla.interfaces.nsISocketTransportService.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsISOCKSSocketInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsISound.class);
+			interfacesList.add(org.mozilla.interfaces.nsISSLCertErrorDialog.class);
+			interfacesList.add(org.mozilla.interfaces.nsISSLErrorListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsISSLSocketControl.class);
+			interfacesList.add(org.mozilla.interfaces.nsISSLStatus.class);
+			interfacesList.add(org.mozilla.interfaces.nsISSLStatusProvider.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStackFrame.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStandardURL.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStorageStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStreamCipher.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStreamConverter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStreamConverterService.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIStreamListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStreamListenerTee.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStreamLoader.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStreamLoaderObserver.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIStreamTransportService.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIStringBundle.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStringBundleOverride.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIStringBundleService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStringEnumerator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStringInputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIStyleSheetService.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupports.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsArray.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsChar.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsCString.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsDouble.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsFloat.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsID.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsInterfacePointer.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsPRBool.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsPrimitive.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsPRInt16.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsPRInt32.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsPRInt64.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsPriority.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsPRTime.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsPRUint16.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsPRUint32.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsPRUint64.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsPRUint8.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsString.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsVoid.class);
+			interfacesList.add(org.mozilla.interfaces.nsISupportsWeakReference.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsISyncLoadDOMService.class);
+			interfacesList.add(org.mozilla.interfaces.nsISyncStreamListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsISystemProxySettings.class);
+			interfacesList.add(org.mozilla.interfaces.nsITableEditor.class);
+			interfacesList.add(org.mozilla.interfaces.nsITaggingService.class);
+			interfacesList.add(org.mozilla.interfaces.nsITextScroll.class);
+			interfacesList.add(org.mozilla.interfaces.nsITextServicesFilter.class);
+			interfacesList.add(org.mozilla.interfaces.nsITextToSubURI.class);
+			interfacesList.add(org.mozilla.interfaces.nsIThread.class);
+			interfacesList.add(org.mozilla.interfaces.nsIThreadEventFilter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIThreadInternal.class);
+			interfacesList.add(org.mozilla.interfaces.nsIThreadManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIThreadObserver.class);
+			interfacesList.add(org.mozilla.interfaces.nsIThreadPool.class);
+			interfacesList.add(org.mozilla.interfaces.nsIThreadPoolListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsITimelineService.class);
+			interfacesList.add(org.mozilla.interfaces.nsITimer.class);
+			interfacesList.add(org.mozilla.interfaces.nsITimerCallback.class);
+			interfacesList.add(org.mozilla.interfaces.nsITokenDialogs.class);
+			interfacesList.add(org.mozilla.interfaces.nsITokenPasswordDialogs.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIToolkitChromeRegistry.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIToolkitProfile.class);
+			interfacesList.add(org.mozilla.interfaces.nsIToolkitProfileService.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsITooltipListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsITooltipTextProvider.class);
+			interfacesList.add(org.mozilla.interfaces.nsITraceableChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsITransaction.class);
+			interfacesList.add(org.mozilla.interfaces.nsITransactionList.class);
+			interfacesList.add(org.mozilla.interfaces.nsITransactionListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsITransactionManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsITransfer.class);
+			interfacesList.add(org.mozilla.interfaces.nsITransferable.class);
+			interfacesList.add(org.mozilla.interfaces.nsITransport.class);
+			interfacesList.add(org.mozilla.interfaces.nsITransportEventSink.class);
+			interfacesList.add(org.mozilla.interfaces.nsITransportSecurityInfo.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsITreeBoxObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsITreeColumn.class);
+			interfacesList.add(org.mozilla.interfaces.nsITreeColumns.class);
+			interfacesList.add(org.mozilla.interfaces.nsITreeContentView.class);
+			interfacesList.add(org.mozilla.interfaces.nsITreeSelection.class);
+			interfacesList.add(org.mozilla.interfaces.nsITreeView.class);
+			interfacesList.add(org.mozilla.interfaces.nsITXTToHTMLConv.class);
+			interfacesList.add(org.mozilla.interfaces.nsITypeAheadFind.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUnicharInputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUnicharLineInputStream.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIUnicharOutputStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUnicharStreamListener.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIUnicharStreamLoader.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUnicharStreamLoaderObserve=
r.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUnicodeNormalizer.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUpdate.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUpdateChecker.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUpdateCheckListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUpdateItem.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUpdateManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUpdatePatch.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUpdatePrompt.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUpdateTimerManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUploadChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIURI.class);
+			interfacesList.add(org.mozilla.interfaces.nsIURIChecker.class);
+			interfacesList.add(org.mozilla.interfaces.nsIURIClassifier.class);
+			interfacesList.add(org.mozilla.interfaces.nsIURIClassifierCallback.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIURIContentListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIURIFixup.class);
+			interfacesList.add(org.mozilla.interfaces.nsIURILoader.class);
+			interfacesList.add(org.mozilla.interfaces.nsIURIRefObject.class);
+			interfacesList.add(org.mozilla.interfaces.nsIURL.class);
+			interfacesList.add(org.mozilla.interfaces.nsIURLFormatter.class);
+			interfacesList.add(org.mozilla.interfaces.nsIURLParser.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUserCertPicker.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUserInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIUTF8ConverterService.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIUTF8StringEnumerator.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIUUIDGenerator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIVariant.class);
+			interfacesList.add(org.mozilla.interfaces.nsIVersionComparator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWeakReference.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebBrowser.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebBrowserChrome.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebBrowserChrome2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebBrowserChromeFocus.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIWebBrowserFind.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebBrowserFindInFrames.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIWebBrowserFocus.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebBrowserPersist.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebBrowserPrint.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebBrowserSetup.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebBrowserStream.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebContentHandlerRegistrar=
.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebHandlerApp.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebNavigation.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebNavigationInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebPageDescriptor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebProgress.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebProgressListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWebProgressListener2.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIWifiAccessPoint.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWifiListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWifiMonitor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWindowCreator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWindowCreator2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWindowDataSource.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWindowMediator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWindowMediatorListener.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIWindowProvider.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWindowWatcher.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWorker.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWorkerErrorEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWorkerGlobalScope.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWorkerMessageEvent.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWorkerMessagePort.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWorkerNavigator.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWorkerScope.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWritablePropertyBag.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWritablePropertyBag2.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIWritableVariant.class);
+			interfacesList.add(org.mozilla.interfaces.nsIWyciwygChannel.class);
+			interfacesList.add(org.mozilla.interfaces.nsIX509Cert.class);
+			interfacesList.add(org.mozilla.interfaces.nsIX509Cert2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIX509Cert3.class);
+			interfacesList.add(org.mozilla.interfaces.nsIX509CertDB.class);
+			interfacesList.add(org.mozilla.interfaces.nsIX509CertDB2.class);
+			interfacesList.add(org.mozilla.interfaces.nsIX509CertList.class);
+			interfacesList.add(org.mozilla.interfaces.nsIX509CertValidity.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXBLAccessible.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXMLContentBuilder.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXMLHttpRequest.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXMLHttpRequestEventTarget.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIXMLHttpRequestUpload.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCComponents.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCComponents_Classes.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCComponents_ClassesByID.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCComponents_Constructor.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCComponents_Exception.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCComponents_ID.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCComponents_Results.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCComponents_Utils.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCComponents_utils_Sandbo=
x.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCConstructor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCException.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCSecurityManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPCWrappedJSObjectGetter.c=
lass);
+			interfacesList.add(org.mozilla.interfaces.nsIXPIDialogService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPIInstallInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPInstallManager.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPIProgressDialog.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPointerResult.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPTLoader.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXPTLoaderSink.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXSLTException.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXSLTProcessor.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXSLTProcessorObsolete.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIXSLTProcessorPrivate.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsIXTFAttributeHandler.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXTFElement.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXTFElementFactory.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXTFElementWrapper.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXTFPrivate.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULAppInfo.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULAppInstall.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULBrowserWindow.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULBuilderListener.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULChromeRegistry.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULOverlayProvider.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULRuntime.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULSortService.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULTemplateBuilder.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULTemplateQueryProcessor.=
class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULTemplateResult.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULTemplateRuleFilter.clas=
s);
+			interfacesList.add(org.mozilla.interfaces.nsIXULTreeBuilder.class);
+			interfacesList.add(org.mozilla.interfaces.nsIXULTreeBuilderObserver.cla=
ss);
+			interfacesList.add(org.mozilla.interfaces.nsIXULWindow.class);
+			interfacesList.add(org.mozilla.interfaces.nsIZipEntry.class);
+			interfacesList.add(org.mozilla.interfaces.nsIZipReader.class);
+			interfacesList.add(org.mozilla.interfaces.nsIZipReaderCache.class);
+			interfacesList.add(org.mozilla.interfaces.nsIZipWriter.class);
+			interfacesList.add(org.mozilla.interfaces.nsPICommandUpdater.class);
+			interfacesList.add(org.mozilla.interfaces.nsPIDNSService.class);
+			interfacesList.add(org.mozilla.interfaces.nsPIEditorTransaction.class);
+			interfacesList.add(org.mozilla.interfaces.nsPIExternalAppLauncher.class=
);
+			interfacesList.add(org.mozilla.interfaces.nsPIPlacesDatabase.class);
+			interfacesList.add(org.mozilla.interfaces.nsPISocketTransportService.cl=
ass);
+			interfacesList.add(org.mozilla.interfaces.rdfIDataSource.class);
+			interfacesList.add(org.mozilla.interfaces.rdfISerializer.class);
+			interfacesList.add(org.mozilla.interfaces.rdfITripleVisitor.class);
+			interfacesList.add(org.mozilla.interfaces.txIEXSLTRegExFunctions.class);
+			interfacesList.add(org.mozilla.interfaces.txIFunctionEvaluationContext.=
class);
+			interfacesList.add(org.mozilla.interfaces.txINodeSet.class);
+			interfacesList.add(org.mozilla.interfaces.txIXPathObject.class);
+			interfacesList.add(org.mozilla.interfaces.xpcIJSModuleLoader.class);
+			interfacesList.add(org.mozilla.interfaces.xpcIJSWeakReference.class);
+		}
+
+		return interfacesList;
+	}
 }

Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/=
tools/vpe/xulrunner/test/DOMCreatingTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/=
vpe/xulrunner/test/DOMCreatingTest.java	2010-05-31 15:35:26 UTC (rev 22443)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/=
vpe/xulrunner/test/DOMCreatingTest.java	2010-05-31 16:06:07 UTC (rev 22444)
@@ -1,18 +1,15 @@
 /*************************************************************************=
******
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-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:
- *     Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- *************************************************************************=
*****/ =

+ * Contributor:
+ *     Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
 package org.jboss.tools.vpe.xulrunner.test;
 =

-import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
-import org.jboss.tools.vpe.xulrunner.view.XulRunnerView;
 import org.mozilla.interfaces.nsIDOMAttr;
 import org.mozilla.interfaces.nsIDOMDocument;
 import org.mozilla.interfaces.nsIDOMElement;
@@ -26,19 +23,13 @@
  * @author Max Areshkau
  * =

  */
-public class DOMCreatingTest extends XulRunnerBrowserTest {
-
+public class DOMCreatingTest extends XulRunnerAbstractTest {
 	/**
-	 * Contains brouser instamce
-	 */
-	private XulRunnerEditor xulrunnerBrowser;
-
-	/**
 	 * Tests possability add and remove dom elements.
 	 * =

 	 */
 	public void testAddRemovingDOMElements() {
-	    	nsIDOMDocument domDocument =3D xulrunnerBrowser.getDOMDocument();
+	    	nsIDOMDocument domDocument =3D xulRunnerEditor.getDOMDocument();
 		nsIDOMElement root =3D domDocument.getDocumentElement();
 		nsIDOMElement child =3D domDocument.createElement("test-element");
 		root.appendChild(child);
@@ -61,8 +52,8 @@
 		String chieldName =3D "H";
 		String attrName =3D "color";
 		String attrValue =3D "TEST_VALUE";
-		assertNotNull(xulrunnerBrowser);
-		nsIDOMDocument domDocument =3D xulrunnerBrowser.getDOMDocument();
+		assertNotNull(xulRunnerEditor);
+		nsIDOMDocument domDocument =3D xulRunnerEditor.getDOMDocument();
 		nsIDOMElement root =3D domDocument.getDocumentElement();
 =

 		for (long i =3D root.getChildNodes().getLength() - 1; i >=3D 0; i--) {
@@ -106,19 +97,6 @@
 	}
 =

 	@Override
-	protected void setUp() throws Exception {
-		super.setUp();
-		waitForJobs();
-		XulRunnerView xulrunner
-			=3D ((XulRunnerView) PlatformUI.getWorkbench()
-				.getActiveWorkbenchWindow().getActivePage().showView(VIEW_ID));
-		waitForJobs();
-		delay(3000);
-		=

-		xulrunnerBrowser =3D xulrunner.getBrowser();
-	}
-
-	@Override
 	protected void tearDown() throws Exception {
 		super.tearDown();
 	}

Added: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/too=
ls/vpe/xulrunner/test/XPCOMTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/=
vpe/xulrunner/test/XPCOMTest.java	                        (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/=
vpe/xulrunner/test/XPCOMTest.java	2010-05-31 16:06:07 UTC (rev 22444)
@@ -0,0 +1,72 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007-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
+ *
+ * Contributor:
+ *     Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+package org.jboss.tools.vpe.xulrunner.test;
+
+import java.util.List;
+
+import org.jboss.tools.vpe.xulrunner.XPCOM;
+import org.mozilla.interfaces.jsdIScript;
+import org.mozilla.interfaces.nsIDOMDocument;
+import org.mozilla.interfaces.nsIDOMDocumentView;
+import org.mozilla.interfaces.nsIDOMNSDocument;
+import org.mozilla.interfaces.nsIDOMNSElement;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.mozilla.interfaces.nsISupports;
+import org.mozilla.xpcom.XPCOMException;
+
+/**
+ * Tests for {@link XPCOM} class.
+ * =

+ * @author Yahor Radtsevich (yradtsevich)
+ */
+public class XPCOMTest extends XulRunnerAbstractTest {
+
+	/**
+	 * Test method for {@link org.jboss.tools.vpe.xulrunner.XPCOM#queryInterf=
ace(org.mozilla.interfaces.nsISupports, java.lang.Class)}.
+	 */
+	public void testQueryInterface() {
+		nsIDOMDocument document =3D xulRunnerEditor.getDOMDocument();
+
+		assertTrue(XPCOM.queryInterface(document, nsIDOMDocument.class) instance=
of nsIDOMDocument);
+		assertTrue(XPCOM.queryInterface(document, nsIDOMNSDocument.class) instan=
ceof nsIDOMNSDocument);
+
+		try {
+			document.queryInterface(nsIDOMNSElement.NS_IDOMNSELEMENT_IID);
+			fail("Expected Exception XPCOMException");
+		} catch (XPCOMException e) {
+			// do nothing, it's OK
+		}
+	}
+
+	/**
+	 * Test method for {@link org.jboss.tools.vpe.xulrunner.XPCOM#getInterfac=
eId(java.lang.Class)}.
+	 */
+	public void testGetInterfaceId() {
+		assertEquals(nsIDOMDocument.NS_IDOMDOCUMENT_IID, XPCOM.getInterfaceId(ns=
IDOMDocument.class));
+		assertEquals(nsIDOMNode.NS_IDOMNODE_IID, XPCOM.getInterfaceId(nsIDOMNode=
.class));
+		assertEquals(jsdIScript.JSDISCRIPT_IID, XPCOM.getInterfaceId(jsdIScript.=
class));
+	}
+
+	/**
+	 * Test method for {@link org.jboss.tools.vpe.xulrunner.XPCOM#getSupporte=
dInterfaces(org.mozilla.interfaces.nsISupports)}.
+	 */
+	public void testGetSupportedInterfaces() {
+		nsIDOMDocument document =3D xulRunnerEditor.getDOMDocument();
+
+		List> supportedInterfaces
+				=3D XPCOM.getSupportedInterfaces(document);
+
+		assertTrue(supportedInterfaces.contains(nsISupports.class));
+		assertTrue(supportedInterfaces.contains(nsIDOMNode.class));
+		assertTrue(supportedInterfaces.contains(nsIDOMDocumentView.class));
+		assertTrue(supportedInterfaces.contains(nsIDOMDocument.class));
+	}
+}

Added: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/too=
ls/vpe/xulrunner/test/XulRunnerAbstractTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/=
vpe/xulrunner/test/XulRunnerAbstractTest.java	                        (rev =
0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/=
vpe/xulrunner/test/XulRunnerAbstractTest.java	2010-05-31 16:06:07 UTC (rev =
22444)
@@ -0,0 +1,110 @@
+/*************************************************************************=
******
+ * Copyright (c) 2007-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
+ *
+ * Contributor:
+ *     Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
+package org.jboss.tools.vpe.xulrunner.test;
+
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.vpe.xulrunner.editor.XulRunnerEditor;
+import org.jboss.tools.vpe.xulrunner.view.XulRunnerView;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Yahor Radtsevich (yradtsevich): extracted superclass from
+ * {@code XulRunnerBrowserTest}.
+ *
+ */
+public abstract class XulRunnerAbstractTest extends TestCase {
+
+	public static final String VIEW_ID =3D "org.jboss.tools.vpe.xulrunner.vie=
w.XulRunnerView";
+
+	/**
+	 * Contains browser instamce
+	 */
+	protected XulRunnerEditor xulRunnerEditor;
+	protected XulRunnerView xulRunnerView;
+	=

+	public XulRunnerAbstractTest() {
+		super();
+	}
+
+	/**
+	 * @param name
+	 */
+	public XulRunnerAbstractTest(String name) {
+		super(name);
+	}
+
+	/**
+	 * Process UI input but do not return for the specified time interval.
+	 * =

+	 * @param waitTimeMillis
+	 *                the number of milliseconds
+	 */
+	protected void delay(long waitTimeMillis) {
+		Display display =3D Display.getCurrent();
+		=

+		// If this is the UI thread,
+		// then process input.
+		if (display !=3D null) {
+		    long endTimeMillis =3D System.currentTimeMillis() + waitTimeMillis;
+		    while (System.currentTimeMillis() < endTimeMillis) {
+			if (!display.readAndDispatch())
+			    display.sleep();
+		    }
+		    display.update();
+		}
+		// Otherwise, perform a simple sleep.
+		else {
+		    try {
+			Thread.sleep(waitTimeMillis);
+		    } catch (InterruptedException e) {
+			// Ignored.
+		    }
+		}
+	}
+
+	/**
+	 * Wait until all background tasks are complete.
+	 */
+	public void waitForJobs() {
+		while (Job.getJobManager().currentJob() !=3D null)
+		    delay(1000);
+	}
+	=

+	@Override
+	protected void setUp() throws Exception {
+		super.setUp();
+		waitForJobs();
+		xulRunnerView
+			=3D ((XulRunnerView) PlatformUI.getWorkbench()
+				.getActiveWorkbenchWindow().getActivePage().showView(VIEW_ID));
+
+		// Delay for 3 seconds so that
+		// the Favorites view can be seen.
+		waitForJobs();
+		// commented by dgolovin to get rid of jvm error [libexpat.so.0+0xeff4]
+		//delay(3000);
+		=

+		xulRunnerEditor =3D xulRunnerView.getBrowser();
+	}
+	=

+	@Override
+	protected void tearDown() throws Exception {
+		PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
+				.hideView(xulRunnerView);
+		=

+		xulRunnerEditor =3D null;
+		xulRunnerView =3D null;
+		super.tearDown();
+	}
+}

Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/=
tools/vpe/xulrunner/test/XulRunnerAllTests.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/=
vpe/xulrunner/test/XulRunnerAllTests.java	2010-05-31 15:35:26 UTC (rev 2244=
3)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/=
vpe/xulrunner/test/XulRunnerAllTests.java	2010-05-31 16:06:07 UTC (rev 2244=
4)
@@ -1,25 +1,24 @@
 /*************************************************************************=
******
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-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:
- *     Exadel, Inc. and Red Hat, Inc. - initial API and implementation
- *************************************************************************=
*****/ =

+ * Contributor:
+ *     Red Hat, Inc. - initial API and implementation
+ *************************************************************************=
*****/
 package org.jboss.tools.vpe.xulrunner.test;
 =

 import junit.framework.Test;
 import junit.framework.TestSuite;
 =

 public class XulRunnerAllTests {
-
 	public static Test suite() {
 		TestSuite suite =3D new TestSuite("Test for " + XulRunnerAllTests.class.=
getName());
-		//add test cases for dom elements
-		suite.addTestSuite(XulRunnerBrowserTest.class);		=

+		suite.addTestSuite(XulRunnerBrowserTest.class);
+		suite.addTestSuite(DOMCreatingTest.class);
+		suite.addTestSuite(XPCOMTest.class);
 		return suite;
 	}
-
 }

Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/=
tools/vpe/xulrunner/test/XulRunnerBrowserTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/=
vpe/xulrunner/test/XulRunnerBrowserTest.java	2010-05-31 15:35:26 UTC (rev 2=
2443)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/=
vpe/xulrunner/test/XulRunnerBrowserTest.java	2010-05-31 16:06:07 UTC (rev 2=
2444)
@@ -1,75 +1,17 @@
 /*************************************************************************=
******
- * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Copyright (c) 2007-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:
- *     Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ * Contributor:
+ *     Red Hat, Inc. - initial API and implementation
  *************************************************************************=
*****/
 package org.jboss.tools.vpe.xulrunner.test;
 =

-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.vpe.xulrunner.view.XulRunnerView;
-
-public class XulRunnerBrowserTest extends TestCase {
-    public static final String VIEW_ID =3D "org.jboss.tools.vpe.xulrunner.=
view.XulRunnerView";
-
-    /**
-     * Process UI input but do not return for the specified time interval.
-     * =

-     * @param waitTimeMillis
-     *                the number of milliseconds
-     */
-    protected void delay(long waitTimeMillis) {
-	Display display =3D Display.getCurrent();
-
-	// If this is the UI thread,
-	// then process input.
-	if (display !=3D null) {
-	    long endTimeMillis =3D System.currentTimeMillis() + waitTimeMillis;
-	    while (System.currentTimeMillis() < endTimeMillis) {
-		if (!display.readAndDispatch())
-		    display.sleep();
-	    }
-	    display.update();
-	}
-	// Otherwise, perform a simple sleep.
-	else {
-	    try {
-		Thread.sleep(waitTimeMillis);
-	    } catch (InterruptedException e) {
-		// Ignored.
-	    }
-	}
+public class XulRunnerBrowserTest extends XulRunnerAbstractTest {
+    public void testXulRunnerBrowser() {
+    	assertNotNull(xulRunnerView);
     }
-
-    /**
-     * Wait until all background tasks are complete.
-     */
-    public void waitForJobs() {
-	while (Job.getJobManager().currentJob() !=3D null)
-	    delay(1000);
-    }
-
-    public void testXulRunnerBrowser() throws PartInitException {
-	waitForJobs();
-	XulRunnerView mozillaView =3D (XulRunnerView) PlatformUI.getWorkbench()
-		.getActiveWorkbenchWindow().getActivePage().showView(VIEW_ID);
-
-	// Delay for 3 seconds so that
-	// the Favorites view can be seen.
-	waitForJobs();
-	// commented by dgolovin to get rid of jvm error [libexpat.so.0+0xeff4]
-	//delay(3000);
-
-	PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-		.hideView(mozillaView);
-    }
 }


--===============2174991695942805082==--

From jbosstools-commits at lists.jboss.org Mon May 31 12:12:06 2010
Content-Type: multipart/mixed; boundary="===============7139104893078965064=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN: r22445 -
 trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/vpe/xulrunner/test.
Date: Mon, 31 May 2010 12:12:06 -0400
Message-ID: <201005311612.o4VGC6p6012056@svn01.web.mwc.hst.phx2.redhat.com>

--===============7139104893078965064==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: yradtsevich
Date: 2010-05-31 12:12:05 -0400 (Mon, 31 May 2010)
New Revision: 22445

Modified:
   trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/v=
pe/xulrunner/test/XPCOMTest.java
Log:
https://jira.jboss.org/browse/JBIDE-6393
Create generic queryInterface method
 - A mistake in the JUnit has been fixed.

Modified: trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/=
tools/vpe/xulrunner/test/XPCOMTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/=
vpe/xulrunner/test/XPCOMTest.java	2010-05-31 16:06:07 UTC (rev 22444)
+++ trunk/vpe/tests/org.jboss.tools.vpe.xulrunner.test/src/org/jboss/tools/=
vpe/xulrunner/test/XPCOMTest.java	2010-05-31 16:12:05 UTC (rev 22445)
@@ -39,7 +39,7 @@
 		assertTrue(XPCOM.queryInterface(document, nsIDOMNSDocument.class) instan=
ceof nsIDOMNSDocument);
 =

 		try {
-			document.queryInterface(nsIDOMNSElement.NS_IDOMNSELEMENT_IID);
+			XPCOM.queryInterface(document, nsIDOMNSElement.class);
 			fail("Expected Exception XPCOMException");
 		} catch (XPCOMException e) {
 			// do nothing, it's OK


--===============7139104893078965064==--

From jbosstools-commits at lists.jboss.org Mon May 31 18:11:45 2010
Content-Type: multipart/mixed; boundary="===============3895404718668139905=="
MIME-Version: 1.0
From: jbosstools-commits at lists.jboss.org
To: jbosstools-commits at lists.jboss.org
Subject: [jbosstools-commits] JBoss Tools SVN:  r22446 - trunk/vpe/tests.
Date: Mon, 31 May 2010 18:11:45 -0400
Message-ID: <201005312211.o4VMBjqh023366@svn01.web.mwc.hst.phx2.redhat.com>

--===============3895404718668139905==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: nickboldt
Date: 2010-05-31 18:11:45 -0400 (Mon, 31 May 2010)
New Revision: 22446

Modified:
   trunk/vpe/tests/pom.xml
Log:
reorder pom

Modified: trunk/vpe/tests/pom.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/vpe/tests/pom.xml	2010-05-31 16:12:05 UTC (rev 22445)
+++ trunk/vpe/tests/pom.xml	2010-05-31 22:11:45 UTC (rev 22446)
@@ -12,12 +12,12 @@
 	0.0.1-SNAPSHOT
 	pom
 	
+		org.jboss.tools.vpe.ui.test
 		org.jboss.tools.vpe.html.test
 		org.jboss.tools.vpe.jsp.test
 		org.jboss.tools.vpe.test
 		org.jboss.tools.vpe.ui.bot.test
-		org.jboss.tools.vpe.ui.test
 		org.jboss.tools.vpe.xulrunner.test
 	
 
-	=

\ No newline at end of file
+	=



--===============3895404718668139905==--