JBoss Tools SVN: r40722 - branches/jbosstools-3.3.0.Beta3/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-05-02 15:31:48 -0400 (Wed, 02 May 2012)
New Revision: 40722
Modified:
branches/jbosstools-3.3.0.Beta3/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java
branches/jbosstools-3.3.0.Beta3/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java
Log:
JBIDE-11064 patch from rob about keeping connection around long enough for run to actually work plus made sure map with connectors does not grow indefinitly
Modified: branches/jbosstools-3.3.0.Beta3/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java
===================================================================
--- branches/jbosstools-3.3.0.Beta3/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java 2012-05-02 19:28:15 UTC (rev 40721)
+++ branches/jbosstools-3.3.0.Beta3/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBoss71ServerConnection.java 2012-05-02 19:31:48 UTC (rev 40722)
@@ -42,9 +42,11 @@
private String user;
private String pass;
+ private Map<MBeanServerConnection, JMXConnector> connectionToConnector;
protected void initializeEnvironment(IServer s, String user, String pass) throws CredentialException {
this.user = user;
this.pass = pass;
+ this.connectionToConnector = new HashMap<MBeanServerConnection, JMXConnector>();
}
protected MBeanServerConnection createConnection(IServer s) throws Exception {
@@ -64,6 +66,7 @@
try {
connector = JMXConnectorFactory.connect(new JMXServiceURL(url), environment);
MBeanServerConnection connection = connector.getMBeanServerConnection();
+ this.connectionToConnector.put(connection, connector);
return connection;
} catch(IOException ioe) {
return null;
@@ -71,12 +74,17 @@
IStatus stat = new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
"Runtime Exception contacting JBoss instance. Please ensure your server is up and exposes its management ports via the -Djboss.bind.address.management=yourwebsite.com system property", re);
throw new JMXException(stat);
- } finally {
- if( connector != null ) {
- try {
- connector.close();
- } catch(Exception e) { /* Ignore */ }
- }
}
}
+
+ protected void cleanupConnection(IServer server, MBeanServerConnection connection) {
+ super.cleanupConnection(server, connection);
+ if( connectionToConnector.get(connection) != null ) {
+ try {
+ connectionToConnector.remove(connection);
+ connectionToConnector.get(connection).close();
+ } catch(Exception e) { /* Ignore */ }
+ }
+ }
+
}
Modified: branches/jbosstools-3.3.0.Beta3/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java
===================================================================
--- branches/jbosstools-3.3.0.Beta3/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java 2012-05-02 19:28:15 UTC (rev 40721)
+++ branches/jbosstools-3.3.0.Beta3/as/plugins/org.jboss.ide.eclipse.as.jmx.integration/src/org/jboss/ide/eclipse/as/jmx/integration/JBossServerConnection.java 2012-05-02 19:31:48 UTC (rev 40722)
@@ -132,9 +132,10 @@
.getContextClassLoader();
ClassLoader newLoader = getProvider2().getClassloaderRepository().getClassLoader(s);
Thread.currentThread().setContextClassLoader(newLoader);
+ MBeanServerConnection connection = null;
try {
initializeEnvironment(s, user, pass);
- MBeanServerConnection connection = createConnection(s);
+ connection = createConnection(s);
if( connection != null ) {
r.run(connection);
}
@@ -146,6 +147,7 @@
throw new JMXException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
"Error connecting to remote JMX. Please ensure your server is properly configured for JMX access.", e));
} finally {
+ cleanupConnection(s, connection);
getProvider2().getClassloaderRepository().removeConcerned(s, r);
Thread.currentThread().setContextClassLoader(currentLoader);
}
@@ -162,6 +164,10 @@
return null;
}
+ protected void cleanupConnection(IServer server, MBeanServerConnection connection) {
+ // Do nothing, provide subclasses ability
+ }
+
protected void initializeEnvironment(IServer s, String user, String pass) throws CredentialException {
JMXUtil.setCredentials(s,user,pass);
}
12 years
JBoss Tools SVN: r40721 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2012-05-02 15:28:15 -0400 (Wed, 02 May 2012)
New Revision: 40721
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
Log:
JBIDE-11724
https://issues.jboss.org/browse/JBIDE-11724
File can be null, e.g. when hover requests element info for a document open from jar.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2012-05-02 19:12:19 UTC (rev 40720)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageContextFactory.java 2012-05-02 19:28:15 UTC (rev 40721)
@@ -350,7 +350,8 @@
// long ctm = 0;
/**
- * Creates a page context for the specified context type
+ * Creates a page context for the specified context type.
+ * Either file or document can be null. File is always null for documents from jar files.
*
* @param file
* @param contentType
@@ -371,7 +372,7 @@
context = createJavaContext(file);
} else if(JAVA_PROPERTIES_CONTENT_TYPE.equalsIgnoreCase(typeId)) {
context = createPropertiesContext(file);
- } else if(isXMLWithoutEL(file)) {
+ } else if(file != null && isXMLWithoutEL(file)) {
IProject project = file != null ? file.getProject() : getActiveProject();
context = new SimpleELContext();
context.setResource(file);
12 years
JBoss Tools SVN: r40719 - in trunk/download.jboss.org/jbosstools/updates: requirements/m2eclipse and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-05-02 15:03:02 -0400 (Wed, 02 May 2012)
New Revision: 40719
Added:
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom.xml
Modified:
trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts...
trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/.gitig...
trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
Log:
add new m2e-apt build to Indigo SR2 site - m2e-apt-1.0.0-2012-05-02_13-33-26-H9; add maven script for generating site (rather than Eclipse/Ant script)
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts... 2012-05-02 17:14:51 UTC (rev 40718)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeArtifacts... 2012-05-02 19:03:02 UTC (rev 40719)
@@ -3,7 +3,7 @@
<repository name='JBoss Tools Requirements - Composite Indigo SR2 Mirror' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1335822399000'/>
+<property name='p2.timestamp' value='1335982720000'/>
</properties>
<children size='15'>
<child location='../../requirements/indigo/201202240900-SR2/'/>
@@ -18,7 +18,7 @@
<!-- <child location='http://dl.google.com/eclipse/plugin/3.7/'/> -->
<child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
-<child location='../../requirements/m2eclipse/20120430-1530/'/>
+<child location='../../requirements/m2eclipse/20120502-1415/'/>
<child location='../../requirements/mylyn/3.6.5.v20120215-0100/'/>
<child location='../../requirements/orbit/R20120119162704/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml 2012-05-02 17:14:51 UTC (rev 40718)
+++ trunk/download.jboss.org/jbosstools/updates/indigo/SR2/compositeContent.xml 2012-05-02 19:03:02 UTC (rev 40719)
@@ -3,7 +3,7 @@
<repository name='JBoss Tools Requirements - Composite Indigo SR2 Mirror' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
<properties size='2'>
<property name='p2.compressed' value='true'/>
-<property name='p2.timestamp' value='1335822395000'/>
+<property name='p2.timestamp' value='1335982722000'/>
</properties>
<children size='15'>
<child location='../../requirements/indigo/201202240900-SR2/'/>
@@ -18,7 +18,7 @@
<!-- <child location='http://dl.google.com/eclipse/plugin/3.7/'/> -->
<child location='../../requirements/gwt/2.5.0.v201201120043-rel-r37/'/>
<!-- includes m2e, m2e-extras, m2e-wtp, m2e-jdt-compiler -->
-<child location='../../requirements/m2eclipse/20120430-1530/'/>
+<child location='../../requirements/m2eclipse/20120502-1415/'/>
<child location='../../requirements/mylyn/3.6.5.v20120215-0100/'/>
<child location='../../requirements/orbit/R20120119162704/'/>
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/.gitig...
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/.gitig... 2012-05-02 17:14:51 UTC (rev 40718)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/.gitig... 2012-05-02 19:03:02 UTC (rev 40719)
@@ -1,2 +1,3 @@
2.0.3
*~
+1.1.0.20120320-0058/
Modified: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2012-05-02 17:14:51 UTC (rev 40718)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/build.xml 2012-05-02 19:03:02 UTC (rev 40719)
@@ -22,13 +22,13 @@
<property name="URL2" value="https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.15..."/>
<property name="URL3" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl..."/>
<property name="URL4" value="http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/"/>
- <property name="URL5" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a..."/>
+ <property name="URL5" value="http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a..."/>
<property name="destination" value="/home/nboldt/tru/download.jboss.org/jbosstools/updates/requirements/m2eclipse/" />
<property name="compress" value="true" />
<p2.mirror>
- <repository location="file:${destination}/20120430-1530" name="m2e 1.1, m2e-extras 0.15.0.N, m2e-wtp 0.15.2, m2e-jdt-compiler 1.0 (for use with Juno; mirrored 20120430-1530)" />
+ <repository location="file:${destination}/20120502-1415" name="m2e 1.1, m2e-extras 0.15.0.N, m2e-wtp 0.15.2, m2e-jdt-compiler 1.0 (for use with Indigo + Juno; mirrored 20120502-1415)" />
<source>
<repository location="${URL1}" />
<repository location="${URL2}" />
@@ -40,7 +40,7 @@
<slicingOptions includeFeatures="true" followStrict="true" />
</p2.mirror>
- <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120430-1530/" artifactRepository="file:${destination}/20120430-1530/"
- publishartifacts="true" source="${destination}/20120430-1530/" compress="${compress}" />
+ <p2.publish.featuresAndBundles metadataRepository="file:${destination}/20120502-1415/" artifactRepository="file:${destination}/20120502-1415/"
+ publishartifacts="true" source="${destination}/20120502-1415/" compress="${compress}" />
</target>
</project>
Added: trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom.xml
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom.xml (rev 0)
+++ trunk/download.jboss.org/jbosstools/updates/requirements/m2eclipse/pom.xml 2012-05-02 19:03:02 UTC (rev 40719)
@@ -0,0 +1,112 @@
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools</groupId>
+ <artifactId>org.jboss.tools.requirements.m2e</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <properties>
+ <!-- TODO: when there's enough of these scripts, externalize these to a
+ parent pom in ../ -->
+ <tychoVersion>0.14.0</tychoVersion>
+ <maven.antrun.plugin.version>1.3</maven.antrun.plugin.version>
+
+ <!-- TODO: update this every time you use this script against a new target
+ version + resulting folder -->
+ <URL1>file:///home/hudson/RHDS/updates/requirements/m2eclipse/1.1.0.20120320-0058/</URL1>
+ <URL2>https://repository.sonatype.org/content/sites/forge-sites/m2e-extras/0.15...</URL2>
+ <URL3>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2ecl...</URL3>
+ <URL4>http://download.jboss.org/jbosstools/updates/m2e-jdt-compiler/</URL4>
+ <URL5>http://download.jboss.org/jbosstools/updates/requirements/m2eclipse/m2e-a...</URL5>
+ <siteVersion>20120502-1415</siteVersion>
+ <destination>${project.build.directory}/../${siteVersion}</destination>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <!-- see http://wiki.eclipse.org/Tycho/Additional_Tools -->
+ <groupId>org.eclipse.tycho.extras</groupId>
+ <artifactId>tycho-p2-extras-plugin</artifactId>
+ <version>${tychoVersion}</version>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>mirror</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <source>
+ <repository>
+ <url>${URL1}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>${URL2}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>${URL3}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>${URL4}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
+ <url>${URL5}</url>
+ <layout>p2</layout>
+ </repository>
+ </source>
+
+ <!-- List of IUs to mirror. If omitted, all IUs will be mirrored. -->
+ <!-- Omitted IU version element means latest version of the IU -->
+ <!-- <ius>
+ <iu>
+ <id>org.foo.feature.feature.group</id>
+ </iu>
+ </ius> -->
+ <!-- The destination directory to mirror to. -->
+ <destination>${destination}</destination>
+ <!-- Whether only strict dependencies should be followed. -->
+ <!-- "strict" means perfect version match -->
+ <followStrictOnly>true</followStrictOnly>
+ <!-- Whether or not to follow optional requirements. -->
+ <includeOptional>true</includeOptional>
+ <!-- Whether or not to follow non-greedy requirements. -->
+ <includeNonGreedy>true</includeNonGreedy>
+ <!-- filter properties. E.g. filter only one platform -->
+ <!-- <filter> <osgi.os>linux</osgi.os> <osgi.ws>gtk</osgi.ws> <osgi.arch>x86_64</osgi.arch>
+ </filter> -->
+ <latestVersionOnly>true</latestVersionOnly>
+ <mirrorMetadataOnly>false</mirrorMetadataOnly>
+ <compress>true</compress>
+ <append>false</append>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${maven.antrun.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>install</phase>
+ <configuration>
+ <quiet>true</quiet>
+ <tasks>
+ <!-- do stuff w/ ant here -->
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
12 years
JBoss Tools SVN: r40718 - trunk/seam/plugins/org.jboss.tools.seam.core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-05-02 13:14:51 -0400 (Wed, 02 May 2012)
New Revision: 40718
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
Log:
https://issues.jboss.org/browse/JBIDE-11490 updated versions of all the required facets for Seam 2.3
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2012-05-02 15:06:31 UTC (rev 40717)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/plugin.xml 2012-05-02 17:14:51 UTC (rev 40718)
@@ -172,16 +172,16 @@
<or>
<requires
facet="jst.ear"
- version="[5.0">
+ version="[6.0">
</requires>
<requires
facet="jst.ejb"
- version="[3.0">
+ version="[3.1">
</requires>
<and>
<requires
facet="jst.web"
- version="[2.5">
+ version="[3.0">
</requires>
<requires
facet="jst.jsf"
@@ -189,7 +189,7 @@
</requires>
<requires
facet="jst.java"
- version="[5.0">
+ version="[6.0">
</requires>
</and>
</or>
@@ -393,8 +393,8 @@
<static-preset
id="jst.seam23.preset">
<label>Dynamic Web Project with Seam 2.3 (Technical Preview)</label>
- <facet id="jst.java" version="5.0"/>
- <facet id="jst.web" version="2.5"/>
+ <facet id="jst.java" version="6.0"/>
+ <facet id="jst.web" version="3.0"/>
<facet id="jst.jsf" version="2.0"/>
<facet id="jst.seam" version="2.3"/>
<description>
12 years
JBoss Tools SVN: r40717 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-05-02 11:06:31 -0400 (Wed, 02 May 2012)
New Revision: 40717
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/TextSelectionUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-11334 : BrowserSim: provide a more appropriate stop button
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/TextSelectionUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/TextSelectionUtil.java 2012-05-02 15:04:42 UTC (rev 40716)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/TextSelectionUtil.java 2012-05-02 15:06:31 UTC (rev 40717)
@@ -55,7 +55,9 @@
display.asyncExec(new Runnable() {
@Override
public void run() {
- text.selectAll();
+ if (!text.isDisposed()) {
+ text.selectAll();
+ }
}
});
}
@@ -64,7 +66,9 @@
display.asyncExec(new Runnable() {
@Override
public void run() {
- text.clearSelection();
+ if (!text.isDisposed()) {
+ text.clearSelection();
+ }
}
});
}
12 years
JBoss Tools SVN: r40716 - trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2012-05-02 11:04:42 -0400 (Wed, 02 May 2012)
New Revision: 40716
Added:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/TextSelectionUtil.java
Removed:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/UIUtil.java
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/NativeSkin.java
trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ResizableSkin.java
Log:
https://issues.jboss.org/browse/JBIDE-11334 : BrowserSim: provide a more appropriate stop button
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/NativeSkin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/NativeSkin.java 2012-05-02 13:39:47 UTC (rev 40715)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/NativeSkin.java 2012-05-02 15:04:42 UTC (rev 40716)
@@ -171,7 +171,7 @@
}
});
- UIUtil.addSelectTextOnFocusListener(locationText);
+ TextSelectionUtil.addSelectTextOnFocusListener(locationText);
}
@Override
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ResizableSkin.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ResizableSkin.java 2012-05-02 13:39:47 UTC (rev 40715)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/ResizableSkin.java 2012-05-02 15:04:42 UTC (rev 40716)
@@ -62,7 +62,7 @@
controlHandler.goToAddress(((Text)e.widget).getText());
}
});
- UIUtil.addSelectTextOnFocusListener(deviceComposite.getUrlText());
+ TextSelectionUtil.addSelectTextOnFocusListener(deviceComposite.getUrlText());
Listener moveListener = new Listener() {
Point origin;
Copied: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/TextSelectionUtil.java (from rev 40638, trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/UIUtil.java)
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/TextSelectionUtil.java (rev 0)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/TextSelectionUtil.java 2012-05-02 15:04:42 UTC (rev 40716)
@@ -0,0 +1,93 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2012 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.vpe.browsersim.ui.skin;
+
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.vpe.browsersim.browser.PlatformUtil;
+
+/**
+ * @author Yahor Radtsevich (yradtsevich)
+ */
+public class TextSelectionUtil {
+ public static void addSelectTextOnFocusListener(final Text targetText) {
+ SelectTextListener selectTextListener;
+ if (PlatformUtil.OS_MACOSX.equals(PlatformUtil.getOs())) {
+ selectTextListener = new OsXSelectTextListenerImpl();
+ } else {
+ selectTextListener = new SelectTextListenerImpl();
+ }
+
+ targetText.addFocusListener(selectTextListener);
+ targetText.addMouseListener(selectTextListener);
+ }
+}
+
+interface SelectTextListener extends FocusListener, MouseListener {
+}
+
+class SelectTextListenerImpl extends MouseAdapter implements SelectTextListener {
+
+ @Override
+ public void focusGained(FocusEvent e) {
+ asyncSelectAllText((Text) e.widget, e.display);
+ }
+
+ @Override
+ public void focusLost(FocusEvent e) {
+ asyncClearSelectionText((Text) e.widget, e.display);
+ };
+
+ protected void asyncSelectAllText(final Text text, Display display) {
+ display.asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ text.selectAll();
+ }
+ });
+ }
+
+ protected void asyncClearSelectionText(final Text text, Display display) {
+ display.asyncExec(new Runnable() {
+ @Override
+ public void run() {
+ text.clearSelection();
+ }
+ });
+ }
+}
+
+class OsXSelectTextListenerImpl extends SelectTextListenerImpl {
+ private boolean focusJustGained = false;
+
+ @Override
+ public void mouseUp(MouseEvent e) {
+ if (focusJustGained) {
+ asyncSelectAllText((Text) e.widget, e.display);
+ focusJustGained = false;
+ }
+ }
+
+ @Override
+ public void focusGained(FocusEvent e) {
+ focusJustGained = true;
+ }
+
+ @Override
+ public void focusLost(FocusEvent e) {
+ focusJustGained = false;
+ }
+}
Deleted: trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/UIUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/UIUtil.java 2012-05-02 13:39:47 UTC (rev 40715)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/ui/skin/UIUtil.java 2012-05-02 15:04:42 UTC (rev 40716)
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007-2012 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributor:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.vpe.browsersim.ui.skin;
-
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @author Yahor Radtsevich (yradtsevich)
- */
-public class UIUtil {
- public static void addSelectTextOnFocusListener(final Text targetText) {
- targetText.addFocusListener(new FocusAdapter() {
- @Override
- public void focusGained(FocusEvent e) {
- e.display.asyncExec(new Runnable() {
- @Override
- public void run() {
- if (!targetText.isDisposed()) {
- targetText.selectAll();
- }
- }
- });
- }
- });
- }
-}
12 years
JBoss Tools SVN: r40715 - in trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test: src/org/jboss/tools/bpel/ui/bot/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: apodhrad
Date: 2012-05-02 09:39:47 -0400 (Wed, 02 May 2012)
New Revision: 40715
Modified:
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java
Log:
BPEL bot tests mavenization
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath 2012-05-02 12:50:16 UTC (rev 40714)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.classpath 2012-05-02 13:39:47 UTC (rev 40715)
@@ -3,6 +3,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="lib" path="/home/psrna/data/testing/bin/5.0.0.M2/studio/plugins/org.hamcrest.core_1.1.0.v20090501071000"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="lib" path="/home/apodhrad/Downloads/hamcrest-all-1.1.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project 2012-05-02 12:50:16 UTC (rev 40714)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/.project 2012-05-02 13:39:47 UTC (rev 40715)
@@ -25,8 +25,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2012-05-02 12:50:16 UTC (rev 40714)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/org.jboss.tools.bpel.ui.bot.test.properties 2012-05-02 13:39:47 UTC (rev 40715)
@@ -1,11 +1,11 @@
# SWTBotTest properties
# all properties are optional, all defined paths should exist
# <java version>,<jre/jdk home>
-JAVA=1.6,/usr/lib/jvm/java-6-sun/jre
+JAVA=1.6,/opt/java/jdk1.6.0_30
#EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>
# note : when server is type of SOA, version is version of SOA (not the bundled EAP)
#SERVER=JBOSS_AS,5.0,1.6,/home/psrna/data/jboss/jboss/jboss-as
-SERVER=SOA,5.2,1.6,/home/psrna/data/jboss/soa-5.2/jboss-as
+SERVER=SOA,5.2,1.6,/home/apodhrad/Software/jboss-soa-p-5.2.0/jboss-as
#<seam version>,<seam runtime home>
#SEAM=2.2,/home/psrna/data/jboss/soa-5.1.0.ER6-eds/seam
#<esb versoin>,<esb runtime home>
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2012-05-02 12:50:16 UTC (rev 40714)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/pom.xml 2012-05-02 13:39:47 UTC (rev 40715)
@@ -1,29 +1,41 @@
<?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>
+<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.bpel</groupId>
<artifactId>tests</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <version>0.0.1-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.bpel.tests</groupId>
- <artifactId>org.jboss.tools.bpel.ui.bot.test</artifactId>
+ <artifactId>org.jboss.tools.bpel.ui.bot.test</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
-
+
<properties>
<emma.filter>org.jboss.tools.bpel.runtimes*</emma.filter>
<emma.instrument.bundles>org.jboss.tools.bpel.runtimes</emma.instrument.bundles>
+ <systemProperties>-Dswtbot.test.properties.file=./org.jboss.tools.bpel.ui.bot.test.properties</systemProperties>
</properties>
-
+
<build>
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
+ <testSuite>org.jboss.tools.bpel.ui.bot.test</testSuite>
+ <testClass>org.jboss.tools.bpel.ui.bot.test.suite.BPELAllTest</testClass>
<useUIThread>false</useUIThread>
<skip>${swtbot.test.skip}</skip>
+ <forkedProcessTimeoutInSeconds>10800</forkedProcessTimeoutInSeconds>
+ <dependencies combine.children="append">
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.bpel.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
</configuration>
</plugin>
</plugins>
Modified: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java
===================================================================
--- trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java 2012-05-02 12:50:16 UTC (rev 40714)
+++ trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/src/org/jboss/tools/bpel/ui/bot/test/FaultModelingTest.java 2012-05-02 13:39:47 UTC (rev 40715)
@@ -25,7 +25,7 @@
*
* @author mbaluch
*/
-@Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Disabled))
+@Require(clearProjects = true, server = @Server(type = ServerType.SOA, state = ServerState.Disabled), perspective = "BPEL")
public class FaultModelingTest extends BPELTest {
static String BUNDLE = "org.jboss.tools.bpel.ui.bot.test";
12 years
JBoss Tools SVN: r40714 - trunk/cdi/tests/org.jboss.tools.cdi.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-05-02 08:50:16 -0400 (Wed, 02 May 2012)
New Revision: 40714
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.bot.test/build.properties
Log:
fix the format of build.properties
Modified: trunk/cdi/tests/org.jboss.tools.cdi.bot.test/build.properties
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.bot.test/build.properties 2012-05-02 12:19:15 UTC (rev 40713)
+++ trunk/cdi/tests/org.jboss.tools.cdi.bot.test/build.properties 2012-05-02 12:50:16 UTC (rev 40714)
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- resources/
+ resources/,\
+ .
12 years
JBoss Tools SVN: r40713 - in trunk/common/plugins: org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-05-02 08:19:15 -0400 (Wed, 02 May 2012)
New Revision: 40713
Modified:
trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java
trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/handlers/MaterializeLibraryHandler.java
trunk/common/plugins/org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath/MaterializeLibraryJob.java
Log:
JBIDE-11723 : fix library materialization to project root
Modified: trunk/common/plugins/org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath/MaterializeLibraryJob.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath/MaterializeLibraryJob.java 2012-05-02 11:24:30 UTC (rev 40712)
+++ trunk/common/plugins/org.jboss.tools.common.jdt/src/org/jboss/tools/common/jdt/core/buildpath/MaterializeLibraryJob.java 2012-05-02 12:19:15 UTC (rev 40713)
@@ -39,7 +39,7 @@
public class MaterializeLibraryJob extends WorkspaceJob {
- private final IFolder libFolder;
+ private final IContainer libFolder;
private final IJavaProject javaProject;
private final Map<IPath, String> jars;
private final IClasspathContainer containerToRemove;
@@ -48,7 +48,7 @@
public MaterializeLibraryJob(IJavaProject javaProject,
IClasspathContainer containerToMaterialize,
Map<IPath, String> jars,
- IFolder libFolder,
+ IContainer libFolder,
boolean keepSourceAttachments) {
super(Messages.Materialize_Library);
if (javaProject == null || javaProject.getProject() == null) {
@@ -114,7 +114,9 @@
monitor.beginTask(Messages.Materialize_Library, jarSize);
- mkdirs(libFolder, monitor);
+ if (libFolder instanceof IFolder) {
+ mkdirs((IFolder)libFolder, monitor);
+ }
IPath destination = libFolder.getLocation();
@@ -235,6 +237,5 @@
x = x.getParent();
}
}
-
}
}
\ No newline at end of file
Modified: trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java 2012-05-02 11:24:30 UTC (rev 40712)
+++ trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/dialog/MaterializeLibraryDialog.java 2012-05-02 12:19:15 UTC (rev 40713)
@@ -16,10 +16,11 @@
import java.util.Map;
import java.util.Set;
-import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
@@ -71,7 +72,7 @@
private static final String FILENAME_PROPERTY = "FILENAME_PROPERTY";
- private IFolder libFolder;
+ private IContainer libFolder;
private Map<IClasspathEntry, String> classpathEntryPaths;
private Map<IPath, String> selectedClasspathEntryPaths;
private IClasspathContainer containerToMaterialize;
@@ -298,7 +299,7 @@
return selectedClasspathEntryPaths;
}
- public IFolder getLibFolder() {
+ public IContainer getLibFolder() {
return libFolder;
}
@@ -306,10 +307,16 @@
return keepSources;
}
- private static IFolder getLibFolderFromText(String text) {
+ private static IContainer getLibFolderFromText(String text) {
String portablePath = text.replaceAll("\\\\", "/");
+ IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
IPath path = new Path(portablePath);
- return ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
+ if (path.segmentCount() == 1) {
+ return workspaceRoot.getProject(path.segment(0));
+ } if (path.segmentCount() > 1) {
+ return ResourcesPlugin.getWorkspace().getRoot().getFolder(path);
+ }
+ return null;
}
@Override
@@ -343,10 +350,15 @@
}
private boolean validateLibFolder() {
- IFolder folder = getLibFolderFromText(libfolderText.getText());
+ IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
+
+ IContainer folder = getLibFolderFromText(libfolderText.getText());
+ if (folder == null || workspaceRoot.equals(folder)) {
+ setErrorMessage("You must select a project destination to copy classpath entries");
+ return false;
+ }
String ancestorPath = folder.getFullPath().segment(0);
- IResource ancestor = ResourcesPlugin.getWorkspace().getRoot()
- .findMember(ancestorPath);
+ IResource ancestor = workspaceRoot.findMember(ancestorPath);
if (ancestor == null || !ancestor.exists()) {
setErrorMessage(ancestorPath + " does not exist ");
return false;
@@ -354,12 +366,12 @@
return true;
}
+ @SuppressWarnings("unchecked")
private boolean validateEntries() {
Object[] selection = classpathEntriesViewer.getCheckedElements();
selectedClasspathEntryPaths = new LinkedHashMap<IPath, String>(
selection.length);
for (Object o : selection) {
- @SuppressWarnings("unchecked")
Map.Entry<IClasspathEntry, String> entry = (Map.Entry<IClasspathEntry, String>) o;
if (entry.getKey().getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
String name = entry.getValue();
Modified: trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/handlers/MaterializeLibraryHandler.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/handlers/MaterializeLibraryHandler.java 2012-05-02 11:24:30 UTC (rev 40712)
+++ trunk/common/plugins/org.jboss.tools.common.jdt.ui/src/org/jboss/tools/common/jdt/ui/buildpath/handlers/MaterializeLibraryHandler.java 2012-05-02 12:19:15 UTC (rev 40713)
@@ -15,7 +15,7 @@
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResourceRuleFactory;
import org.eclipse.core.resources.ResourcesPlugin;
@@ -85,7 +85,7 @@
if(dialog.open() == Dialog.OK) {
Map<IPath, String> jarsToMaterialize = dialog.getSelectedClasspathEntryPaths();
- IFolder libFolder = dialog.getLibFolder();
+ IContainer libFolder = dialog.getLibFolder();
Job job = new MaterializeLibraryJob(javaProject,
containerToMaterialize,
12 years