September 2011 - jbosstools-commits

JBoss Tools SVN: r34888 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-09-20 14:32:17 -0400 (Tue, 20 Sep 2011) New Revision: 34888 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java Log: JBIDE-9742 https://issues.jboss.org/browse/JBIDE-9742 Fixed CDIUtil.findInjectionPoint() 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/CDIUtil.java 2011-09-20 18:31:58 UTC (rev 34887) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-09-20 18:32:17 UTC (rev 34888) @@ -221,11 +221,15 @@ if (((IInjectionPointField) iPoint).getField() != null && ((IInjectionPointField) iPoint).getField().getElementName().equals(element.getElementName())) return iPoint; }else if(element instanceof ILocalVariable && iPoint instanceof IInjectionPointParameter){ - if (((IInjectionPointParameter) iPoint).getName().equals(element.getElementName())) + IInjectionPointParameter param = (IInjectionPointParameter)iPoint; + if (param.getBeanMethod().getMethod().equals(element.getParent()) + && param.getName().equals(element.getElementName())) { return iPoint; + } }else if(iPoint instanceof IInjectionPointParameter && position != 0){ - if(iPoint.getStartPosition() <= position && (iPoint.getStartPosition()+iPoint.getLength()) >= position) + if(iPoint.getStartPosition() <= position && (iPoint.getStartPosition()+iPoint.getLength()) >= position) { return iPoint; + } } } }

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r34887 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2011-09-20 14:31:58 -0400 (Tue, 20 Sep 2011) New Revision: 34887 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection2.java Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java Log: JBIDE-9742 https://issues.jboss.org/browse/JBIDE-9742 Fixed CDIUtil.findInjectionPoint() Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection2.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection2.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection2.java 2011-09-20 18:31:58 UTC (rev 34887) @@ -0,0 +1,41 @@ +package org.jboss.jsr299.tck.tests.jbt.core; + +import javax.inject.Inject; + +/** + * Test contains 10 injection points in methods with the same name and equally named parameters + * but with different parameter types. Method CDIUtil.findInjectionPoint() is tested to return + * correct injection point for each parameter. + * + */ +public class TestInjection2 { + + @Inject + public void initialize(TestBean children) { + } + + @Inject + public void initialize(FooBean children) { + } + + @Inject + public void initialize(TestBean children, TestBean children2) { + } + + @Inject + public void initialize(TestBean children, FooBean children2) { + } + + @Inject + public void initialize(FooBean children, FooBean children2) { + } + + @Inject + public void initialize(FooBean children, TestBean children2) { + } + + static class TestBean {} + + static class FooBean {} + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-20 17:30:11 UTC (rev 34886) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-20 18:31:58 UTC (rev 34887) @@ -12,9 +12,13 @@ import java.util.Set; +import org.eclipse.core.runtime.Path; +import org.eclipse.jdt.core.IJavaElement; import org.jboss.tools.cdi.core.CDIUtil; +import org.jboss.tools.cdi.core.IBean; 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.common.java.IAnnotationDeclaration; /** @@ -45,4 +49,19 @@ } } } + + public void testFindInjectionPoint() throws Exception { + String path = "JavaSource/org/jboss/jsr299/tck/tests/jbt/core/TestInjection2.java"; + IClassBean bean = getClassBean("org.jboss.jsr299.tck.tests.jbt.core.TestInjection2", path); + Set<IBean> bs = cdiProject.getBeans(new Path("/tck/" + path)); + Set<IInjectionPointParameter> ps = CDIUtil.getInjectionPointParameters(bean); + assertEquals(10, ps.size()); + for (IInjectionPointParameter p: ps) { + for (int pos = p.getStartPosition(); pos < p.getStartPosition() + p.getLength(); pos++) { + IJavaElement element = bean.getBeanClass().getCompilationUnit().getElementAt(pos); + IInjectionPoint p1 = CDIUtil.findInjectionPoint(bs, element, pos); + assertTrue("Injection point is wrong at position " + pos + " for element " + element, p == p1); + } + } + } } \ No newline at end of file

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r34886 - in branches/jbosstools-3.2.x/build/aggregate: webtools-site and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-09-20 13:30:11 -0400 (Tue, 20 Sep 2011) New Revision: 34886 Modified: branches/jbosstools-3.2.x/build/aggregate/site/index.html branches/jbosstools-3.2.x/build/aggregate/site/site.xsl branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml branches/jbosstools-3.2.x/build/aggregate/webtools-site/index.html branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xsl Log: backport trunk changes for https://issues.jboss.org/browse/JBIDE-9721 and https://issues.jboss.org/browse/JBIDE-9743 to 32x branch Modified: branches/jbosstools-3.2.x/build/aggregate/site/index.html =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/site/index.html 2011-09-20 17:21:43 UTC (rev 34885) +++ branches/jbosstools-3.2.x/build/aggregate/site/index.html 2011-09-20 17:30:11 UTC (rev 34886) @@ -8,7 +8,7 @@ <body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> <center> <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0" width="920"> + cellspacing="0" cellpadding="0" width="920" class="bodyText"> <tr> <td colspan="3"><img src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> @@ -465,10 +465,10 @@ </tr> <tr style="background-color:#EEEEEE"> <td class="rowLine"><a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a></td> + :: + <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> + :: + <a href="content.jar" style="font-size:x-small">content.jar</a></td> <td class="rowLine"></td> <td class="rowLine"></td> </tr> Modified: branches/jbosstools-3.2.x/build/aggregate/site/site.xsl =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/site/site.xsl 2011-09-20 17:21:43 UTC (rev 34885) +++ branches/jbosstools-3.2.x/build/aggregate/site/site.xsl 2011-09-20 17:30:11 UTC (rev 34886) @@ -5,7 +5,8 @@ <xsl:output method="html" indent="yes" /> <xsl:template match="/site"> <br /> - <table cellspacing="2" cellpadding="0" border="0"> + <table cellspacing="2" cellpadding="0" border="0"> + <xsl:if test="count(feature[contains(@id,'jboss')])>0"> <tr style="background-color:#DDDDDD"> <th style="font-size:small">Feature</th> <th style="font-size:small">Version</th> @@ -50,6 +51,8 @@ </td> </tr> </xsl:for-each> + </xsl:if> + <xsl:if test="count(feature[not(contains(@id,'jboss'))])>0"> <tr style="background-color:#DDDDDD"> <th style="font-size:small">Feature</th> <th style="font-size:small">Version</th> @@ -94,25 +97,27 @@ </td> </tr> </xsl:for-each> - <tr style="background-color:#DDDDDD"> - <th colspan="1" style="font-size:small">Metadata</th> - <th colspan="1" style="font-size:small"></th> - <th colspan="1" style="font-size:small"></th> - </tr> - <tr style="background-color:#EEEEEE"> - <td class="rowLine"> - <a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a> - </td> - <td class="rowLine"> - </td> - <td class="rowLine"> - </td> - </tr> - </table> + </xsl:if> + + <tr style="background-color:#DDDDDD"> + <th colspan="1" style="font-size:small">Metadata</th> + <th colspan="1" style="font-size:small"></th> + <th colspan="1" style="font-size:small"></th> + </tr> + <tr style="background-color:#EEEEEE"> + <td class="rowLine"> + <a href="site.xml" style="font-size:x-small">site.xml</a> + :: + <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> + :: + <a href="content.jar" style="font-size:x-small">content.jar</a> + </td> + <td class="rowLine"> + </td> + <td class="rowLine"> + </td> + </tr> + </table> <br /> </xsl:template> </xsl:stylesheet> Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml 2011-09-20 17:21:43 UTC (rev 34885) +++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/build.xml 2011-09-20 17:30:11 UTC (rev 34886) @@ -45,7 +45,8 @@ <antcall target="get.saxon" /> </target> - <target name="custom.build" description="aggregate update site extras" depends="init,check.target,add.associate.sites,add.web.content,pack.zip,collect.zips,collect.metadata,create.summary.file" /> +  + <target name="custom.build" description="aggregate update site extras" depends="init,check.target,add.associate.sites,add.web.content,pack.zip" /> <target name="get.saxon" unless="saxon.jar.exists">  @@ -438,6 +439,11 @@ from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER} default update.site.description=Nightly Build default update.site.version=(null) + + To test output, run in parent folder (bottests-site/): + $ mvn install -DJOB_NAME=jbosstools-3.2_stable_branch.webtools.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 + or + $ mvn install -DJOB_NAME=jbosstools-3.2_stable_branch.webtools.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.2.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" --> <property name="update.site.description" value="Nightly Build" /> <if> @@ -450,7 +456,18 @@ <isset property="BUILD_NUMBER" /> </and> <then> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + <if> + <and> + <isset property="JBT_VERSION" /> + <isset property="BUILD_ALIAS" /> + </and> + <then> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_ALIAS}\3.${BUILD_ID}-H${BUILD_NUMBER}" /> + </then> + <else> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + </else> + </if> </then> <else> <property name="update.site.version" value="" /> @@ -485,7 +502,7 @@ <delete file="${update.site.source.dir}/site.html" quiet="true" /> </target> -  <target name="collect.zips" description="collect zips from the sites we aggregated"> <property name="aggregate.zips.dir" value="${output.dir}/zips" /> Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/index.html =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/webtools-site/index.html 2011-09-20 17:21:43 UTC (rev 34885) +++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/index.html 2011-09-20 17:30:11 UTC (rev 34886) @@ -1,34 +1,37 @@ <html> <head> -<title>JBoss Tools - Web Tools - Nightly Build Update Site</title> +<title>JBoss Tools - Web Tools - Stable Milestone Update Site: 3.3.99.M7.webtools.2011-09-19_19-10-45-H6969</title> <style> @import url("http://download.jboss.org/jbosstools/updates/web/site.css"); </style> </head> <body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<center> <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0"> + cellspacing="0" cellpadding="0" width="920" class="bodyText"> <tr> - <td colspan="2"><img + <td colspan="3"><img src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> </tr> <tr> - <td>  </td> + <td>      </td> + <td>      </td> + <td>      </td> </tr> <tr> - <td>  </td> + <td>      </td> <td> - <h2 class="title">JBoss Tools - Web Tools - Nightly Build Update Site</h2> + <h2 class="title">JBoss Tools - Web Tools - Stable Milestone Update Site</h2> <table width="100%"> <tr class="header"> - <td class="sub-header" width="100%"><span>Latest Build</span></td> + <td class="sub-header" width="100%"><span>Latest Build: 3.3.99.M7.webtools.2011-09-19_19-10-45-H6969</span></td> </tr> <tr class="light-row" style="height: 30px"> <td class="bodyText"> - <p class="bodyText">This is the <b>Nightly Build</b> + <p class="bodyText">This is the <b>Stable Milestone</b> Update Site for JBoss Tools - Web Tools. See <a class="link" - href="http://www.jboss.org/tools/download/update">Installation + href="http://www.jboss.org/tools/download/installation/update_3_2">Installation Instructions</a>.</p> </td> </tr> @@ -52,29 +55,70 @@ <p class="bodyText">You can also download JBoss Tools as individual zips for offline installation. See <a class="link" href="http://www.jboss.org/tools/download">JBoss Tools - Downloads</a>.</p> - </td> - </tr> - - <tr class="dark-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">For more information, see <a + Downloads</a>.<br/> + If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a href="http://www.jboss.org/tools/download/installation">Installation methods</a>.</p> </td> </tr> - <tr> - <td class="spacer"><br /> - </td> - <td class="spacer"><br /> - </td> - </tr> </table> </td> + <td>      </td> </tr> <tr> <td></td> <td> + <br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br><table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0"> + <tr style="background-color:#DDDDDD"> + <th style="font-size:small">Feature</th> + <th style="font-size:small">Version</th> + <th style="font-size:small"> + Feature Categor(ies) + + </th> + </tr> + <tr style="background-color:
							#EEEEEE
						"> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.0.v20110920-0932-H182-CR1.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td> + <td><span style="font-size:x-small">3.2.0.v20110920-0932-H182-CR1</span></td> + <td><span style="font-size:x-small"> + | + org.eclipse.wst.server.core.serverAdapter</span></td> + </tr> + <tr style="background-color:
							#FFFFFF
						"> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.2.0.v20110920-0516-H242-CR1.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td> + <td><span style="font-size:x-small">2.2.0.v20110920-0516-H242-CR1</span></td> + <td><span style="font-size:x-small"> + | + org.eclipse.wst.server.core.serverAdapter</span></td> + </tr> + <tr style="background-color:
							#EEEEEE
						"> + <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.1.0.v20110920-0921-H143-CR1.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td> + <td><span style="font-size:x-small">1.1.0.v20110920-0921-H143-CR1</span></td> + <td><span style="font-size:x-small"> + | + org.eclipse.wst.server.core.serverAdapter</span></td> + </tr> + <tr style="background-color:#DDDDDD"> + <th colspan="1" style="font-size:small">Metadata</th> + <th colspan="1" style="font-size:small"></th> + <th colspan="1" style="font-size:small"></th> + </tr> + <tr style="background-color:#EEEEEE"> + <td class="rowLine"><a href="site.xml" style="font-size:x-small">site.xml</a> + :: + <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> + :: + <a href="content.jar" style="font-size:x-small">content.jar</a></td> + <td class="rowLine"></td> + <td class="rowLine"></td> + </tr> +</table><br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br> + </td> + <td></td> + </tr> + <tr> + <td></td> + <td> <table width="100%"> <tr class="header"> <td class="sub-header" width="100%"><span> Installation @@ -130,4 +174,5 @@ </td> </tr> </table> +</center> </html> Modified: branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xsl =================================================================== --- branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xsl 2011-09-20 17:21:43 UTC (rev 34885) +++ branches/jbosstools-3.2.x/build/aggregate/webtools-site/site.xsl 2011-09-20 17:30:11 UTC (rev 34886) @@ -5,7 +5,8 @@ <xsl:output method="html" indent="yes" /> <xsl:template match="/site"> <br /> - <table cellspacing="2" cellpadding="0" border="0"> + <table cellspacing="2" cellpadding="0" border="0"> + <xsl:if test="count(feature[contains(@id,'jboss')])>0"> <tr style="background-color:#DDDDDD"> <th style="font-size:small">Feature</th> <th style="font-size:small">Version</th> @@ -50,6 +51,8 @@ </td> </tr> </xsl:for-each> + </xsl:if> + <xsl:if test="count(feature[not(contains(@id,'jboss'))])>0"> <tr style="background-color:#DDDDDD"> <th style="font-size:small">Feature</th> <th style="font-size:small">Version</th> @@ -94,25 +97,27 @@ </td> </tr> </xsl:for-each> - <tr style="background-color:#DDDDDD"> - <th colspan="1" style="font-size:small">Metadata</th> - <th colspan="1" style="font-size:small"></th> - <th colspan="1" style="font-size:small"></th> - </tr> - <tr style="background-color:#EEEEEE"> - <td class="rowLine"> - <a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a> - </td> - <td class="rowLine"> - </td> - <td class="rowLine"> - </td> - </tr> - </table> + </xsl:if> + + <tr style="background-color:#DDDDDD"> + <th colspan="1" style="font-size:small">Metadata</th> + <th colspan="1" style="font-size:small"></th> + <th colspan="1" style="font-size:small"></th> + </tr> + <tr style="background-color:#EEEEEE"> + <td class="rowLine"> + <a href="site.xml" style="font-size:x-small">site.xml</a> + :: + <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> + :: + <a href="content.jar" style="font-size:x-small">content.jar</a> + </td> + <td class="rowLine"> + </td> + <td class="rowLine"> + </td> + </tr> + </table> <br /> </xsl:template> </xsl:stylesheet>

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r34885 - branches/jbosstools-3.2.x/build/parent.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-09-20 13:21:43 -0400 (Tue, 20 Sep 2011) New Revision: 34885 Modified: branches/jbosstools-3.2.x/build/parent/pom.xml Log: add variables for JBT_VERSION and JBDS_VERSION to allow dynamic naming of update site index.html pages Modified: branches/jbosstools-3.2.x/build/parent/pom.xml =================================================================== --- branches/jbosstools-3.2.x/build/parent/pom.xml 2011-09-20 17:20:38 UTC (rev 34884) +++ branches/jbosstools-3.2.x/build/parent/pom.xml 2011-09-20 17:21:43 UTC (rev 34885) @@ -15,6 +15,8 @@  <tychoVersion>0.10.0</tychoVersion> <scmBranch>branches/jbosstools-3.2.x</scmBranch> + <JBT_VERSION>3.2.2</JBT_VERSION> + <JBDS_VERSION>4.1.1</JBDS_VERSION> <BUILD_ALIAS>CR1</BUILD_ALIAS> <memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1> <memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r34884 - trunk/build/parent.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-09-20 13:20:38 -0400 (Tue, 20 Sep 2011) New Revision: 34884 Modified: trunk/build/parent/pom.xml Log: add variables for JBT_VERSION and JBDS_VERSION to allow dynamic naming of update site index.html pages Modified: trunk/build/parent/pom.xml =================================================================== --- trunk/build/parent/pom.xml 2011-09-20 17:17:27 UTC (rev 34883) +++ trunk/build/parent/pom.xml 2011-09-20 17:20:38 UTC (rev 34884) @@ -17,6 +17,8 @@ --> <tychoVersion>0.12.0</tychoVersion> <scmBranch>trunk</scmBranch> + <JBT_VERSION>3.3.0</JBT_VERSION> + <JBDS_VERSION>5.0.0</JBDS_VERSION> <BUILD_ALIAS>M4</BUILD_ALIAS> <memoryOptions1>-Xms512m -Xmx1024m -XX:PermSize=256m</memoryOptions1> <memoryOptions2>-XX:MaxPermSize=256m</memoryOptions2>

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r34883 - in trunk/build/aggregate: webtools-site and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-09-20 13:17:27 -0400 (Tue, 20 Sep 2011) New Revision: 34883 Modified: trunk/build/aggregate/bottests-site/site/build.xml trunk/build/aggregate/bottests-site/site/index.html trunk/build/aggregate/bottests-site/site/pom.xml trunk/build/aggregate/webtools-site/build.xml trunk/build/aggregate/webtools-site/index.html trunk/build/aggregate/webtools-site/pom.xml Log: remove unnecessary cruft https://issues.jboss.org/browse/JBIDE-9721, https://issues.jboss.org/browse/JBIDE-9743 Modified: trunk/build/aggregate/bottests-site/site/build.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/build.xml 2011-09-20 16:55:15 UTC (rev 34882) +++ trunk/build/aggregate/bottests-site/site/build.xml 2011-09-20 17:17:27 UTC (rev 34883) @@ -45,7 +45,8 @@ <antcall target="get.saxon" /> </target> - <target name="custom.build" description="aggregate update site extras" depends="init,check.target,add.associate.sites,add.web.content,pack.zip,collect.zips,collect.metadata,create.summary.file" /> +  + <target name="custom.build" description="aggregate update site extras" depends="init,check.target,add.associate.sites,add.web.content,pack.zip" /> <target name="get.saxon" unless="saxon.jar.exists">  @@ -438,6 +439,11 @@ from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER} default update.site.description=Nightly Build default update.site.version=(null) + + To test output, run in parent folder (bottests-site/): + $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.bottests.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 + or + $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.bottests.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" --> <property name="update.site.description" value="Nightly Build" /> <if> @@ -450,7 +456,18 @@ <isset property="BUILD_NUMBER" /> </and> <then> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + <if> + <and> + <isset property="JBT_VERSION" /> + <isset property="BUILD_ALIAS" /> + </and> + <then> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_ALIAS}\3.${BUILD_ID}-H${BUILD_NUMBER}" /> + </then> + <else> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + </else> + </if> </then> <else> <property name="update.site.version" value="" /> @@ -485,7 +502,7 @@ <delete file="${update.site.source.dir}/site.html" quiet="true" /> </target> -  <target name="collect.zips" description="collect zips from the sites we aggregated"> <property name="aggregate.zips.dir" value="${output.dir}/zips" /> Modified: trunk/build/aggregate/bottests-site/site/index.html =================================================================== --- trunk/build/aggregate/bottests-site/site/index.html 2011-09-20 16:55:15 UTC (rev 34882) +++ trunk/build/aggregate/bottests-site/site/index.html 2011-09-20 17:17:27 UTC (rev 34883) @@ -1,6 +1,6 @@ <html> <head> -<title>JBoss Tools - Bot Tests - Nightly Build Update Site</title> +<title>JBoss Tools - Bot Tests - Nightly Build Update Site: 3.3_trunk.bottests.2011-12-12_19-10-45-H6970</title> <style> @import url("http://download.jboss.org/jbosstools/updates/web/site.css"); </style> @@ -24,7 +24,7 @@ <h2 class="title">JBoss Tools - Bot Tests - Nightly Build Update Site</h2> <table width="100%"> <tr class="header"> - <td class="sub-header" width="100%"><span>Latest Build</span></td> + <td class="sub-header" width="100%"><span>Latest Build: 3.3_trunk.bottests.2011-12-12_19-10-45-H6970</span></td> </tr> <tr class="light-row" style="height: 30px"> @@ -79,15 +79,15 @@ </th> </tr> <tr style="background-color:
							#EEEEEE
						"> - <td class="rowLine"><a href="features/org.jboss.tools.bot.test.feature_3.1.0.v20110831-0309-M3.jar" style="font-size:x-small">org.jboss.tools.bot.test.feature</a></td> - <td><span style="font-size:x-small">3.1.0.v20110831-0309-M3</span></td> + <td class="rowLine"><a href="features/org.jboss.tools.bot.test.feature_3.1.0.v20110920-1309-H6970-M4.jar" style="font-size:x-small">org.jboss.tools.bot.test.feature</a></td> + <td><span style="font-size:x-small">3.1.0.v20110920-1309-H6970-M4</span></td> <td><span style="font-size:x-small"> | JBoss Tools bot.tests Nightly Build Update Site</span></td> </tr> <tr style="background-color:
							#FFFFFF
						"> - <td class="rowLine"><a href="features/org.jboss.tools.test.feature_3.2.0.v20110831-0220-M3.jar" style="font-size:x-small">org.jboss.tools.test.feature</a></td> - <td><span style="font-size:x-small">3.2.0.v20110831-0220-M3</span></td> + <td class="rowLine"><a href="features/org.jboss.tools.test.feature_3.2.0.v20110916-0001-M4.jar" style="font-size:x-small">org.jboss.tools.test.feature</a></td> + <td><span style="font-size:x-small">3.2.0.v20110916-0001-M4</span></td> <td><span style="font-size:x-small"> | JBoss Tools bot.tests Nightly Build Update Site</span></td> Modified: trunk/build/aggregate/bottests-site/site/pom.xml =================================================================== --- trunk/build/aggregate/bottests-site/site/pom.xml 2011-09-20 16:55:15 UTC (rev 34882) +++ trunk/build/aggregate/bottests-site/site/pom.xml 2011-09-20 17:17:27 UTC (rev 34883) @@ -1,5 +1,5 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss.tools</groupId> @@ -8,7 +8,7 @@ </parent> <groupId>org.jboss.tools.bot.tests</groupId> <artifactId>org.jboss.tools.bot.tests.site</artifactId> - <name>JBoss Tools - Bot Tests - Aggregate Site</name> + <name>JBoss Tools - Bot Tests Site</name> <version>0.0.1-SNAPSHOT</version> <packaging>eclipse-update-site</packaging> @@ -17,14 +17,6 @@ to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use: mvn clean install -Pjbosstools-nightly-staging-composite --> - <properties> -  -  - <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</inputRepo1> - <inputRepos>1</inputRepos> - </properties> - <build> <plugins> <plugin> @@ -38,9 +30,6 @@ <configuration> <quiet>true</quiet> <tasks> - <property name="inputRepo1" value="${inputRepo1}"/> - <property name="inputRepos" value="${inputRepos}"/> -  <ant antfile="build.xml"/> </tasks> @@ -96,14 +85,6 @@  <repository> - <id>inputRepo1</id> - <url>${inputRepo1}</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> <id>jbosstools-requirements-composite-mirror</id> <url>http://download.jboss.org/jbosstools/updates/indigo/SR0/</url> <layout>p2</layout> Modified: trunk/build/aggregate/webtools-site/build.xml =================================================================== --- trunk/build/aggregate/webtools-site/build.xml 2011-09-20 16:55:15 UTC (rev 34882) +++ trunk/build/aggregate/webtools-site/build.xml 2011-09-20 17:17:27 UTC (rev 34883) @@ -45,7 +45,8 @@ <antcall target="get.saxon" /> </target> - <target name="custom.build" description="aggregate update site extras" depends="init,check.target,add.associate.sites,add.web.content,pack.zip,collect.zips,collect.metadata,create.summary.file" /> +  + <target name="custom.build" description="aggregate update site extras" depends="init,check.target,add.associate.sites,add.web.content,pack.zip" /> <target name="get.saxon" unless="saxon.jar.exists">  @@ -438,6 +439,11 @@ from ${BUILD_ID} and ${BUILD_NUMBER}, get .${BUILD_ID}-H${BUILD_NUMBER} default update.site.description=Nightly Build default update.site.version=(null) + + To test output, run in parent folder (bottests-site/): + $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.webtools.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 + or + $ mvn install -DJOB_NAME=jbosstools-3.3_trunk.webtools.aggregate -DBUILD_ID=2011-09-19_19-10-45 -DBUILD_NUMBER=6969 -DJBT_VERSION=3.3.99 -DBUILD_ALIAS=M7 -Dupdate.site.description="Stable Milestone" --> <property name="update.site.description" value="Nightly Build" /> <if> @@ -450,7 +456,18 @@ <isset property="BUILD_NUMBER" /> </and> <then> - <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + <if> + <and> + <isset property="JBT_VERSION" /> + <isset property="BUILD_ALIAS" /> + </and> + <then> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+)(_stable_branch|_trunk)(.*).aggregate" replace=": ${JBT_VERSION}.${BUILD_ALIAS}\3.${BUILD_ID}-H${BUILD_NUMBER}" /> + </then> + <else> + <propertyregex override="true" property="update.site.version" defaultvalue="${JOB_NAME}" input="${JOB_NAME}" regexp="jbosstools-([0-9.]+.*).aggregate" replace=": \1.${BUILD_ID}-H${BUILD_NUMBER}" /> + </else> + </if> </then> <else> <property name="update.site.version" value="" /> @@ -485,7 +502,7 @@ <delete file="${update.site.source.dir}/site.html" quiet="true" /> </target> -  <target name="collect.zips" description="collect zips from the sites we aggregated"> <property name="aggregate.zips.dir" value="${output.dir}/zips" /> Modified: trunk/build/aggregate/webtools-site/index.html =================================================================== --- trunk/build/aggregate/webtools-site/index.html 2011-09-20 16:55:15 UTC (rev 34882) +++ trunk/build/aggregate/webtools-site/index.html 2011-09-20 17:17:27 UTC (rev 34883) @@ -1,6 +1,6 @@ <html> <head> -<title>JBoss Tools - Web Tools - Nightly Build Update Site</title> +<title>JBoss Tools - Web Tools - Nightly Build Update Site: 3.3_trunk.webtools.2011-12-12_19-10-45-H6970</title> <style> @import url("http://download.jboss.org/jbosstools/updates/web/site.css"); </style> @@ -24,7 +24,7 @@ <h2 class="title">JBoss Tools - Web Tools - Nightly Build Update Site</h2> <table width="100%"> <tr class="header"> - <td class="sub-header" width="100%"><span>Latest Build</span></td> + <td class="sub-header" width="100%"><span>Latest Build: 3.3_trunk.webtools.2011-12-12_19-10-45-H6970</span></td> </tr> <tr class="light-row" style="height: 30px"> @@ -78,53 +78,53 @@ </th> </tr> <tr style="background-color:
							#EEEEEE
						"> - <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20110826-0931-H394-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td> - <td><span style="font-size:x-small">3.2.1.v20110826-0931-H394-M3</span></td> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20110916-0117-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td> + <td><span style="font-size:x-small">3.2.1.v20110916-0117-M4</span></td> <td><span style="font-size:x-small"> | - JBoss Tools - Web Tools Nightly Build Update Site</span></td> + org.eclipse.wst.server.core.serverAdapter</span></td> </tr> <tr style="background-color:
							#FFFFFF
						"> - <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.archives.integration_2.3.0.v20110827-1450-H672-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.archives.integration</a></td> - <td><span style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.archives.integration_2.3.0.v20110919-1521-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.archives.integration</a></td> + <td><span style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td> <td><span style="font-size:x-small"> | - JBoss Tools - Web Tools Nightly Build Update Site</span></td> + org.eclipse.wst.server.core.serverAdapter</span></td> </tr> <tr style="background-color:
							#EEEEEE
						"> - <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20110827-1450-H672-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td> - <td><span style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20110919-1521-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td> + <td><span style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td> <td><span style="font-size:x-small"> | - JBoss Tools - Web Tools Nightly Build Update Site</span></td> + org.eclipse.wst.server.core.serverAdapter</span></td> </tr> <tr style="background-color:
							#FFFFFF
						"> - <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.jmx.integration_2.3.0.v20110827-1450-H672-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.jmx.integration</a></td> - <td><span style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.jmx.integration_2.3.0.v20110919-1521-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.jmx.integration</a></td> + <td><span style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td> <td><span style="font-size:x-small"> | - JBoss Tools - Web Tools Nightly Build Update Site</span></td> + org.eclipse.wst.server.core.serverAdapter</span></td> </tr> <tr style="background-color:
							#EEEEEE
						"> - <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.server.rse.integration_2.3.0.v20110827-1450-H672-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.server.rse.integration</a></td> - <td><span style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.server.rse.integration_2.3.0.v20110919-1521-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.server.rse.integration</a></td> + <td><span style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td> <td><span style="font-size:x-small"> | - JBoss Tools - Web Tools Nightly Build Update Site</span></td> + org.eclipse.wst.server.core.serverAdapter</span></td> </tr> <tr style="background-color:
							#FFFFFF
						"> - <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.serverAdapter.wtp_2.3.0.v20110827-1450-H672-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.serverAdapter.wtp</a></td> - <td><span style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.serverAdapter.wtp_2.3.0.v20110919-1521-M4.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.serverAdapter.wtp</a></td> + <td><span style="font-size:x-small">2.3.0.v20110919-1521-M4</span></td> <td><span style="font-size:x-small"> | - JBoss Tools - Web Tools Nightly Build Update Site</span></td> + org.eclipse.wst.server.core.serverAdapter</span></td> </tr> <tr style="background-color:
							#EEEEEE
						"> - <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20110826-0930-H377-M3.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td> - <td><span style="font-size:x-small">1.2.0.v20110826-0930-H377-M3</span></td> + <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20110916-0116-M4.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td> + <td><span style="font-size:x-small">1.2.0.v20110916-0116-M4</span></td> <td><span style="font-size:x-small"> | - JBoss Tools - Web Tools Nightly Build Update Site</span></td> + org.eclipse.wst.server.core.serverAdapter</span></td> </tr> <tr style="background-color:#DDDDDD"> <th colspan="1" style="font-size:small">Metadata</th> Modified: trunk/build/aggregate/webtools-site/pom.xml =================================================================== --- trunk/build/aggregate/webtools-site/pom.xml 2011-09-20 16:55:15 UTC (rev 34882) +++ trunk/build/aggregate/webtools-site/pom.xml 2011-09-20 17:17:27 UTC (rev 34883) @@ -17,14 +17,6 @@ to build against http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/, use: mvn clean install -Pjbosstools-nightly-staging-composite --> - <properties> -  -  - <inputRepo1>http://download.jboss.org/jbosstools/builds/staging/_composite_/trunk/</inputRepo1> - <inputRepos>1</inputRepos> - </properties> - <build> <plugins> <plugin> @@ -38,9 +30,6 @@ <configuration> <quiet>true</quiet> <tasks> - <property name="inputRepo1" value="${inputRepo1}"/> - <property name="inputRepos" value="${inputRepos}"/> -  <ant antfile="build.xml"/> </tasks> @@ -96,14 +85,6 @@  <repository> - <id>inputRepo1</id> - <url>${inputRepo1}</url> - <layout>p2</layout> - <snapshots> - <enabled>true</enabled> - </snapshots> - </repository> - <repository> <id>jbosstools-requirements-composite-mirror</id> <url>http://download.jboss.org/jbosstools/updates/indigo/SR0/</url> <layout>p2</layout>

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r34882 - in trunk: tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dgolovin Date: 2011-09-20 12:55:15 -0400 (Tue, 20 Sep 2011) New Revision: 34882 Added: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorPreferencePageTest.java Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorAllTests.java trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java Log: ESB Validator Preferences test added Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorAllTests.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorAllTests.java 2011-09-20 16:06:39 UTC (rev 34881) +++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorAllTests.java 2011-09-20 16:55:15 UTC (rev 34882) @@ -27,6 +27,7 @@ TestSuite suite2 = new TestSuite("ESB Validator Tests"); suite2.addTestSuite(ValidationTest.class); suite.addTest(new ESBValidatorTestSetup(suite2)); + suite.addTestSuite(ESBValidatorPreferencePageTest.class); return new DisableJavaIndexingSetup(suite); } Added: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorPreferencePageTest.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorPreferencePageTest.java (rev 0) +++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorPreferencePageTest.java 2011-09-20 16:55:15 UTC (rev 34882) @@ -0,0 +1,15 @@ +package org.jboss.tools.esb.validator.test; + +import org.jboss.tools.esb.validator.ui.ESBValidatorPreferencePage; +import org.jboss.tools.test.util.PreferencePageAbstractTest; + +public class ESBValidatorPreferencePageTest extends PreferencePageAbstractTest { + + public void testFreemarkerPreferencePageShow() { + assertTrue(createPreferencePage(ESBValidatorPreferencePage.PREF_ID, ESBValidatorPreferencePage.class)); //$NON-NLS-1$ + } + + public void testFreemarkerPreferencePagePerformOk() { + pressOkOnPreferencePage(ESBValidatorPreferencePage.PREF_ID); + } +} Property changes on: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorPreferencePageTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java =================================================================== --- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java 2011-09-20 16:06:39 UTC (rev 34881) +++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/PreferencePageAbstractTest.java 2011-09-20 16:55:15 UTC (rev 34882) @@ -8,7 +8,7 @@ public class PreferencePageAbstractTest extends TestCase { - public boolean isPreferencePageIsCreated(String id, Class expectedInstance) { + public boolean createPreferencePage(String id, Class expectedInstance) { PreferenceDialog prefDialog = createPreferenceDialog(id); try { @@ -23,6 +23,20 @@ } + public void pressOkOnPreferencePage(String ID) { + PreferenceDialog prefDialog = WorkbenchUtils.createPreferenceDialog(ID); + + try { + prefDialog.setBlockOnOpen(false); + prefDialog.open(); + + PreferencePage selectedPage = (PreferencePage)prefDialog.getSelectedPage(); + selectedPage.performOk(); + } finally { + prefDialog.close(); + } + } + public static PreferenceDialog createPreferenceDialog(String pageId) { PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), pageId, new String[] {pageId}, null);

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r34881 - in trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf: ui/test and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2011-09-20 12:06:39 -0400 (Tue, 20 Sep 2011) New Revision: 34881 Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELInsideTagBodyInJspFileTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java Log: JBIDE-9270 JSP editor should allow using el in text nodes for JSP 2.0 JUnit test is added for the issue Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELInsideTagBodyInJspFileTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELInsideTagBodyInJspFileTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELInsideTagBodyInJspFileTest.java 2011-09-20 16:06:39 UTC (rev 34881) @@ -0,0 +1,102 @@ +/******************************************************************************* + * Copyright (c) 2011 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.jsp.ca.test; + +import java.util.List; + +import junit.framework.Test; +import junit.framework.TestSuite; + +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.jboss.tools.common.base.test.contentassist.CATestUtil; +import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; +import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase; +import org.jboss.tools.test.util.ProjectImportTestSetup; + +/** + * The JUnit test case for JBIDE-9270 issue + * + * @author Victor V. Rubezhny + * + */ +public class CAELInsideTagBodyInJspFileTest extends ContentAssistantTestCase { + private static final String PROJECT_NAME = "Jbide3845Test"; + private static final String PAGE_NAME = "WebContent/pages/jsp_page.jsp"; + + private static final String PREFIX = "<f:view>"; + private static final String INSERTION = "#{"; + + private static final String[] PROPOSAL_TO_COMPARE_BEFORE_INSERTION = {"#{}"}; + private static final String[] PROPOSAL_TO_COMPARE_AFTER_INSERTION = {"user", "Message"}; + + public void setUp() throws Exception { + project = ProjectImportTestSetup.loadProject(PROJECT_NAME); + project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); + } + + public static Test suite() { + return new TestSuite(CAELInsideTagBodyInJspFileTest.class); + } + + private void doCAELInsideTagBodyInJspFileTest(String pageName, String attrPrefix, String[] correctProposals) { + String documentContent = document.get(); + int start = (documentContent == null ? -1 : documentContent.indexOf(attrPrefix)); + assertFalse("Required prefix text '" + attrPrefix + "' not found in document", (start == -1)); + int offsetToTest = start + attrPrefix.length(); + + List<ICompletionProposal> res = CATestUtil.collectProposals(contentAssistant, viewer, offsetToTest); + + assertTrue("Content Assistant returned no proposals", (res != null && res.size() > 0)); + + for (String correct : correctProposals) { + assertTrue("Proposal '" + correct +"' not found, but it should be amoung the proposals!", proposalExists(correct, res)); + } + } + + private boolean proposalExists(String proposal, List<ICompletionProposal> proposals) { + for (ICompletionProposal p : proposals) { + if (!(p instanceof AutoContentAssistantProposal)) + continue; + AutoContentAssistantProposal existingProposal = (AutoContentAssistantProposal)p; + String proposalString = existingProposal.getReplacementString(); + + if (proposal.equals(proposalString)) { + return true; + } + } + return false; + } + + public void testCAELInsideTagBodyInJspFile() { + assertNotNull("Test project '" + PROJECT_NAME + "' is not prepared", project); + + openEditor(PAGE_NAME); + try { + // Test EL CA for non-openned EL in tag body + doCAELInsideTagBodyInJspFileTest(PAGE_NAME, PREFIX, PROPOSAL_TO_COMPARE_BEFORE_INSERTION); + + String documentContent = document.get(); + int start = (documentContent == null ? -1 : documentContent.indexOf(PREFIX)); + assertFalse("Required prefix text '" + PREFIX + "' not found in document", (start == -1)); + + String newDocumentContent = documentContent.substring(0, start + PREFIX.length()) + + INSERTION + documentContent.substring(start + PREFIX.length()); + document.set(newDocumentContent); + + // Test EL CA for openned EL in tag body + doCAELInsideTagBodyInJspFileTest(PAGE_NAME, PREFIX+INSERTION, PROPOSAL_TO_COMPARE_AFTER_INSERTION); + } finally { + closeEditor(); + } + } +} Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/CAELInsideTagBodyInJspFileTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-09-20 16:05:43 UTC (rev 34880) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2011-09-20 16:06:39 UTC (rev 34881) @@ -17,6 +17,7 @@ import org.eclipse.wst.validation.ValidationFramework; import org.jboss.tools.common.base.test.validation.ValidationProjectTestSetup; import org.jboss.tools.jsf.jsp.ca.test.CADefaultELStartingCharTest; +import org.jboss.tools.jsf.jsp.ca.test.CAELInsideTagBodyInJspFileTest; import org.jboss.tools.jsf.jsp.ca.test.CAForCompositeComponentTest; import org.jboss.tools.jsf.jsp.ca.test.CAForELinStyleTest; import org.jboss.tools.jsf.jsp.ca.test.CAForIDTest; @@ -132,6 +133,12 @@ new String[] { "projects/JSF2KickStartWithoutLibs", }, //$NON-NLS-1$ new String[] { "JSF2KickStartWithoutLibs" })); //$NON-NLS-1$ + suite.addTest(new ProjectImportTestSetup(new TestSuite( + CAELInsideTagBodyInJspFileTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$ + new String[] { "projects/Jbide3845Test", }, //$NON-NLS-1$ + new String[] { "Jbide3845Test" })); //$NON-NLS-1$ + + // return new TestWizardsProject(suite); return suite; }

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r34880 - in trunk/jst: tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vrubezhny Date: 2011-09-20 12:05:43 -0400 (Tue, 20 Sep 2011) New Revision: 34880 Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/cssMediaRuleTest.html trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/CSSMediaRuleTest.java Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/CSSClassProposalType.java trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java Log: JBIDE-9740 Class cast exception in CA on CSS style classes Issue is fixed. JUnit test is added Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/CSSClassProposalType.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/CSSClassProposalType.java 2011-09-20 15:44:41 UTC (rev 34879) +++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/proposal/CSSClassProposalType.java 2011-09-20 16:05:43 UTC (rev 34880) @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. + * Copyright (c) 2009-2011 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, @@ -17,15 +17,16 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; -import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule; import org.jboss.tools.common.text.TextProposal; import org.jboss.tools.jst.web.kb.ICSSContainerSupport; import org.jboss.tools.jst.web.kb.IPageContext; import org.jboss.tools.jst.web.kb.KbQuery; +import org.jboss.tools.jst.web.kb.PageContextFactory.CSSStyleSheetDescriptor; import org.jboss.tools.jst.web.kb.WebKbPlugin; -import org.jboss.tools.jst.web.kb.PageContextFactory.CSSStyleSheetDescriptor; +import org.w3c.dom.css.CSSMediaRule; import org.w3c.dom.css.CSSRule; import org.w3c.dom.css.CSSRuleList; +import org.w3c.dom.css.CSSStyleRule; /** * The CSS Class proposal type. Is used to collect and return the proposals on @@ -72,9 +73,21 @@ */ public static Set<String> getClassNamesFromCSSRule(CSSRule cssRule) { Set<String> styleNames = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER); + + if (cssRule instanceof CSSMediaRule) { + CSSMediaRule cssMediaRule = (CSSMediaRule)cssRule; + CSSRuleList rules = cssMediaRule.getCssRules(); + for (int i = 0; rules != null && i < rules.getLength(); i++) { + CSSRule rule = rules.item(i); + styleNames.addAll(getClassNamesFromCSSRule(rule)); + } + return styleNames; + } + if (!(cssRule instanceof CSSStyleRule)) + return styleNames; // get selector text - String selectorText = ((ICSSStyleRule) cssRule).getSelectorText(); + String selectorText = ((CSSStyleRule) cssRule).getSelectorText(); if (selectorText != null) { String styles[] = selectorText.trim().split(","); //$NON-NLS-1$ Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/cssMediaRuleTest.html =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/cssMediaRuleTest.html (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/cssMediaRuleTest.html 2011-09-20 16:05:43 UTC (rev 34880) @@ -0,0 +1,22 @@ +<html> +<head> +<style> +@media screen + { + p.test {font-family:verdana,sans-serif;font-size:14px;} + } +@media print + { + p.test {font-family:times,serif;font-size:10px;} + } +@media screen,print + { + p.test {font-weight:bold;} + } +</style> +</head> + +<body> +<p class="">p</p> +</body> +</html> \ No newline at end of file Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/cssMediaRuleTest.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/CSSMediaRuleTest.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/CSSMediaRuleTest.java (rev 0) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/CSSMediaRuleTest.java 2011-09-20 16:05:43 UTC (rev 34880) @@ -0,0 +1,64 @@ +/******************************************************************************* + * Copyright (c) 2009-2011 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.jst.web.kb.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.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.KbQuery.Type; +import org.jboss.tools.jst.web.kb.PageContextFactory; +import org.jboss.tools.jst.web.kb.PageProcessor; + +/** + * The JUnit test case for JBIDE-9740 issue + * + * @author Victor V. Rubezhny + * + */ +public class CSSMediaRuleTest extends TestCase { + + private IProject testProject; + + protected void setUp() throws Exception { + if(testProject==null) { + testProject = ResourcesPlugin.getWorkspace().getRoot().getProject("TestKbModel"); + } + } + + public void testCSSMediaRule() { + assertNotNull("Can't load TestKbModel", testProject); //$NON-NLS-1$ + + IFile file = testProject.getFile("WebContent/pages/cssMediaRuleTest.html"); + ELContext context = PageContextFactory.createPageContext(file); + KbQuery query = new KbQuery(); + query.setMask(true); + query.setOffset(266); + query.setType(Type.ATTRIBUTE_VALUE); + query.setValue(""); + query.setStringQuery("\""); + query.setParentTags(new String[] {"html", "body", "p"}); + query.setParent("class"); + + TextProposal[] proposals = PageProcessor.getInstance().getProposals(query, context, true); + boolean ok = false; + for (TextProposal proposal : proposals) { + if("test".equals(proposal.getReplacementString())) { + ok = true; + } + } + assertTrue("Can't find 'test' Media CSS Rule proposal.", ok); + } +} Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/CSSMediaRuleTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java =================================================================== --- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2011-09-20 15:44:41 UTC (rev 34879) +++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2011-09-20 16:05:43 UTC (rev 34880) @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2009 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2009-2011 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 + * Red Hat, Inc. - initial API and implementation ******************************************************************************/ package org.jboss.tools.jst.web.kb.test; @@ -41,6 +41,7 @@ suite.addTestSuite(WebKbTest.class); suite.addTestSuite(KbModelWithSeveralJarCopiesTest.class); suite.addTestSuite(XMLCatalogTest.class); + suite.addTestSuite(CSSMediaRuleTest.class); testSetup = new XProjectImportTestSetUp(suite, "org.jboss.tools.jst.web.kb.test", new String[]{"projects/TestKbModel", "projects/MyFaces", "projects/MyFaces2", "projects/TestKbModel3", "projects/TestKbModel4"},

14 years, 6 months

1
0
0 / 0

JBoss Tools SVN: r34879 - in trunk/build/aggregate: site and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: nickboldt Date: 2011-09-20 11:44:41 -0400 (Tue, 20 Sep 2011) New Revision: 34879 Modified: trunk/build/aggregate/bottests-site/site/index.html trunk/build/aggregate/bottests-site/site/site.xsl trunk/build/aggregate/site/index.html trunk/build/aggregate/site/site.xsl trunk/build/aggregate/soa-site/index.html trunk/build/aggregate/soa-site/site.xsl trunk/build/aggregate/webtools-site/index.html trunk/build/aggregate/webtools-site/site.xsl Log: regen index.html pages and only show sections (with jboss or w/o jboss) of features if there's something avail in that set Modified: trunk/build/aggregate/bottests-site/site/index.html =================================================================== --- trunk/build/aggregate/bottests-site/site/index.html 2011-09-20 11:31:16 UTC (rev 34878) +++ trunk/build/aggregate/bottests-site/site/index.html 2011-09-20 15:44:41 UTC (rev 34879) @@ -6,17 +6,20 @@ </style> </head> <body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<center> <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0"> + cellspacing="0" cellpadding="0" width="920" class="bodyText"> <tr> - <td colspan="2"><img + <td colspan="3"><img src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> </tr> <tr> - <td>  </td> + <td>      </td> + <td>      </td> + <td>      </td> </tr> <tr> - <td>  </td> + <td>      </td> <td> <h2 class="title">JBoss Tools - Bot Tests - Nightly Build Update Site</h2> <table width="100%"> @@ -28,7 +31,7 @@ <td class="bodyText"> <p class="bodyText">This is the <b>Nightly Build</b> Update Site for JBoss Tools - Bot Tests. See <a class="link" - href="http://www.jboss.org/tools/download/update">Installation + href="http://www.jboss.org/tools/download/installation/update_3_3">Installation Instructions</a>.</p> </td> </tr> @@ -53,29 +56,63 @@ <p class="bodyText">You can also download JBoss Tools as individual zips for offline installation. See <a class="link" href="http://www.jboss.org/tools/download">JBoss Tools - Downloads</a>.</p> - </td> - </tr> - - <tr class="dark-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">For more information, see <a + Downloads</a>.<br/> + If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a href="http://www.jboss.org/tools/download/installation">Installation methods</a>.</p> </td> </tr> - <tr> - <td class="spacer"><br /> - </td> - <td class="spacer"><br /> - </td> - </tr> </table> </td> + <td>      </td> </tr> <tr> <td></td> <td> + <br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br><table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0"> + <tr style="background-color:#DDDDDD"> + <th style="font-size:small">Feature</th> + <th style="font-size:small">Version</th> + <th style="font-size:small"> + Feature Categor(ies) + + </th> + </tr> + <tr style="background-color:
							#EEEEEE
						"> + <td class="rowLine"><a href="features/org.jboss.tools.bot.test.feature_3.1.0.v20110831-0309-M3.jar" style="font-size:x-small">org.jboss.tools.bot.test.feature</a></td> + <td><span style="font-size:x-small">3.1.0.v20110831-0309-M3</span></td> + <td><span style="font-size:x-small"> + | + JBoss Tools bot.tests Nightly Build Update Site</span></td> + </tr> + <tr style="background-color:
							#FFFFFF
						"> + <td class="rowLine"><a href="features/org.jboss.tools.test.feature_3.2.0.v20110831-0220-M3.jar" style="font-size:x-small">org.jboss.tools.test.feature</a></td> + <td><span style="font-size:x-small">3.2.0.v20110831-0220-M3</span></td> + <td><span style="font-size:x-small"> + | + JBoss Tools bot.tests Nightly Build Update Site</span></td> + </tr> + <tr style="background-color:#DDDDDD"> + <th colspan="1" style="font-size:small">Metadata</th> + <th colspan="1" style="font-size:small"></th> + <th colspan="1" style="font-size:small"></th> + </tr> + <tr style="background-color:#EEEEEE"> + <td class="rowLine"><a href="site.xml" style="font-size:x-small">site.xml</a> + :: + <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> + :: + <a href="content.jar" style="font-size:x-small">content.jar</a></td> + <td class="rowLine"></td> + <td class="rowLine"></td> + </tr> +</table><br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br> + </td> + <td></td> + </tr> + <tr> + <td></td> + <td> <table width="100%"> <tr class="header"> <td class="sub-header" width="100%"><span> Installation @@ -131,4 +168,5 @@ </td> </tr> </table> +</center> </html> Modified: trunk/build/aggregate/bottests-site/site/site.xsl =================================================================== --- trunk/build/aggregate/bottests-site/site/site.xsl 2011-09-20 11:31:16 UTC (rev 34878) +++ trunk/build/aggregate/bottests-site/site/site.xsl 2011-09-20 15:44:41 UTC (rev 34879) @@ -5,7 +5,8 @@ <xsl:output method="html" indent="yes" /> <xsl:template match="/site"> <br /> - <table cellspacing="2" cellpadding="0" border="0"> + <table cellspacing="2" cellpadding="0" border="0"> + <xsl:if test="count(feature[contains(@id,'jboss')])>0"> <tr style="background-color:#DDDDDD"> <th style="font-size:small">Feature</th> <th style="font-size:small">Version</th> @@ -50,6 +51,8 @@ </td> </tr> </xsl:for-each> + </xsl:if> + <xsl:if test="count(feature[not(contains(@id,'jboss'))])>0"> <tr style="background-color:#DDDDDD"> <th style="font-size:small">Feature</th> <th style="font-size:small">Version</th> @@ -94,25 +97,27 @@ </td> </tr> </xsl:for-each> - <tr style="background-color:#DDDDDD"> - <th colspan="1" style="font-size:small">Metadata</th> - <th colspan="1" style="font-size:small"></th> - <th colspan="1" style="font-size:small"></th> - </tr> - <tr style="background-color:#EEEEEE"> - <td class="rowLine"> - <a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a> - </td> - <td class="rowLine"> - </td> - <td class="rowLine"> - </td> - </tr> - </table> + </xsl:if> + + <tr style="background-color:#DDDDDD"> + <th colspan="1" style="font-size:small">Metadata</th> + <th colspan="1" style="font-size:small"></th> + <th colspan="1" style="font-size:small"></th> + </tr> + <tr style="background-color:#EEEEEE"> + <td class="rowLine"> + <a href="site.xml" style="font-size:x-small">site.xml</a> + :: + <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> + :: + <a href="content.jar" style="font-size:x-small">content.jar</a> + </td> + <td class="rowLine"> + </td> + <td class="rowLine"> + </td> + </tr> + </table> <br /> </xsl:template> </xsl:stylesheet> Modified: trunk/build/aggregate/site/index.html =================================================================== --- trunk/build/aggregate/site/index.html 2011-09-20 11:31:16 UTC (rev 34878) +++ trunk/build/aggregate/site/index.html 2011-09-20 15:44:41 UTC (rev 34879) @@ -8,7 +8,7 @@ <body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> <center> <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0" width="920"> + cellspacing="0" cellpadding="0" width="920" class="bodyText"> <tr> <td colspan="3"><img src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> @@ -439,10 +439,10 @@ </tr> <tr style="background-color:#EEEEEE"> <td class="rowLine"><a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a></td> + :: + <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> + :: + <a href="content.jar" style="font-size:x-small">content.jar</a></td> <td class="rowLine"></td> <td class="rowLine"></td> </tr> Modified: trunk/build/aggregate/site/site.xsl =================================================================== --- trunk/build/aggregate/site/site.xsl 2011-09-20 11:31:16 UTC (rev 34878) +++ trunk/build/aggregate/site/site.xsl 2011-09-20 15:44:41 UTC (rev 34879) @@ -5,7 +5,8 @@ <xsl:output method="html" indent="yes" /> <xsl:template match="/site"> <br /> - <table cellspacing="2" cellpadding="0" border="0"> + <table cellspacing="2" cellpadding="0" border="0"> + <xsl:if test="count(feature[contains(@id,'jboss')])>0"> <tr style="background-color:#DDDDDD"> <th style="font-size:small">Feature</th> <th style="font-size:small">Version</th> @@ -50,6 +51,8 @@ </td> </tr> </xsl:for-each> + </xsl:if> + <xsl:if test="count(feature[not(contains(@id,'jboss'))])>0"> <tr style="background-color:#DDDDDD"> <th style="font-size:small">Feature</th> <th style="font-size:small">Version</th> @@ -94,25 +97,27 @@ </td> </tr> </xsl:for-each> - <tr style="background-color:#DDDDDD"> - <th colspan="1" style="font-size:small">Metadata</th> - <th colspan="1" style="font-size:small"></th> - <th colspan="1" style="font-size:small"></th> - </tr> - <tr style="background-color:#EEEEEE"> - <td class="rowLine"> - <a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a> - </td> - <td class="rowLine"> - </td> - <td class="rowLine"> - </td> - </tr> - </table> + </xsl:if> + + <tr style="background-color:#DDDDDD"> + <th colspan="1" style="font-size:small">Metadata</th> + <th colspan="1" style="font-size:small"></th> + <th colspan="1" style="font-size:small"></th> + </tr> + <tr style="background-color:#EEEEEE"> + <td class="rowLine"> + <a href="site.xml" style="font-size:x-small">site.xml</a> + :: + <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> + :: + <a href="content.jar" style="font-size:x-small">content.jar</a> + </td> + <td class="rowLine"> + </td> + <td class="rowLine"> + </td> + </tr> + </table> <br /> </xsl:template> </xsl:stylesheet> Modified: trunk/build/aggregate/soa-site/index.html =================================================================== --- trunk/build/aggregate/soa-site/index.html 2011-09-20 11:31:16 UTC (rev 34878) +++ trunk/build/aggregate/soa-site/index.html 2011-09-20 15:44:41 UTC (rev 34879) @@ -8,7 +8,7 @@ <body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> <center> <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0" width="920"> + cellspacing="0" cellpadding="0" width="920" class="bodyText"> <tr> <td colspan="3"><img src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> @@ -237,10 +237,10 @@ </tr> <tr style="background-color:#EEEEEE"> <td class="rowLine"><a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a></td> + :: + <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> + :: + <a href="content.jar" style="font-size:x-small">content.jar</a></td> <td class="rowLine"></td> <td class="rowLine"></td> </tr> Modified: trunk/build/aggregate/soa-site/site.xsl =================================================================== --- trunk/build/aggregate/soa-site/site.xsl 2011-09-20 11:31:16 UTC (rev 34878) +++ trunk/build/aggregate/soa-site/site.xsl 2011-09-20 15:44:41 UTC (rev 34879) @@ -5,7 +5,8 @@ <xsl:output method="html" indent="yes" /> <xsl:template match="/site"> <br /> - <table cellspacing="2" cellpadding="0" border="0"> + <table cellspacing="2" cellpadding="0" border="0"> + <xsl:if test="count(feature[contains(@id,'jboss')])>0"> <tr style="background-color:#DDDDDD"> <th style="font-size:small">Feature</th> <th style="font-size:small">Version</th> @@ -50,6 +51,8 @@ </td> </tr> </xsl:for-each> + </xsl:if> + <xsl:if test="count(feature[not(contains(@id,'jboss'))])>0"> <tr style="background-color:#DDDDDD"> <th style="font-size:small">Feature</th> <th style="font-size:small">Version</th> @@ -94,25 +97,27 @@ </td> </tr> </xsl:for-each> - <tr style="background-color:#DDDDDD"> - <th colspan="1" style="font-size:small">Metadata</th> - <th colspan="1" style="font-size:small"></th> - <th colspan="1" style="font-size:small"></th> - </tr> - <tr style="background-color:#EEEEEE"> - <td class="rowLine"> - <a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a> - </td> - <td class="rowLine"> - </td> - <td class="rowLine"> - </td> - </tr> - </table> + </xsl:if> + + <tr style="background-color:#DDDDDD"> + <th colspan="1" style="font-size:small">Metadata</th> + <th colspan="1" style="font-size:small"></th> + <th colspan="1" style="font-size:small"></th> + </tr> + <tr style="background-color:#EEEEEE"> + <td class="rowLine"> + <a href="site.xml" style="font-size:x-small">site.xml</a> + :: + <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> + :: + <a href="content.jar" style="font-size:x-small">content.jar</a> + </td> + <td class="rowLine"> + </td> + <td class="rowLine"> + </td> + </tr> + </table> <br /> </xsl:template> </xsl:stylesheet> Modified: trunk/build/aggregate/webtools-site/index.html =================================================================== --- trunk/build/aggregate/webtools-site/index.html 2011-09-20 11:31:16 UTC (rev 34878) +++ trunk/build/aggregate/webtools-site/index.html 2011-09-20 15:44:41 UTC (rev 34879) @@ -6,17 +6,20 @@ </style> </head> <body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"> +<center> <table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0" - cellspacing="0" cellpadding="0"> + cellspacing="0" cellpadding="0" width="920" class="bodyText"> <tr> - <td colspan="2"><img + <td colspan="3"><img src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td> </tr> <tr> - <td>  </td> + <td>      </td> + <td>      </td> + <td>      </td> </tr> <tr> - <td>  </td> + <td>      </td> <td> <h2 class="title">JBoss Tools - Web Tools - Nightly Build Update Site</h2> <table width="100%"> @@ -28,7 +31,7 @@ <td class="bodyText"> <p class="bodyText">This is the <b>Nightly Build</b> Update Site for JBoss Tools - Web Tools. See <a class="link" - href="http://www.jboss.org/tools/download/update">Installation + href="http://www.jboss.org/tools/download/installation/update_3_3">Installation Instructions</a>.</p> </td> </tr> @@ -52,29 +55,98 @@ <p class="bodyText">You can also download JBoss Tools as individual zips for offline installation. See <a class="link" href="http://www.jboss.org/tools/download">JBoss Tools - Downloads</a>.</p> - </td> - </tr> - - <tr class="dark-row" style="height: 30px"> - <td class="bodyText"> - <p class="bodyText">For more information, see <a + Downloads</a>.<br/> + If you downloaded this site as a zip, see <a href="README.installation.txt">Installation README</a>. See also <a href="http://www.jboss.org/tools/download/installation">Installation methods</a>.</p> </td> </tr> - <tr> - <td class="spacer"><br /> - </td> - <td class="spacer"><br /> - </td> - </tr> </table> </td> + <td>      </td> </tr> <tr> <td></td> <td> + <br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br><table xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan" cellspacing="2" cellpadding="0" border="0"> + <tr style="background-color:#DDDDDD"> + <th style="font-size:small">Feature</th> + <th style="font-size:small">Version</th> + <th style="font-size:small"> + Feature Categor(ies) + + </th> + </tr> + <tr style="background-color:
							#EEEEEE
						"> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.archives.feature_3.2.1.v20110826-0931-H394-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.archives.feature</a></td> + <td><span style="font-size:x-small">3.2.1.v20110826-0931-H394-M3</span></td> + <td><span style="font-size:x-small"> + | + JBoss Tools - Web Tools Nightly Build Update Site</span></td> + </tr> + <tr style="background-color:
							#FFFFFF
						"> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.archives.integration_2.3.0.v20110827-1450-H672-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.archives.integration</a></td> + <td><span style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td> + <td><span style="font-size:x-small"> + | + JBoss Tools - Web Tools Nightly Build Update Site</span></td> + </tr> + <tr style="background-color:
							#EEEEEE
						"> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.feature_2.3.0.v20110827-1450-H672-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.feature</a></td> + <td><span style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td> + <td><span style="font-size:x-small"> + | + JBoss Tools - Web Tools Nightly Build Update Site</span></td> + </tr> + <tr style="background-color:
							#FFFFFF
						"> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.jmx.integration_2.3.0.v20110827-1450-H672-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.jmx.integration</a></td> + <td><span style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td> + <td><span style="font-size:x-small"> + | + JBoss Tools - Web Tools Nightly Build Update Site</span></td> + </tr> + <tr style="background-color:
							#EEEEEE
						"> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.server.rse.integration_2.3.0.v20110827-1450-H672-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.server.rse.integration</a></td> + <td><span style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td> + <td><span style="font-size:x-small"> + | + JBoss Tools - Web Tools Nightly Build Update Site</span></td> + </tr> + <tr style="background-color:
							#FFFFFF
						"> + <td class="rowLine"><a href="features/org.jboss.ide.eclipse.as.serverAdapter.wtp_2.3.0.v20110827-1450-H672-M3.jar" style="font-size:x-small">org.jboss.ide.eclipse.as.serverAdapter.wtp</a></td> + <td><span style="font-size:x-small">2.3.0.v20110827-1450-H672-M3</span></td> + <td><span style="font-size:x-small"> + | + JBoss Tools - Web Tools Nightly Build Update Site</span></td> + </tr> + <tr style="background-color:
							#EEEEEE
						"> + <td class="rowLine"><a href="features/org.jboss.tools.jmx.feature_1.2.0.v20110826-0930-H377-M3.jar" style="font-size:x-small">org.jboss.tools.jmx.feature</a></td> + <td><span style="font-size:x-small">1.2.0.v20110826-0930-H377-M3</span></td> + <td><span style="font-size:x-small"> + | + JBoss Tools - Web Tools Nightly Build Update Site</span></td> + </tr> + <tr style="background-color:#DDDDDD"> + <th colspan="1" style="font-size:small">Metadata</th> + <th colspan="1" style="font-size:small"></th> + <th colspan="1" style="font-size:small"></th> + </tr> + <tr style="background-color:#EEEEEE"> + <td class="rowLine"><a href="site.xml" style="font-size:x-small">site.xml</a> + :: + <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> + :: + <a href="content.jar" style="font-size:x-small">content.jar</a></td> + <td class="rowLine"></td> + <td class="rowLine"></td> + </tr> +</table><br xmlns="http://www.w3.org/1999/xhtml" xmlns:xalan="http://xml.apache.org/xalan"></br> + </td> + <td></td> + </tr> + <tr> + <td></td> + <td> <table width="100%"> <tr class="header"> <td class="sub-header" width="100%"><span> Installation @@ -130,4 +202,5 @@ </td> </tr> </table> +</center> </html> Modified: trunk/build/aggregate/webtools-site/site.xsl =================================================================== --- trunk/build/aggregate/webtools-site/site.xsl 2011-09-20 11:31:16 UTC (rev 34878) +++ trunk/build/aggregate/webtools-site/site.xsl 2011-09-20 15:44:41 UTC (rev 34879) @@ -5,7 +5,8 @@ <xsl:output method="html" indent="yes" /> <xsl:template match="/site"> <br /> - <table cellspacing="2" cellpadding="0" border="0"> + <table cellspacing="2" cellpadding="0" border="0"> + <xsl:if test="count(feature[contains(@id,'jboss')])>0"> <tr style="background-color:#DDDDDD"> <th style="font-size:small">Feature</th> <th style="font-size:small">Version</th> @@ -50,6 +51,8 @@ </td> </tr> </xsl:for-each> + </xsl:if> + <xsl:if test="count(feature[not(contains(@id,'jboss'))])>0"> <tr style="background-color:#DDDDDD"> <th style="font-size:small">Feature</th> <th style="font-size:small">Version</th> @@ -94,25 +97,27 @@ </td> </tr> </xsl:for-each> - <tr style="background-color:#DDDDDD"> - <th colspan="1" style="font-size:small">Metadata</th> - <th colspan="1" style="font-size:small"></th> - <th colspan="1" style="font-size:small"></th> - </tr> - <tr style="background-color:#EEEEEE"> - <td class="rowLine"> - <a href="site.xml" style="font-size:x-small">site.xml</a> - :: - <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> - :: - <a href="content.jar" style="font-size:x-small">content.jar</a> - </td> - <td class="rowLine"> - </td> - <td class="rowLine"> - </td> - </tr> - </table> + </xsl:if> + + <tr style="background-color:#DDDDDD"> + <th colspan="1" style="font-size:small">Metadata</th> + <th colspan="1" style="font-size:small"></th> + <th colspan="1" style="font-size:small"></th> + </tr> + <tr style="background-color:#EEEEEE"> + <td class="rowLine"> + <a href="site.xml" style="font-size:x-small">site.xml</a> + :: + <a href="artifacts.jar" style="font-size:x-small">artifacts.jar</a> + :: + <a href="content.jar" style="font-size:x-small">content.jar</a> + </td> + <td class="rowLine"> + </td> + <td class="rowLine"> + </td> + </tr> + </table> <br /> </xsl:template> </xsl:stylesheet>

14 years, 6 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits September 2011