JBoss Tools SVN: r34391 - trunk/build.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-30 13:12:24 -0400 (Tue, 30 Aug 2011)
New Revision: 34391
Modified:
trunk/build/publish.sh
trunk/build/publishComponentZipToStaging.sh
trunk/build/publishUpdateZipToStaging.sh
Log:
add --protocol=28 to fix rsync from old slaves
Modified: trunk/build/publish.sh
===================================================================
--- trunk/build/publish.sh 2011-08-30 16:24:22 UTC (rev 34390)
+++ trunk/build/publish.sh 2011-08-30 17:12:24 UTC (rev 34391)
@@ -266,17 +266,17 @@
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
echo "<meta http-equiv=\"refresh\" content=\"0;url=${BUILD_ID}-H${BUILD_NUMBER}/\">" > /tmp/latestBuild.html
if [[ ${PUBLISHPATHSUFFIX} ]]; then
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/${BUILD_ID}-H${BUILD_NUMBER}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${PUBLISHPATHSUFFIX}/
pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync -l latest ${DESTINATION}/builds/nightly/${PUBLISHPATHSUFFIX}/; rm -f latest; popd >/dev/null
- date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
+ date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}/
else
- date; rsync -arzq --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
+ date; rsync -arzq --protocol=28 --delete /tmp/latestBuild.html $DESTINATION/builds/nightly/${JOBNAMEREDUX}/
# sftp only works with user@server, not with local $DESTINATIONS, so use rsync to push symlink instead
# echo -e "rm latest\nln ${BUILD_ID}-H${BUILD_NUMBER} latest" | sftp ${DESTINATIONREDUX}/builds/nightly/${JOBNAMEREDUX}/
pushd /tmp >/dev/null; ln -s ${BUILD_ID}-H${BUILD_NUMBER} latest; rsync -l latest ${DESTINATION}/builds/nightly/${JOBNAMEREDUX}/; rm -f latest; popd >/dev/null
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/nightly/${JOBNAMEREDUX}/${BUILD_ID}-H${BUILD_NUMBER}/
fi
rm -f /tmp/latestBuild.html
#else
@@ -291,7 +291,7 @@
date; rsync -arzq --delete ${STAGINGDIR}/* $INTRNALDEST/builds/staging/${JOB_NAME}.next
# and create/replace a snapshot dir w/ static URL
- date; rsync -arzq --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}.next
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/* $DESTINATION/builds/staging/${JOB_NAME}.next
# 1. To recursively purge contents of .../staging.previous/foobar/ folder:
# mkdir -p /tmp/foobar;
@@ -315,7 +315,7 @@
# OR, purge contents of /builds/staging.previous/${JOB_NAME} and remove empty dir
mkdir -p /tmp/${JOB_NAME}
- rsync -arzq --delete /tmp/${JOB_NAME} $DESTINATION/builds/staging.previous/
+ rsync -arzq --protocol=28 --delete /tmp/${JOB_NAME} $DESTINATION/builds/staging.previous/
echo -e "rmdir ${JOB_NAME}" | sftp $DESTINATION/builds/staging.previous/
rmdir /tmp/${JOB_NAME}
@@ -370,15 +370,15 @@
"
echo $metadata >> ${STAGINGDIR}/all/compositeContent.xml
echo $metadata >> ${STAGINGDIR}/all/compositeArtifacts.xml
- date; rsync -arzq ${STAGINGDIR}/all/composite*.xml $DESTINATION/builds/staging/${JOB_NAME}/all/
+ date; rsync -arzq --protocol=28 ${STAGINGDIR}/all/composite*.xml $DESTINATION/builds/staging/${JOB_NAME}/all/
fi
# extra publish step for aggregate update sites ONLY
if [[ ${JOB_NAME/.aggregate} != ${JOB_NAME} ]]; then
if [[ ${PUBLISHPATHSUFFIX} ]]; then
- date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}/
else
- date; rsync -arzq --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/
+ date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/all/repo/* $DESTINATION/updates/nightly/${JOBNAMEREDUX}/
fi
fi
fi
@@ -392,6 +392,6 @@
# publish updated log
bl=${STAGINGDIR}/logs/BUILDLOG.txt
rm -f ${bl}; wget -q http://hudson.qa.jboss.com/hudson/job/${JOB_NAME}/${BUILD_NUMBER}/console... -O ${bl} --timeout=900 --wait=10 --random-wait --tries=10 --retry-connrefused --no-check-certificate
-date; rsync -arzq --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/
-date; rsync -arzq --delete ${STAGINGDIR}/logs $INTRNALDEST/builds/staging/${JOB_NAME}/
+date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/logs $DESTINATION/builds/staging/${JOB_NAME}/
+date; rsync -arzq --protocol=28 --delete ${STAGINGDIR}/logs $INTRNALDEST/builds/staging/${JOB_NAME}/
Modified: trunk/build/publishComponentZipToStaging.sh
===================================================================
--- trunk/build/publishComponentZipToStaging.sh 2011-08-30 16:24:22 UTC (rev 34390)
+++ trunk/build/publishComponentZipToStaging.sh 2011-08-30 17:12:24 UTC (rev 34391)
@@ -34,12 +34,12 @@
#echo "Fetch ${path} as ${targetZip}"
# to test locally, may need to use --protocol=29 and -P instead of -q
- date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip}
+ date; rsync -arzq --rsh=ssh --protocol=28 ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip}
# generate MD5 sums for each zip
for m in $(md5sum ${targetZip}); do if [[ $m != ${targetZip} ]]; then echo $m > ${targetZip}.MD5; fi; done
#echo "Publish ${path} as ${targetZip}"
# to test locally, may need to use --protocol=29 and -P instead of -q
- date; rsync -arzq --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/$BRANCH/
+ date; rsync -arzq --rsh=ssh --protocol=28 ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/$BRANCH/
done
Modified: trunk/build/publishUpdateZipToStaging.sh
===================================================================
--- trunk/build/publishUpdateZipToStaging.sh 2011-08-30 16:24:22 UTC (rev 34390)
+++ trunk/build/publishUpdateZipToStaging.sh 2011-08-30 17:12:24 UTC (rev 34391)
@@ -20,11 +20,11 @@
targetZip="${JOBNAMEREDUX}-Update.zip"
#echo "Fetch ${path} as ${targetZip}"
# to test locally, may need to use --protocol=29 and -P instead of -q
-date; rsync -arzq --rsh=ssh ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip}
+date; rsync -arzq --rsh=ssh --protocol=28 ${DESTINATION}/builds/staging/${JOBNAMEREDUX}/${path} ${targetZip}
# generate MD5 sum for each zip
for m in $(md5sum ${targetZip}); do if [[ $m != ${targetZip} ]]; then echo $m > ${targetZip}.MD5; fi; done
#echo "Publish ${path} as ${targetZip}"
# to test locally, may need to use --protocol=29 and -P instead of -q
-date; rsync -arzq --rsh=ssh ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/
+date; rsync -arzq --rsh=ssh --protocol=28 ${targetZip} ${targetZip}.MD5 ${DESTINATION}/updates/staging/
14 years, 3 months
JBoss Tools SVN: r34390 - branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-08-30 12:24:22 -0400 (Tue, 30 Aug 2011)
New Revision: 34390
Modified:
branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site/index-template.html
branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site/index.html
Log:
fix label on webtools site -- should not be 'soa tooling'
Modified: branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site/index-template.html
===================================================================
--- branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site/index-template.html 2011-08-30 14:49:41 UTC (rev 34389)
+++ branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site/index-template.html 2011-08-30 16:24:22 UTC (rev 34390)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - SOA Tooling - ${update.site.description} Update Site${update.site.version}</title>
+<title>JBoss Tools - Web Tools - ${update.site.description} Update Site${update.site.version}</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -18,7 +18,7 @@
<tr>
<td>  </td>
<td>
- <h2 class="title">JBoss Tools - SOA Tooling - ${update.site.description} Update Site</h2>
+ <h2 class="title">JBoss Tools - Web Tools - ${update.site.description} Update Site</h2>
<table width="100%">
<tr class="header">
<td class="sub-header" width="100%"><span>Latest Build${update.site.version}</span></td>
@@ -27,7 +27,7 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>${update.site.description}</b>
- Update Site for JBoss Tools - SOA Tooling. See <a class="link"
+ Update Site for JBoss Tools - Web Tools. See <a class="link"
href="http://www.jboss.org/tools/download/update">Installation
Instructions</a>.</p>
</td>
Modified: branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site/index.html
===================================================================
--- branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site/index.html 2011-08-30 14:49:41 UTC (rev 34389)
+++ branches/jbosstools-3.3.0.M3/build/aggregate/webtools-site/index.html 2011-08-30 16:24:22 UTC (rev 34390)
@@ -1,6 +1,6 @@
<html>
<head>
-<title>JBoss Tools - SOA Tooling - Nightly Build Update Site</title>
+<title>JBoss Tools - Web Tools - Nightly Build Update Site</title>
<style>
@import url("http://download.jboss.org/jbosstools/updates/web/site.css");
</style>
@@ -18,7 +18,7 @@
<tr>
<td>  </td>
<td>
- <h2 class="title">JBoss Tools - SOA Tooling - Nightly Build Update Site</h2>
+ <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>
@@ -27,7 +27,7 @@
<tr class="light-row" style="height: 30px">
<td class="bodyText">
<p class="bodyText">This is the <b>Nightly Build</b>
- Update Site for JBoss Tools - SOA Tooling. See <a class="link"
+ Update Site for JBoss Tools - Web Tools. See <a class="link"
href="http://www.jboss.org/tools/download/update">Installation
Instructions</a>.</p>
</td>
14 years, 3 months
JBoss Tools SVN: r34389 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2011-08-30 10:49:41 -0400 (Tue, 30 Aug 2011)
New Revision: 34389
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
Log:
Changes for MacOS
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2011-08-30 13:39:13 UTC (rev 34388)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/helper/ContextMenuHelper.java 2011-08-30 14:49:41 UTC (rev 34389)
@@ -15,6 +15,7 @@
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.instanceOf;
+import java.awt.event.KeyEvent;
import java.util.Arrays;
import java.util.List;
import java.util.Vector;
@@ -148,15 +149,18 @@
*/
private static void hide(final Menu menu , boolean hideRecursively) {
if (menu != null){
- menu.notifyListeners(SWT.Hide, new Event());
+ // Hide recursively
+ if (hideRecursively) {
+ KeyboardHelper.typeKeyCodeUsingAWT(KeyEvent.VK_ESCAPE);
+ }
+ else{
+ menu.notifyListeners(SWT.Hide, new Event());
+ }
try {
- Thread.sleep(50);
+ Thread.sleep(100);
} catch (InterruptedException e) {
e.printStackTrace();
- }
- if (menu.getParentMenu() != null && hideRecursively) {
- hide(menu.getParentMenu(),hideRecursively);
- }
+ }
}
}
/**
@@ -629,4 +633,4 @@
return result;
}
-}
+}
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2011-08-30 13:39:13 UTC (rev 34388)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/tools/SWTBotWebBrowser.java 2011-08-30 14:49:41 UTC (rev 34389)
@@ -45,6 +45,7 @@
import org.jboss.tools.jst.jsp.jspeditor.PalettePageImpl;
import org.jboss.tools.ui.bot.ext.SWTBotExt;
import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
+import org.jboss.tools.ui.bot.ext.SWTJBTExt;
import org.jboss.tools.ui.bot.ext.Timing;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.helper.ReflectionsHelper;
@@ -644,20 +645,28 @@
getMozillaEventAdapter().handleEvent(domEvent);
}
});
- bot.sleep(Timing.time2S());
+ bot.sleep(Timing.time2S());
// Get Top Menu
return UIThreadRunnable.syncExec(new WidgetResult<Menu>() {
- public Menu run() {
+ public Menu run() {
Menu result = null;
- Composite parent = mozillaEditor.getControl().getParent();
- while (!(parent instanceof Decorations)){
- parent = parent.getParent();
+ Object menusHolder = null;
+ if (SWTJBTExt.isRunningOnMacOs()){
+ menusHolder = mozillaEditor.getControl().getDisplay();
}
- try {
- Menu[] menus = ReflectionsHelper.getPrivateFieldValue(Decorations.class,
- "menus",
- parent,
- Menu[].class);
+ else{
+ Composite parent = (Composite)mozillaEditor.getControl().getParent();
+ while (!(parent instanceof Decorations)){
+ parent = parent.getParent();
+ }
+ menusHolder = parent;
+ }
+
+ try {
+ Menu[] menus = ReflectionsHelper.getPrivateFieldValue(menusHolder.getClass(),
+ "menus",
+ menusHolder,
+ Menu[].class);
if (menus != null){
MenuItem topMenuItem = null;
int index = menus.length - 1;
14 years, 3 months
JBoss Tools SVN: r34388 - trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-30 09:39:13 -0400 (Tue, 30 Aug 2011)
New Revision: 34388
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/plugin.xml
Log:
added "..." to the tooltip and menu entry (to show that it opens up a dialog)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/plugin.xml 2011-08-30 13:37:20 UTC (rev 34387)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.ui/plugin.xml 2011-08-30 13:39:13 UTC (rev 34388)
@@ -47,9 +47,9 @@
locationURI="popup:team.main?after=group1">
<command
commandId="org.jboss.ide.eclipse.as.egit.ui.commands.CommitAndPushCommand"
- label="Commit and Push"
+ label="Commit and Push..."
style="push"
- tooltip="Commit And Push">
+ tooltip="Commit And Push...">
<visibleWhen
checkEnabled="false">
<and>
14 years, 3 months
JBoss Tools SVN: r34387 - trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.feature.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-08-30 09:37:20 -0400 (Tue, 30 Aug 2011)
New Revision: 34387
Modified:
trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.feature/feature.properties
Log:
marked egit feature as "Experimental" by adding it to the feature label
Modified: trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.feature/feature.properties
===================================================================
--- trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.feature/feature.properties 2011-08-30 13:20:31 UTC (rev 34386)
+++ trunk/as/features/org.jboss.ide.eclipse.as.server.egit.integration.feature/feature.properties 2011-08-30 13:37:20 UTC (rev 34387)
@@ -15,7 +15,7 @@
# This file should be translated.
# "featureName" property - name of the feature
-featureName=JBossAS Tools Server / EGit Integration
+featureName=JBossAS Tools Server / EGit Integration (Experimental)
# "providerName" property - name of the company that provides the feature
providerName=JBoss by Red Hat
14 years, 3 months
JBoss Tools SVN: r34386 - trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-30 09:20:31 -0400 (Tue, 30 Aug 2011)
New Revision: 34386
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml
Log:
JBIDE-9510 - commenting out much of the behaviour much of this behaviour.
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml 2011-08-30 11:25:22 UTC (rev 34385)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.egit.core/plugin.xml 2011-08-30 13:20:31 UTC (rev 34386)
@@ -2,6 +2,14 @@
<?eclipse version="3.2"?>
<plugin>
<extension
+ point="org.eclipse.wst.server.core.moduleTypes">
+ <moduleType
+ id="jbt.egit"
+ name="Egit">
+ </moduleType>
+ </extension>
+ <!--
+ <extension
point="org.eclipse.wst.server.core.moduleFactories">
<moduleFactory
class="org.jboss.ide.eclipse.as.egit.core.module.GitProjectModuleFactoryDelegate"
@@ -14,13 +22,6 @@
</moduleFactory>
</extension>
<extension
- point="org.eclipse.wst.server.core.moduleTypes">
- <moduleType
- id="jbt.egit"
- name="Egit">
- </moduleType>
- </extension>
- <extension
point="org.jboss.ide.eclipse.as.core.publishMethod">
<publishMethod
class="org.jboss.ide.eclipse.as.egit.core.EgitPublishMethod"
@@ -29,5 +30,5 @@
serverTypes="org.jboss.ide.eclipse.as.systemCopyServer">
</publishMethod>
</extension>
-
+ -->
</plugin>
14 years, 3 months
JBoss Tools SVN: r34385 - in trunk: cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2011-08-30 07:25:22 -0400 (Tue, 30 Aug 2011)
New Revision: 34385
Added:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/InterDecor.java.cdi
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java
Log:
CDI Quick Fix bot tests added
Added: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/InterDecor.java.cdi
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/InterDecor.java.cdi (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/resources/cdi/InterDecor.java.cdi 2011-08-30 11:25:22 UTC (rev 34385)
@@ -0,0 +1,10 @@
+package org.cdi.test;
+import javax.enterprise.inject.Disposes;
+
+public class InterDecor {
+
+ public void disposeMethod(@Disposes String aa) {
+
+ }
+
+}
\ No newline at end of file
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-30 11:13:00 UTC (rev 34384)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/CDIAllBotTests.java 2011-08-30 11:25:22 UTC (rev 34385)
@@ -34,7 +34,7 @@
* JAVA=1.6,/space/java/sdk/jdk1.6.0_22
*
*
- * Suite duration: aprox. 9min
+ * Suite duration: aprox. 11min
*
* @author Lukas Jungmann
* @author Jaroslav Jankovic
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java 2011-08-30 11:13:00 UTC (rev 34384)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/hyperlinks/CDIHyperlinksTest.java 2011-08-30 11:25:22 UTC (rev 34385)
@@ -50,7 +50,7 @@
public void testInjectHyperlink() {
CDIUtil.bean(PACKAGE_NAME, "Animal", true, false, false, false, null,
null, null, null).finish();
- bot.sleep(Timing.time3S());
+ bot.sleep(Timing.time1S());
util.waitForNonIgnoredJobs();
CDIUtil.bean(PACKAGE_NAME, "BrokenFarm", true, false, false, false, null,
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java 2011-08-30 11:13:00 UTC (rev 34384)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/src/org/jboss/tools/cdi/bot/test/quickfix/CDIQuickFixTest.java 2011-08-30 11:25:22 UTC (rev 34385)
@@ -222,11 +222,11 @@
checkProducerMethod(CDICOMPONENT.BEAN, ANNOTATIONS.INTERCEPTOR, ed, className);
// 3.QF - https://issues.jboss.org/browse/JBIDE-7684
+ checkDisposesAnnotation(CDICOMPONENT.BEAN, ed, className);
-
// 4.QF - https://issues.jboss.org/browse/JBIDE-7685
+ checkObserveAnnotation(CDICOMPONENT.BEAN, ed, className);
-
// 5.QF - https://issues.jboss.org/browse/JBIDE-7686
}
@@ -335,6 +335,11 @@
.getResourceAsStream("/resources/cdi/MyBean2.java.cdi"), false);
}
}
+
+ private void prepareDisposesAnnot(SWTBotEclipseEditor ed) {
+ CDIUtil.copyResourceToClass(ed, CDIQuickFixTest.class
+ .getResourceAsStream("/resources/cdi/InterDecor.java.cdi"), false);
+ }
private void checkTargetAnnotation(CDICOMPONENT comp, SWTBotEclipseEditor ed, String className) {
checkTargetAnnotWithReplac(comp, ed, className, "@Target({TYPE, FIELD})");
@@ -519,7 +524,42 @@
checkQuickFix(annonType, comp, className, replacement, ed);
}
+ private void checkDisposesAnnotation(CDICOMPONENT comp, SWTBotEclipseEditor ed, String className) {
+ checkDisposesAnnotWithReplac(comp, ed, className, "@Decorator");
+ checkDisposesAnnotWithReplac(comp, ed, className, "@Interceptor");
+ }
+ private void checkDisposesAnnotWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed,
+ String className, String replacement) {
+ prepareDisposesAnnot(ed);
+ String annot = replacement;
+ String importAnnot = "import javax." + replacement.substring(1).toLowerCase()
+ + "." + replacement.substring(1) + ";";
+ CDIUtil.insertInEditor(ed, bot, 2, 0, annot + LINE_SEPARATOR);
+ CDIUtil.insertInEditor(ed, bot, 1, 0, importAnnot + LINE_SEPARATOR);
+ checkQuickFix(ANNOTATIONS.DECORATOR, comp, className, replacement, ed);
+ }
+
+ private void checkObserveAnnotation(CDICOMPONENT comp, SWTBotEclipseEditor ed, String className) {
+ checkObserveAnnotWithReplac(comp, ed, className, "@Decorator");
+ checkObserveAnnotWithReplac(comp, ed, className, "@Interceptor");
+ }
+
+ private void checkObserveAnnotWithReplac(CDICOMPONENT comp, SWTBotEclipseEditor ed,
+ String className, String replacement) {
+ prepareDisposesAnnot(ed);
+ CDIUtil.replaceInEditor(ed, bot, "@Disposes", "@Observes");
+ CDIUtil.replaceInEditor(ed, bot, "import javax.enterprise.inject.Disposes;",
+ "import javax.enterprise.event.Observes;");
+ CDIUtil.replaceInEditor(ed, bot, "dispose", "observe");
+ String annot = replacement;
+ String importAnnot = "import javax." + replacement.substring(1).toLowerCase()
+ + "." + replacement.substring(1) + ";";
+ CDIUtil.insertInEditor(ed, bot, 2, 0, annot + LINE_SEPARATOR);
+ CDIUtil.insertInEditor(ed, bot, 1, 0, importAnnot + LINE_SEPARATOR);
+ checkQuickFix(ANNOTATIONS.DECORATOR, comp, className, replacement, ed);
+ }
+
private void checkQuickFix(ANNOTATIONS annonType, CDICOMPONENT comp, String className, String replacement,
SWTBotEclipseEditor ed) {
String componentClass = className + ".java";
@@ -551,7 +591,15 @@
+ PROJECT_NAME, className, "CDI Problem");
} else {
if (className.equals("InterDecor.java")) {
- problemsContains = "Producer cannot be declared in";
+ if (ed.toTextEditor().getText().contains("produceString")) {
+ problemsContains = "Producer cannot be declared in";
+ }
+ if (ed.toTextEditor().getText().contains("disposeMethod")) {
+ problemsContains = "has a method annotated @Disposes";
+ }
+ if (ed.toTextEditor().getText().contains("observeMethod")) {
+ problemsContains = "have a method with a parameter annotated @Observes";
+ }
}
problemsTree = ProblemsView.getFilteredErrorsTreeItems(bot, problemsContains, "/"
+ PROJECT_NAME, className, "CDI Problem");
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java 2011-08-30 11:13:00 UTC (rev 34384)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/wtp/BottomUpWSTest.java 2011-08-30 11:25:22 UTC (rev 34385)
@@ -19,7 +19,6 @@
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
-
@Require(server=@Server(),perspective="Java EE")
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ WSAllBotTests.class})
14 years, 3 months
JBoss Tools SVN: r34384 - trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-30 07:13:00 -0400 (Tue, 30 Aug 2011)
New Revision: 34384
Added:
trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.properties
trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/license.html
Removed:
trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/License.txt
Modified:
trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/build.properties
trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.xml
Log:
JBIDE-9594 - license stuff for archives test plugin
Deleted: trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/License.txt
===================================================================
--- trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/License.txt 2011-08-30 11:06:01 UTC (rev 34383)
+++ trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/License.txt 2011-08-30 11:13:00 UTC (rev 34384)
@@ -1,149 +0,0 @@
-GNU Lesser General Public License
-Version 2.1, February 1999
-
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
-as the successor of the GNU Library Public License, version 2, hence
-the version number 2.1.]
-
-Preamble
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.
-
-This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
-
-When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.
-
-To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.
-
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights.
-
-We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
-
-To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
-
-Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
-
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.
-
-When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.
-
-We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.
-
-For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
-
-In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
-
-Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
-
-The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
-
-A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
-
-The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
-
-"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.
-
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
-a) The modified work must itself be a software library.
-
-b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
-
-c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
-
-d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
-
-(For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.
-
-Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
-
-This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
-
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
-
-If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
-
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
-
-However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
-
-When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.
-
-If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)
-
-Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
-
-6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
-
-You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
-
-a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
-
-b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
-
-c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
-
-d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
-
-e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
-
-For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
-
-7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
-
-a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.
-
-b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
-
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
-
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
-
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
-
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/build.properties
===================================================================
--- trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/build.properties 2011-08-30 11:06:01 UTC (rev 34383)
+++ trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/build.properties 2011-08-30 11:13:00 UTC (rev 34384)
@@ -1 +1,3 @@
-bin.includes = feature.xml
+bin.includes = feature.xml,\
+ license.html,\
+ feature.properties
Added: trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.properties
===================================================================
--- trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.properties (rev 0)
+++ trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.properties 2011-08-30 11:13:00 UTC (rev 34384)
@@ -0,0 +1,31 @@
+###############################################################################
+# Copyright (c) 2010-2011 Red Hat, Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are 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:
+# JBoss by Red Hat - Initial implementation.
+##############################################################################
+# feature.properties
+# contains externalized strings for feature.xml
+# "%foo" in feature.xml corresponds to the key "foo" in this file
+# java.io.Properties file (ISO 8859-1 with "\" escapes)
+# This file should be translated.
+
+# "featureName" property - name of the feature
+featureName=JBoss Tools Project Archives Test Feature
+
+# "providerName" property - name of the company that provides the feature
+providerName=JBoss by Red Hat
+
+# "updateSiteName" property - label for the update site
+updateSiteName=JBossTools Update Site
+
+devUpdateSiteName=JBossTools Development Update Site
+
+# "description" property - description of the feature
+description=Provides testing against the Project Archives toolset.
+
+copyright=JBoss, Home of Professional Open Source\nCopyright JBoss by Red Hat, and individual contributors as indicated\nby the @authors tag, 2006-2010. See the copyright.txt in the distribution\nfor a full listing of individual contributors.
Modified: trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.xml
===================================================================
--- trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.xml 2011-08-30 11:06:01 UTC (rev 34383)
+++ trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/feature.xml 2011-08-30 11:13:00 UTC (rev 34384)
@@ -5,15 +5,15 @@
version="3.2.1.qualifier"
provider-name="JBoss by Red Hat">
- <description url="http://www.jboss.com/products/jbosside">
- Select 'More Info'
+ <description url="http://www.jboss.org/tools">
+ %description
</description>
- <copyright url="http://www.example.com/copyright">
- [Enter Copyright Description here.]
+ <copyright>
+ %copyright
</copyright>
- <license>
+ <license url="license.html">
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
Added: trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/license.html
===================================================================
--- trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/license.html (rev 0)
+++ trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/license.html 2011-08-30 11:13:00 UTC (rev 34384)
@@ -0,0 +1,14 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+
+<body>
+<p>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.
+</p>
+</body>
+</html>
\ No newline at end of file
Property changes on: trunk/archives/features/org.jboss.ide.eclipse.archives.test.feature/license.html
___________________________________________________________________
Added: svn:executable
+ *
14 years, 3 months
JBoss Tools SVN: r34383 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans: src/org/jboss/ide/eclipse/as/ui/mbeans/project and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-08-30 07:06:01 -0400 (Tue, 30 Aug 2011)
New Revision: 34383
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/SarArtifactAdapter.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/plugin.xml
Log:
/JBIDE-9497 - missing piece regarding the run-on-server (needed an artifact adapter)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/plugin.xml 2011-08-30 10:35:21 UTC (rev 34382)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/plugin.xml 2011-08-30 11:06:01 UTC (rev 34383)
@@ -231,5 +231,19 @@
id="org.jboss.ide.eclipse.as.ui.mbeans.sar.module"
typeIds="jst.jboss.sar"/>
</extension>
+ <extension
+ point="org.eclipse.wst.server.core.moduleArtifactAdapters">
+ <moduleArtifactAdapter
+ class="org.jboss.ide.eclipse.as.ui.mbeans.project.SarArtifactAdapter"
+ id="org.jboss.ide.eclipse.as.ui.mbeans.sarmoduleArtifactAdapter">
+ <enablement>
+ <or>
+ <instanceof value="org.eclipse.core.resources.IResource"/>
+ <instanceof value="org.eclipse.jdt.core.IJavaElement"/>
+ </or>
+ </enablement>
+
+ </moduleArtifactAdapter>
+ </extension>
</plugin>
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/SarArtifactAdapter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/SarArtifactAdapter.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/SarArtifactAdapter.java 2011-08-30 11:06:01 UTC (rev 34383)
@@ -0,0 +1,40 @@
+package org.jboss.ide.eclipse.as.ui.mbeans.project;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.jdt.core.IJavaElement;
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IModuleArtifact;
+import org.eclipse.wst.server.core.ServerUtil;
+import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
+
+public class SarArtifactAdapter extends ModuleArtifactAdapterDelegate {
+ public IModuleArtifact getModuleArtifact(Object obj) {
+ if( obj instanceof IJavaElement ) {
+ obj = ((IJavaElement)obj).getJavaProject().getProject();
+ }
+ if( obj instanceof IResource ) {
+ IProject p = ((IResource)obj).getProject();
+ if( p != null ) {
+ IModule[] mods = ServerUtil.getModules(p);
+ if( mods.length == 1 ) {
+ return new MBeanNullArtifact(mods[0]);
+ }
+ }
+ }
+ return null;
+ }
+
+ public static class MBeanNullArtifact implements IModuleArtifact {
+ private IModule module;
+ public MBeanNullArtifact(IModule mod) {
+ this.module = mod;
+ }
+
+ @Override
+ public IModule getModule() {
+ return module;
+ }
+ }
+
+}
14 years, 3 months
JBoss Tools SVN: r34382 - in trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext: gen and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-08-30 06:35:21 -0400 (Tue, 30 Aug 2011)
New Revision: 34382
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java
Log:
swtbotext: support adding AS 6.1 & 7.x server runtimes
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2011-08-30 08:21:49 UTC (rev 34381)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/AddServer.java 2011-08-30 10:35:21 UTC (rev 34382)
@@ -4,18 +4,20 @@
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.config.TestConfigurator;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS7x;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss7xRuntime;
import org.jboss.tools.ui.bot.ext.gen.IServer;
import org.jboss.tools.ui.bot.ext.gen.IServerRuntime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS42;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS50;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS51;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS60;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossCommunityJBossAS6x;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.Server.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss42Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss50Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss51Runtime;
-import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss60Runtime;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossCommunityJBoss6xRuntime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43Runtime;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.ServerRuntime.JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime;
/**
@@ -102,14 +104,11 @@
JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43.LABEL
);
}
- if ("5.0".equals(version) || "5.x".equals(version)) {
+
+ if (version!=null && version.startsWith("5")) {
return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL,
JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL);
}
- if ("5.1".equals(version)) {
- return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL,
- JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL);
- }
}
if (TestConfigurator.Values.SERVER_TYPE_EPP.equals(serverType)) {
@@ -118,7 +117,7 @@
JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43.LABEL
);
}
- if ("5.0".equals(version) || "5.x".equals(version)) {
+ if (version!=null && version.startsWith("5")) {
return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL,
JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL);
}
@@ -130,15 +129,10 @@
JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform43.LABEL
);
}
- if ("5.0".equals(version)) {
+ if (version!=null && version.startsWith("5")) {
return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL,
JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL);
- }
- if ("5.1".equals(version) || "5.x".equals(version)) {
- return new ServerInfo(JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5xRuntime.LABEL,
- JBossEnterpriseMiddlewareJBossEnterpriseApplicationPlatform5x.LABEL);
- }
-
+ }
}
else if (TestConfigurator.Values.SERVER_TYPE_AS.equals(serverType)) {
if ("4.2".equals(version)) {
@@ -150,9 +144,12 @@
if ("5.1".equals(version)) {
return new ServerInfo(JBossCommunityJBoss51Runtime.LABEL,JBossCommunityJBossAS51.LABEL);
}
- if ("6.0".equals(version)) {
- return new ServerInfo(JBossCommunityJBoss60Runtime.LABEL,JBossCommunityJBossAS60.LABEL);
+ if (version!=null && version.startsWith("6")) {
+ return new ServerInfo(JBossCommunityJBoss6xRuntime.LABEL,JBossCommunityJBossAS6x.LABEL);
}
+ if (version!=null && version.startsWith("7")) {
+ return new ServerInfo(JBossCommunityJBoss7xRuntime.LABEL,JBossCommunityJBossAS7x.LABEL);
+ }
}
failParsing();
return null;
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2011-08-30 08:21:49 UTC (rev 34381)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/gen/ActionItem.java 2011-08-30 10:35:21 UTC (rev 34382)
@@ -1564,9 +1564,9 @@
*/
public static final String TEXT_JRE = "JRE:";
}
- public static class JBossCommunityJBossAS60 {
+ public static class JBossCommunityJBossAS6x {
/**
- * represents item : JBoss Community->JBoss AS 6.0
+ * represents item : JBoss Community->JBoss AS 6.x
*/
public static final IServer LABEL = new IServer() {
public String getName() { return "JBoss AS 6.x";}
@@ -1581,6 +1581,23 @@
*/
public static final String TEXT_DIRECTORY = "Directory:";
}
+ public static class JBossCommunityJBossAS7x {
+ /**
+ * represents item : JBoss Community->JBoss AS 7.x
+ */
+ public static final IServer LABEL = new IServer() {
+ public String getName() { return "JBoss AS 7.x";}
+ public List<String> getGroupPath() {
+ List<String> l = new Vector<String>();
+ l.add("JBoss Community");
+ return l;
+ }
+ };
+ /**
+ * text field labeled 'Directory:'
+ */
+ public static final String TEXT_DIRECTORY = "Directory:";
+ }
public static class ApacheTomcatv32Server {
/**
* represents item : Apache->Tomcat v3.2 Server
@@ -10579,9 +10596,9 @@
*/
public static final String TEXT_LOCATION = "Location:";
}
- public static class JBossCommunityJBoss60Runtime {
+ public static class JBossCommunityJBoss6xRuntime {
/**
- * represents item : JBoss Community->JBoss 6.0 Runtime
+ * represents item : JBoss Community->JBoss 6.x Runtime
*/
public static final IServerRuntime LABEL = new IServerRuntime() {
public String getName() { return "JBoss 6.x Runtime";}
@@ -10596,6 +10613,23 @@
*/
public static final String TEXT_DIRECTORY = "Directory:";
}
+ public static class JBossCommunityJBoss7xRuntime {
+ /**
+ * represents item : JBoss Community->JBoss 7.x Runtime
+ */
+ public static final IServerRuntime LABEL = new IServerRuntime() {
+ public String getName() { return "JBoss 7.x Runtime";}
+ public List<String> getGroupPath() {
+ List<String> l = new Vector<String>();
+ l.add("JBoss Community");
+ return l;
+ }
+ };
+ /**
+ * text field labeled 'Directory:'
+ */
+ public static final String TEXT_DIRECTORY = "Directory:";
+ }
public static class ApacheApacheTomcatv32 {
/**
* represents item : Apache->Apache Tomcat v3.2
14 years, 3 months