JBoss Tools SVN: r31242 - trunk/documentation/whatsnew/usage.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-05-12 12:22:40 -0400 (Thu, 12 May 2011)
New Revision: 31242
Added:
trunk/documentation/whatsnew/usage/usage-news-3.2.1.M1.html
Log:
[JBIDE-8887] created N&N for 3.2.1 M1
Added: trunk/documentation/whatsnew/usage/usage-news-3.2.1.M1.html
===================================================================
--- trunk/documentation/whatsnew/usage/usage-news-3.2.1.M1.html (rev 0)
+++ trunk/documentation/whatsnew/usage/usage-news-3.2.1.M1.html 2011-05-12 16:22:40 UTC (rev 31242)
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Language" content="en-us" />
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<link rel="stylesheet" href="../whatsnew.css" />
+<title>What's New Usage Reporting 3.2.1.M1</title>
+<script type="text/javascript">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-17645367-5']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script></head>
+<body>
+<h1>What's New Usage Reporting 3.2.1.M1</h1>
+
+<p align="right">
+<a href="../index.html">< Main Index</a> <a
+href="../as/as-news-3.2.0.CR1.html">AS Tools</a></p>
+<table border="0" cellpadding="10" cellspacing="0" width="80%">
+ <tr>
+ <td colspan="2">
+ <hr />
+ <h3>General</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a><b>No changes</b></td>
+ <td valign="top">
+ The JBoss usage reporting was not enhanced nor bugfixed for 3.2.1 M1
+ </td>
+ </tr>
+
+ </tr>
+</table>
+</body>
+</html>
Property changes on: trunk/documentation/whatsnew/usage/usage-news-3.2.1.M1.html
___________________________________________________________________
Added: svn:mime-type
+ text/plain
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31241 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-12 10:41:42 -0400 (Thu, 12 May 2011)
New Revision: 31241
Modified:
trunk/build/target-platform/build.xml
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/publish.sh
trunk/build/target-platform/target2p2mirror.xml
Log:
add comments about keeping these files in synch when moving up versions (M6 -> M7): build.xml, *.target*, publish.sh, target2p2mirror.xml
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2011-05-12 14:41:25 UTC (rev 31240)
+++ trunk/build/target-platform/build.xml 2011-05-12 14:41:42 UTC (rev 31241)
@@ -139,6 +139,8 @@
<!-- should work on osx-cocoa32, win32, lin32, lin64 -->
<target name="get.eclipse">
<!-- NOTE: must use same platform (50M) or SDK (103M - 168M) version as feature version on target platform, or will get install/update conflicts -->
+ <!-- don't forget to increment these files when moving up a version:
+ build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<property name="eclipse.version" value="3.7M7" />
<property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..."/>
<!--
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-05-12 14:41:25 UTC (rev 31240)
+++ trunk/build/target-platform/jbds.target 2011-05-12 14:41:42 UTC (rev 31241)
@@ -9,6 +9,10 @@
:%s/.\+\/\(org.\+\)_\(\d\+.\+\)\.jar/\t\t\t<unit id="\1.feature.group" version="\2"\/>/g
-->
+ <!-- don't forget to increment these files when moving up a version:
+ build.xml, *.target*, publish.sh, target2p2mirror.xml -->
+ <repository location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/>
+
<!-- Orbit bundles -->
<unit id="javax.wsdl" version="1.6.2.v201012040545"/>
<unit id="org.apache.oro" version="2.0.8.v201005080400"/>
@@ -159,8 +163,6 @@
<unit id="org.eclipse.tm.terminal.view.feature.group" version="2.2.0.v201103142315-31-7w312214253426"/>
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201103142315-30-7w312213121A22"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>
-
- <repository location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/>
</location>
</locations>
</target>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-05-12 14:41:25 UTC (rev 31240)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-05-12 14:41:42 UTC (rev 31241)
@@ -28,6 +28,8 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
+<!-- don't forget to increment these files when moving up a version:
+ build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/>
</source>
<iu id="javax.wsdl" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-05-12 14:41:25 UTC (rev 31240)
+++ trunk/build/target-platform/multiple.target 2011-05-12 14:41:42 UTC (rev 31241)
@@ -12,6 +12,8 @@
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
+ <!-- don't forget to increment these files when moving up a version:
+ build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/>
<!-- m2e 0.13 + deps -->
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-05-12 14:41:25 UTC (rev 31240)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-05-12 14:41:42 UTC (rev 31241)
@@ -29,6 +29,8 @@
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
+<!-- don't forget to increment these files when moving up a version:
+ build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<repository location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/>
</source>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/publish.sh
===================================================================
--- trunk/build/target-platform/publish.sh 2011-05-12 14:41:25 UTC (rev 31240)
+++ trunk/build/target-platform/publish.sh 2011-05-12 14:41:42 UTC (rev 31241)
@@ -2,6 +2,8 @@
# Hudson creates a repo in ${repoDir}; copy it into other places for access by downstream jobs and users
# defaults for JBoss Tools
+# don't forget to increment these files when moving up a version:
+# build.xml, *.target*, publish.sh, target2p2mirror.xml
targetZipFile=e37M7-wtp33M7.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO
destinationPath=/home/hudson/static_build_env/jbds/target-platform
Modified: trunk/build/target-platform/target2p2mirror.xml
===================================================================
--- trunk/build/target-platform/target2p2mirror.xml 2011-05-12 14:41:25 UTC (rev 31240)
+++ trunk/build/target-platform/target2p2mirror.xml 2011-05-12 14:41:42 UTC (rev 31241)
@@ -1,4 +1,6 @@
<project default="custom.build" name="jbosstools target platform p2.mirror generator">
+ <!-- don't forget to increment these files when moving up a version:
+ build.xml, *.target*, publish.sh, target2p2mirror.xml -->
<property name="targetFile" value="e37M7-wtp33M7.target" />
<!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31240 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-12 10:41:25 -0400 (Thu, 12 May 2011)
New Revision: 31240
Modified:
trunk/build/target-platform/build.xml
trunk/build/target-platform/jbds.target
trunk/build/target-platform/jbds.target.p2mirror.xml
trunk/build/target-platform/multiple.target
trunk/build/target-platform/multiple.target.p2mirror.xml
trunk/build/target-platform/publish.sh
trunk/build/target-platform/target2p2mirror.xml
Log:
increment TP from M6 to M7
Modified: trunk/build/target-platform/build.xml
===================================================================
--- trunk/build/target-platform/build.xml 2011-05-12 14:24:04 UTC (rev 31239)
+++ trunk/build/target-platform/build.xml 2011-05-12 14:41:25 UTC (rev 31240)
@@ -139,8 +139,8 @@
<!-- should work on osx-cocoa32, win32, lin32, lin64 -->
<target name="get.eclipse">
<!-- NOTE: must use same platform (50M) or SDK (103M - 168M) version as feature version on target platform, or will get install/update conflicts -->
- <property name="eclipse.version" value="3.7M6" />
- <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..."/>
+ <property name="eclipse.version" value="3.7M7" />
+ <property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..."/>
<!--
<property name="eclipse.version" value="M20110105-0951" />
<property name="eclipse.URL" value="http://www.eclipse.org/downloads/download.php?r=1&file=/eclipse/downl..." />
Modified: trunk/build/target-platform/jbds.target
===================================================================
--- trunk/build/target-platform/jbds.target 2011-05-12 14:24:04 UTC (rev 31239)
+++ trunk/build/target-platform/jbds.target 2011-05-12 14:41:25 UTC (rev 31240)
@@ -160,7 +160,7 @@
<unit id="org.eclipse.tm.terminal.telnet.feature.group" version="2.1.0.v201103142315-30-7w312213121A22"/>
<unit id="org.eclipse.tm.terminal.ssh.feature.group" version="2.1.0.v201103142315-30-7w312212153266"/>
- <repository location="http://download.jboss.org/jbosstools/updates/indigo/M6/"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/>
</location>
</locations>
-</target>
\ No newline at end of file
+</target>
Modified: trunk/build/target-platform/jbds.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/jbds.target.p2mirror.xml 2011-05-12 14:24:04 UTC (rev 31239)
+++ trunk/build/target-platform/jbds.target.p2mirror.xml 2011-05-12 14:41:25 UTC (rev 31240)
@@ -28,7 +28,7 @@
<p2.mirror destination="file://${repoDir}" verbose="${verbose}">
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
-<repository location="http://download.jboss.org/jbosstools/updates/indigo/M6/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/>
</source>
<iu id="javax.wsdl" version=""/>
<iu id="org.apache.oro" version=""/>
Modified: trunk/build/target-platform/multiple.target
===================================================================
--- trunk/build/target-platform/multiple.target 2011-05-12 14:24:04 UTC (rev 31239)
+++ trunk/build/target-platform/multiple.target 2011-05-12 14:41:25 UTC (rev 31240)
@@ -12,7 +12,7 @@
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
- <repository location="http://download.jboss.org/jbosstools/updates/indigo/M6/"/>
+ <repository location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/>
<!-- m2e 0.13 + deps -->
<unit id="org.eclipse.m2e.feature.feature.group" version="0.13.0.201103291237"/>
Modified: trunk/build/target-platform/multiple.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/multiple.target.p2mirror.xml 2011-05-12 14:24:04 UTC (rev 31239)
+++ trunk/build/target-platform/multiple.target.p2mirror.xml 2011-05-12 14:41:25 UTC (rev 31240)
@@ -29,7 +29,7 @@
<slicingOptions includeFeatures="true" followStrict="${followStrict}"/>
<source>
<repository location="http://download.jboss.org/jbosstools/builds/staging/_composite_/3.3.indigo/"/>
-<repository location="http://download.jboss.org/jbosstools/updates/indigo/M6/"/>
+<repository location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/>
</source>
<iu id="org.eclipse.m2e.feature.feature.group" version=""/>
<iu id="org.maven.ide.eclipse.wtp.feature.feature.group" version=""/>
Modified: trunk/build/target-platform/publish.sh
===================================================================
--- trunk/build/target-platform/publish.sh 2011-05-12 14:24:04 UTC (rev 31239)
+++ trunk/build/target-platform/publish.sh 2011-05-12 14:41:25 UTC (rev 31240)
@@ -2,7 +2,7 @@
# Hudson creates a repo in ${repoDir}; copy it into other places for access by downstream jobs and users
# defaults for JBoss Tools
-targetZipFile=e37M6-wtp33M6.target
+targetZipFile=e37M7-wtp33M7.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO
destinationPath=/home/hudson/static_build_env/jbds/target-platform
DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform
@@ -21,7 +21,7 @@
'-exclude') exclude="$2"; shift 2;;
'-jbt_3.3.indigo')
# defaults for JBT (trunk)
- targetZipFile=e37M6-wtp33M6.target
+ targetZipFile=e37M7-wtp33M7.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO_3.3.indigo
destinationPath=/home/hudson/static_build_env/jbds/target-platform_3.3.indigo
DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform_3.3.indigo
@@ -30,7 +30,7 @@
shift 1;;
'-jbt')
# defaults for JBT (stable branch)
- targetZipFile=e37M6-wtp33M6.target
+ targetZipFile=e37M7-wtp33M7.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/REPO
destinationPath=/home/hudson/static_build_env/jbds/target-platform
DESTINATION=tools@filemgmt.jboss.org:/downloads_htdocs/tools/updates/target-platform
@@ -39,7 +39,7 @@
shift 1;;
'-jbds_3.3.indigo')
# defaults for JBDS (trunk)
- targetZipFile=jbds500-e37M6-wtp33M6.target
+ targetZipFile=jbds500-e37M7-wtp33M7.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO_3.3.indigo
destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform_3.3.indigo
DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform_3.3.indigo
@@ -48,7 +48,7 @@
shift 1;;
'-jbds')
# defaults for JBDS (stable branch)
- targetZipFile=jbds500-e37M6-wtp33M6.target
+ targetZipFile=jbds500-e37M7-wtp33M7.target
repoDir=/home/hudson/static_build_env/jbds/tools/sources/JBDS-REPO
destinationPath=/home/hudson/static_build_env/jbds/jbds-target-platform
DESTINATION=/qa/services/http/binaries/RHDS/updates/jbds-target-platform
Modified: trunk/build/target-platform/target2p2mirror.xml
===================================================================
--- trunk/build/target-platform/target2p2mirror.xml 2011-05-12 14:24:04 UTC (rev 31239)
+++ trunk/build/target-platform/target2p2mirror.xml 2011-05-12 14:41:25 UTC (rev 31240)
@@ -1,5 +1,5 @@
<project default="custom.build" name="jbosstools target platform p2.mirror generator">
- <property name="targetFile" value="e37M6-wtp33M6.target" />
+ <property name="targetFile" value="e37M7-wtp33M7.target" />
<!-- if useLatest = true, omit versions from p2.mirror script to fetch latest version available;
if useLatest = false, include versions and fetch specific versions requested. -->
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31239 - tags.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-05-12 10:24:04 -0400 (Thu, 12 May 2011)
New Revision: 31239
Added:
tags/jbosstools-3.3.0.M1/
Log:
tag for 3.3.0.M1
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31238 - in workspace/latestm2e/maven/plugins: org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-05-12 08:28:05 -0400 (Thu, 12 May 2011)
New Revision: 31238
Modified:
workspace/latestm2e/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
workspace/latestm2e/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java
workspace/latestm2e/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java
workspace/latestm2e/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
workspace/latestm2e/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
workspace/latestm2e/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java
Log:
Align code with latest m2e API changes
Modified: workspace/latestm2e/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java
===================================================================
--- workspace/latestm2e/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2011-05-12 10:58:35 UTC (rev 31237)
+++ workspace/latestm2e/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/MavenCoreActivator.java 2011-05-12 12:28:05 UTC (rev 31238)
@@ -55,11 +55,9 @@
import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig;
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.embedder.IMavenConfiguration;
import org.eclipse.m2e.core.embedder.MavenModelManager;
+import org.eclipse.m2e.core.internal.IMavenConstants;
import org.eclipse.m2e.core.project.IProjectConfigurationManager;
-import org.eclipse.m2e.core.project.ResolverConfiguration;
import org.eclipse.m2e.jdt.internal.BuildPathManager;
import org.eclipse.m2e.model.edit.pom.Dependency;
import org.eclipse.m2e.model.edit.pom.PomFactory;
Modified: workspace/latestm2e/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java
===================================================================
--- workspace/latestm2e/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java 2011-05-12 10:58:35 UTC (rev 31237)
+++ workspace/latestm2e/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/internal/project/facet/MavenFacetInstallDelegate.java 2011-05-12 12:28:05 UTC (rev 31238)
@@ -28,8 +28,8 @@
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.IMavenConstants;
import org.eclipse.m2e.core.embedder.MavenModelManager;
+import org.eclipse.m2e.core.internal.IMavenConstants;
import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
import org.eclipse.wst.common.project.facet.core.IDelegate;
Modified: workspace/latestm2e/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java
===================================================================
--- workspace/latestm2e/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java 2011-05-12 10:58:35 UTC (rev 31237)
+++ workspace/latestm2e/maven/plugins/org.jboss.tools.maven.core/src/org/jboss/tools/maven/core/libprov/MavenLibraryProviderInstallOperation.java 2011-05-12 12:28:05 UTC (rev 31238)
@@ -31,13 +31,10 @@
import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider;
import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperation;
import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig;
-import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.IMavenConstants;
-import org.eclipse.m2e.core.embedder.MavenModelManager;
+import org.eclipse.m2e.core.internal.IMavenConstants;
import org.eclipse.m2e.model.edit.pom.Model;
import org.eclipse.m2e.model.edit.pom.util.PomResourceFactoryImpl;
import org.eclipse.m2e.model.edit.pom.util.PomResourceImpl;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase;
import org.jboss.tools.maven.core.MavenCoreActivator;
Modified: workspace/latestm2e/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java
===================================================================
--- workspace/latestm2e/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2011-05-12 10:58:35 UTC (rev 31237)
+++ workspace/latestm2e/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/MavenSeamActivator.java 2011-05-12 12:28:05 UTC (rev 31238)
@@ -44,9 +44,9 @@
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.IMavenConstants;
import org.eclipse.m2e.core.embedder.MavenModelManager;
-import org.eclipse.m2e.core.project.MavenProjectManager;
+import org.eclipse.m2e.core.internal.IMavenConstants;
+import org.eclipse.m2e.core.project.IProjectConfigurationManager;
import org.eclipse.m2e.core.project.ResolverConfiguration;
import org.eclipse.m2e.model.edit.pom.Configuration;
import org.eclipse.m2e.model.edit.pom.Plugin;
@@ -961,11 +961,11 @@
location = location.append(parentProjectName);
MavenCoreActivator.createMavenProject(parentProjectName, null, model, false, location);
// disable workspace resolution
- MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager();
IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(parentProjectName);
- ResolverConfiguration configuration = projectManager.getResolverConfiguration(project);
+ IProjectConfigurationManager configurationManager = MavenPlugin.getProjectConfigurationManager();
+ ResolverConfiguration configuration = configurationManager.getResolverConfiguration(project);
configuration.setResolveWorkspaceProjects(false);
- projectManager.setResolverConfiguration(project, configuration);
+ configurationManager.setResolverConfiguration(project, configuration);
} catch (Exception e) {
log(e);
} finally {
Modified: workspace/latestm2e/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
===================================================================
--- workspace/latestm2e/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2011-05-12 10:58:35 UTC (rev 31237)
+++ workspace/latestm2e/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2011-05-12 12:28:05 UTC (rev 31238)
@@ -46,10 +46,10 @@
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.IMavenConstants;
+import org.eclipse.m2e.core.internal.IMavenConstants;
import org.eclipse.m2e.core.project.IMavenProjectFacade;
+import org.eclipse.m2e.core.project.IMavenProjectRegistry;
import org.eclipse.m2e.core.project.MavenProjectChangedEvent;
-import org.eclipse.m2e.core.project.MavenProjectManager;
import org.eclipse.m2e.core.project.configurator.AbstractProjectConfigurator;
import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest;
import org.eclipse.wst.common.componentcore.ComponentCore;
@@ -413,7 +413,7 @@
if (refProject.hasNature(IMavenConstants.NATURE_ID)) {
IFile pom = refProject.getFile(IMavenConstants.POM_FILE_NAME);
if (pom.exists()) {
- MavenProjectManager projectManager = MavenPlugin.getDefault().getMavenProjectManager();
+ IMavenProjectRegistry projectManager = MavenPlugin.getMavenProjectRegistry();
IMavenProjectFacade facade = projectManager.create(pom, true, null);
if(facade!=null) {
MavenProject mavenProject = facade.getMavenProject(null);
@@ -447,8 +447,7 @@
IFile pom = refProject
.getFile(IMavenConstants.POM_FILE_NAME);
if (pom.exists()) {
- MavenProjectManager projectManager = MavenPlugin
- .getDefault().getMavenProjectManager();
+ IMavenProjectRegistry projectManager = MavenPlugin.getMavenProjectRegistry();
IMavenProjectFacade facade = projectManager.create(
pom, true, null);
if (facade != null) {
Modified: workspace/latestm2e/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java
===================================================================
--- workspace/latestm2e/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2011-05-12 10:58:35 UTC (rev 31237)
+++ workspace/latestm2e/maven/plugins/org.jboss.tools.maven.ui/src/org/jboss/tools/maven/ui/internal/project/facet/MavenFacetInstallPage.java 2011-05-12 12:28:05 UTC (rev 31238)
@@ -18,8 +18,8 @@
import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
import org.eclipse.jst.j2ee.web.project.facet.WebFacetUtils;
import org.eclipse.m2e.core.MavenPlugin;
-import org.eclipse.m2e.core.core.IMavenConstants;
import org.eclipse.m2e.core.embedder.MavenModelManager;
+import org.eclipse.m2e.core.internal.IMavenConstants;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31237 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-05-12 06:58:35 -0400 (Thu, 12 May 2011)
New Revision: 31237
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
Log:
swtbotext: added reporting test classes that have not met any reqs
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2011-05-12 10:56:23 UTC (rev 31236)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/RequirementAwareSuite.java 2011-05-12 10:58:35 UTC (rev 31237)
@@ -7,6 +7,7 @@
import java.util.List;
import java.util.Map.Entry;
import java.util.Set;
+import java.util.TreeSet;
import org.apache.log4j.Logger;
import org.eclipse.swtbot.swt.finder.junit.ScreenshotCaptureListener;
@@ -212,6 +213,7 @@
return new ReqAwareClassRunner(klass, reqs, config);
}
log.info("Skipped");
+ cleanUp.addSkippedClass(klass);
return null;
}
@@ -235,6 +237,14 @@
public void incrPlanned() {
testsAboutToRun += 1;
}
+ /**
+ * adds class to the list of skipped classes
+ * @param klass
+ */
+ public void addSkippedClass(Class<?> klass) {
+ skippedClasses.add(klass.getName());
+
+ }
public void incrPlanned(int amount) {
testsAboutToRun += amount;
@@ -262,15 +272,32 @@
public boolean isClassPlanned(Class<?> klass) {
return classes.contains(klass.getName());
}
-
+ /**
+ * set of classes that has been skipped (annotations not met etc)
+ */
+ private Set<String> skippedClasses = new TreeSet<String>();
+ private void reportSkippedClasses() {
+ Set<String> finalized = new TreeSet<String>();
+ // lets figure out if a class that has been at least once skipped was not planned
+ for (String clazz : skippedClasses) {
+ if (!classes.contains(clazz)) {
+ finalized.add(clazz);
+ }
+ }
+ if (!finalized.isEmpty()) {
+ log.info("Several test classes have been skipped, see head of log to figure out why it happened");
+ for (String clazz : finalized) {
+ log.info(" * "+clazz);
+ }
+ }
+ }
@Override
public void testFinished(Description description) throws Exception {
incrFinished();
log.info("Finished test : " + description.getDisplayName());
log.info("Finished tests : " + getFinished() + "/" + getPlanned());
if (getFinished() >= getPlanned()) {
- log
- .info("All tests finished, performing cleanup requirements ");
+ log.info("All tests finished, performing cleanup requirements ");
try {
RequirementBase.createStopServer().fulfill();
RequirementBase.createStopDBServer().fulfill();
@@ -279,6 +306,7 @@
} catch (Exception ex) {
log.error("Unable to fulfill cleanup requirements", ex);
}
+ reportSkippedClasses();
}
super.testFinished(description);
}
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31236 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2011-05-12 06:56:23 -0400 (Thu, 12 May 2011)
New Revision: 31236
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/RequirementBase.java
Log:
swtbot ext: added requirement wrapper catching expceptions
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/RequirementBase.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/RequirementBase.java 2011-05-12 08:47:17 UTC (rev 31235)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/config/requirement/RequirementBase.java 2011-05-12 10:56:23 UTC (rev 31236)
@@ -65,8 +65,17 @@
log.info("Requirement '" + this.getClass().getName() + "' fulfilled");
}
-
/**
+ * try catch wrapper for {@link #fulfill()} method which only logs possible error
+ */
+ public void fulfillIgnore() {
+ try {
+ fulfill();
+ } catch (Exception e) {
+ log.error(e);
+ }
+ }
+ /**
* must return true if the Requirement is already fulfilled
*
* @return
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31235 - in workspace/rstryker/andre2/plugins: org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-05-12 04:47:17 -0400 (Thu, 12 May 2011)
New Revision: 31235
Added:
workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java
workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java
workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBossRSEDeploymentPrefComposite.java
Modified:
workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java
workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
Log:
Ensuring publishing UI and variables work for as7
Modified: workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java
===================================================================
--- workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-05-12 08:37:02 UTC (rev 31234)
+++ workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-05-12 08:47:17 UTC (rev 31235)
@@ -27,6 +27,7 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.IConstants;
+import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
@@ -74,11 +75,19 @@
type = JBossServer.DEPLOY_SERVER;
}
if( type.equals(JBossServer.DEPLOY_SERVER)) {
- String loc = IConstants.SERVER;
- String config = getRSEConfigName(server);
- IPath p = new Path(loc).append(config)
- .append(IJBossServerConstants.DEPLOY);
- return makeGlobal(server, p).toString();
+ // TODO !!!! Need API (nmaybe in JBossServer?) so servers can override this behavior
+ // Cannot move this code to JBossServer because this requires an RSE-specific key!! Damn!
+
+ if( server.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70)) {
+ IPath p = new Path("standalone/deployments/");
+ return makeGlobal(server, p).toString();
+ } else {
+ String loc = IConstants.SERVER;
+ String config = getRSEConfigName(server);
+ IPath p = new Path(loc).append(config)
+ .append(IJBossServerConstants.DEPLOY);
+ return makeGlobal(server, p).toString();
+ }
}
return null;
}
Added: workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java
===================================================================
--- workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java (rev 0)
+++ workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/DeployOnlyRSEPrefComposite.java 2011-05-12 08:47:17 UTC (rev 31235)
@@ -0,0 +1,160 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.rse.ui;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.wst.server.ui.internal.command.ServerCommand;
+import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
+import org.jboss.ide.eclipse.as.rse.ui.RSEDeploymentPreferenceUI.RSEDeploymentPreferenceComposite;
+import org.jboss.ide.eclipse.as.ui.Messages;
+import org.jboss.ide.eclipse.as.ui.UIUtil;
+import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
+
+public class DeployOnlyRSEPrefComposite extends
+ RSEDeploymentPreferenceComposite {
+ public DeployOnlyRSEPrefComposite(Composite parent, int style, IServerModeUICallback callback) {
+ super(parent, style, callback);
+ }
+
+ protected void createRSEWidgets(Composite child) {
+ handleDeployOnlyServer(child);
+ }
+
+ private Text deployText, tempDeployText;
+ private Button deployButton, tempDeployButton;
+ private ModifyListener deployListener, tempDeployListener;
+
+
+ private void handleDeployOnlyServer(Composite composite) {
+ Label label = new Label(this, SWT.NONE);
+ label.setText(Messages.swf_DeployDirectory);
+ deployText = new Text(this, SWT.BORDER);
+ deployText.setText(getServer().getDeployFolder());
+ deployListener = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ callback.execute(new SetDeployDirCommand());
+ }
+ };
+ deployText.addModifyListener(deployListener);
+
+ deployButton = new Button(this, SWT.PUSH);
+ deployButton.setText(Messages.browse);
+ label.setLayoutData(UIUtil.createFormData2(composite, 7, null, 0, 0, 10, null, 0));
+ deployButton.setLayoutData(UIUtil.createFormData2(composite, 5, null, 0, null, 0, 100, -5));
+ deployText.setLayoutData(UIUtil.createFormData2(composite, 5, null, 0, label, 5, deployButton, -5));
+
+ deployButton.addSelectionListener(new SelectionListener() {
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+
+ public void widgetSelected(SelectionEvent e) {
+ }
+ });
+
+ Label tempDeployLabel = new Label(this, SWT.NONE);
+ tempDeployLabel.setText(Messages.swf_TempDeployDirectory);
+ tempDeployText = new Text(this, SWT.BORDER);
+ tempDeployText.setText(getServer().getTempDeployFolder());
+ tempDeployListener = new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ callback.execute(new SetTempDeployDirCommand());
+ }
+ };
+ tempDeployText.addModifyListener(tempDeployListener);
+
+ tempDeployButton = new Button(this, SWT.PUSH);
+ tempDeployButton.setText(Messages.browse);
+
+ tempDeployLabel.setLayoutData(UIUtil.createFormData2(deployText, 7, null, 0, 0, 10, null, 0));
+ tempDeployButton.setLayoutData(UIUtil.createFormData2(deployText, 5, null, 0, null, 0, 100, -5));
+ tempDeployText.setLayoutData(UIUtil.createFormData2(deployText, 5, null, 0, tempDeployLabel, 5, deployButton, -5));
+
+ tempDeployButton.addSelectionListener(new SelectionListener() {
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+
+ public void widgetSelected(SelectionEvent e) {
+ }
+ });
+ }
+
+ private void updateDeployOnlyWidgets() {
+ String newDir = callback.getServer().getAttribute(IDeployableServer.DEPLOY_DIRECTORY, "");
+ String newTemp = callback.getServer().getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, "");
+ deployText.removeModifyListener(deployListener);
+ deployText.setText(newDir);
+ deployText.addModifyListener(deployListener);
+ tempDeployText.removeModifyListener(tempDeployListener);
+ tempDeployText.setText(newTemp);
+ tempDeployText.addModifyListener(tempDeployListener);
+ }
+ public class SetDeployDirCommand extends ServerCommand {
+ private String oldDir;
+ private String newDir;
+ private Text text;
+ private ModifyListener listener;
+
+ public SetDeployDirCommand() {
+ super(callback.getServer(), Messages.EditorSetDeployLabel);
+ this.text = deployText;
+ this.newDir = deployText.getText();
+ this.listener = deployListener;
+ this.oldDir = callback.getServer().getAttribute(
+ IDeployableServer.DEPLOY_DIRECTORY, ""); //$NON-NLS-1$
+ }
+
+ public void execute() {
+ callback.getServer().setAttribute(
+ IDeployableServer.DEPLOY_DIRECTORY, newDir);
+ updateDeployOnlyWidgets();
+ }
+
+ public void undo() {
+ callback.getServer().setAttribute(
+ IDeployableServer.DEPLOY_DIRECTORY, oldDir);
+ updateDeployOnlyWidgets();
+ }
+ }
+
+ public class SetTempDeployDirCommand extends ServerCommand {
+ private String oldDir;
+ private String newDir;
+ private Text text;
+ private ModifyListener listener;
+
+ public SetTempDeployDirCommand() {
+ super(callback.getServer(), Messages.EditorSetTempDeployLabel);
+ text = tempDeployText;
+ newDir = tempDeployText.getText();
+ listener = tempDeployListener;
+ oldDir = callback.getServer().getAttribute(
+ IDeployableServer.TEMP_DEPLOY_DIRECTORY, ""); //$NON-NLS-1$
+ }
+
+ public void execute() {
+ callback.getServer().setAttribute(
+ IDeployableServer.TEMP_DEPLOY_DIRECTORY, newDir);
+ }
+
+ public void undo() {
+ callback.getServer().setAttribute(
+ IDeployableServer.TEMP_DEPLOY_DIRECTORY, oldDir);
+ }
+ }
+}
Added: workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java
===================================================================
--- workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java (rev 0)
+++ workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBoss7RSEDeploymentPrefComposite.java 2011-05-12 08:47:17 UTC (rev 31235)
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.rse.ui;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.ide.eclipse.as.rse.core.RSEUtils;
+import org.jboss.ide.eclipse.as.rse.ui.RSEDeploymentPreferenceUI.RSEDeploymentPreferenceComposite;
+import org.jboss.ide.eclipse.as.ui.UIUtil;
+import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
+import org.jboss.ide.eclipse.as.ui.editor.ServerModeSectionComposite.ChangeServerPropertyCommand;
+
+public class JBoss7RSEDeploymentPrefComposite extends
+ RSEDeploymentPreferenceComposite {
+
+ private Text rseServerHome;
+ private Button rseBrowse;
+
+ public JBoss7RSEDeploymentPrefComposite(Composite parent, int style,
+ IServerModeUICallback callback) {
+ super(parent, style, callback);
+ }
+
+ protected void createRSEWidgets(Composite child) {
+ Label serverHomeLabel = new Label(this, SWT.NONE);
+ serverHomeLabel.setText("Remote Server Home: ");
+ rseBrowse = new Button(this, SWT.NONE);
+ rseBrowse.setText("Browse...");
+ rseBrowse.setLayoutData(UIUtil.createFormData2(child, 5, null,
+ 0, null, 0, 100, -5));
+ rseBrowse.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ browseClicked2();
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ browseClicked2();
+ }
+ });
+ rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER);
+ serverHomeLabel.setLayoutData(UIUtil.createFormData2(child, 7,
+ null, 0, 0, 10, null, 0));
+ rseServerHome.setLayoutData(UIUtil.createFormData2(child, 5,
+ null, 0, serverHomeLabel, 5, rseBrowse, -5));
+ rseServerHome.setText(callback.getServer().getAttribute(
+ RSEUtils.RSE_SERVER_HOME_DIR, RSEUIMessages.UNSET_REMOTE_SERVER_HOME));
+ rseServerHome.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ serverHomeChanged();
+ }
+ });
+ }
+ protected void serverHomeChanged() {
+ if( !isUpdatingFromModelChange()) {
+ String safeString = callback.getRuntime() != null ? callback.getRuntime().getLocation() != null ?
+ callback.getRuntime().getLocation().toString() : "" : "";
+ callback.execute(new ChangeServerPropertyCommand(
+ callback.getServer(), RSEUtils.RSE_SERVER_HOME_DIR, rseServerHome.getText(),
+ safeString, RSEUIMessages.CHANGE_REMOTE_SERVER_HOME));
+ }
+ }
+ protected void browseClicked2() {
+ String browseVal = browseClicked3(rseServerHome.getShell());
+ if (browseVal != null) {
+ rseServerHome.setText(browseVal);
+ serverHomeChanged();
+ }
+ }
+}
Added: workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBossRSEDeploymentPrefComposite.java
===================================================================
--- workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBossRSEDeploymentPrefComposite.java (rev 0)
+++ workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/JBossRSEDeploymentPrefComposite.java 2011-05-12 08:47:17 UTC (rev 31235)
@@ -0,0 +1,250 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.rse.ui;
+
+import java.beans.PropertyChangeEvent;
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.rse.core.model.IHost;
+import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
+import org.eclipse.rse.services.files.IFileService;
+import org.eclipse.rse.services.files.IHostFile;
+import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.progress.IProgressService;
+import org.jboss.ide.eclipse.as.core.util.IConstants;
+import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
+import org.jboss.ide.eclipse.as.rse.core.RSEUtils;
+import org.jboss.ide.eclipse.as.rse.ui.RSEDeploymentPreferenceUI.RSEDeploymentPreferenceComposite;
+import org.jboss.ide.eclipse.as.ui.UIUtil;
+import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
+import org.jboss.ide.eclipse.as.ui.editor.ServerModeSectionComposite.ChangeServerPropertyCommand;
+
+public class JBossRSEDeploymentPrefComposite extends
+ RSEDeploymentPreferenceComposite {
+
+ private Text rseServerHome,rseServerConfig;
+ private Button rseBrowse, rseTest;
+
+ public JBossRSEDeploymentPrefComposite(Composite parent, int style, IServerModeUICallback callback) {
+ super(parent, style, callback);
+ }
+
+ protected void createRSEWidgets(Composite child) {
+ handleJBossServer(child);
+ }
+
+ private void handleJBossServer(Composite composite) {
+ Label serverHomeLabel = new Label(this, SWT.NONE);
+ serverHomeLabel.setText("Remote Server Home: ");
+ rseBrowse = new Button(this, SWT.NONE);
+ rseBrowse.setText("Browse...");
+ rseBrowse.setLayoutData(UIUtil.createFormData2(composite, 5, null,
+ 0, null, 0, 100, -5));
+ rseBrowse.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ browseClicked2();
+ }
+
+ public void widgetDefaultSelected(SelectionEvent e) {
+ browseClicked2();
+ }
+ });
+ rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER);
+ serverHomeLabel.setLayoutData(UIUtil.createFormData2(composite, 7,
+ null, 0, 0, 10, null, 0));
+ rseServerHome.setLayoutData(UIUtil.createFormData2(composite, 5,
+ null, 0, serverHomeLabel, 5, rseBrowse, -5));
+ rseServerHome.setText(callback.getServer().getAttribute(
+ RSEUtils.RSE_SERVER_HOME_DIR, RSEUIMessages.UNSET_REMOTE_SERVER_HOME));
+ rseServerHome.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ serverHomeChanged();
+ }
+ });
+
+ Label serverConfigLabel = new Label(this, SWT.NONE);
+ serverConfigLabel.setText(RSEUIMessages.REMOTE_SERVER_CONFIG);
+ rseServerConfig = new Text(this, SWT.SINGLE | SWT.BORDER);
+ serverConfigLabel.setLayoutData(UIUtil.createFormData2(
+ rseServerHome, 7, null, 0, 0, 10, null, 0));
+ rseServerConfig.setText(callback.getServer().getAttribute(
+ RSEUtils.RSE_SERVER_CONFIG,
+ getRuntime() == null ? "" : getRuntime()
+ .getJBossConfiguration()));
+ rseServerConfig.addModifyListener(new ModifyListener() {
+ public void modifyText(ModifyEvent e) {
+ serverConfigChanged();
+ }
+ });
+ callback.getServer().addPropertyChangeListener(this);
+
+ rseTest = new Button(this, SWT.NONE);
+ rseTest.setText(RSEUIMessages.TEST);
+ rseTest.setLayoutData(UIUtil.createFormData2(rseServerHome, 5,
+ null, 0, null, 0, 100, -5));
+ rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome,
+ 5, null, 0, serverConfigLabel, 5, rseTest, -5));
+ rseTest.addSelectionListener(new SelectionListener() {
+ public void widgetSelected(SelectionEvent e) {
+ testPressed();
+ }
+ public void widgetDefaultSelected(SelectionEvent e) {
+ }
+ });
+ }
+
+ private void testPressed(){
+ rseTest.setEnabled(false);
+ IWorkbench wb = PlatformUI.getWorkbench();
+ IProgressService ps = wb.getProgressService();
+ final IStatus[] s = new IStatus[1];
+ Throwable e = null;
+ final String home = rseServerHome.getText();
+ final String config = rseServerConfig.getText();
+ try {
+ ps.busyCursorWhile(new IRunnableWithProgress() {
+ public void run(IProgressMonitor pm) {
+ s[0] = testPressed(home, config, pm);
+ }
+ });
+ } catch(InvocationTargetException ite) {
+ e = ite;
+ } catch(InterruptedException ie) {
+ e = ie;
+ }
+ if( s[0] == null && e != null ) {
+ s[0] = new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, e.getMessage(), e);
+ }
+ rseTest.setEnabled(true);
+ IStatus s2 = s[0];
+ if( s2.isOK() )
+ s2 = new Status(IStatus.INFO, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
+ RSEUIMessages.REMOTE_SERVER_TEST_SUCCESS);
+ showMessageDialog(RSEUIMessages.REMOTE_SERVER_TEST, s2, rseServerHome.getShell());
+ }
+
+ private IStatus testPressed(String home, String config, IProgressMonitor pm) {
+ pm.beginTask(RSEUIMessages.VALIDATING_REMOTE_CONFIG, 1200);
+ IHost host = combo.getHost();
+ if( host == null ) {
+ pm.done();
+ return getTestFailStatus(RSEUIMessages.EMPTY_HOST);
+ }
+ pm.worked(100);
+
+ IFileServiceSubSystem fileSubSystem = RSEPublishMethod.findFileTransferSubSystem(host);
+ if( fileSubSystem == null ) {
+ pm.done();
+ return getTestFailStatus(NLS.bind(RSEUIMessages.FILE_SUBSYSTEM_NOT_FOUND, host.getName()));
+ }
+ pm.worked(100);
+
+ if(!fileSubSystem.isConnected()) {
+ try {
+ fileSubSystem.connect(new NullProgressMonitor(), false);
+ } catch (Exception e) {
+ pm.done();
+ return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_FILESYSTEM_CONNECT_FAILED, e.getLocalizedMessage()));
+ }
+ }
+ pm.worked(300);
+
+ IFileService service = fileSubSystem.getFileService();
+ if( service == null ) {
+ pm.done();
+ return getTestFailStatus(NLS.bind(RSEUIMessages.FILESERVICE_NOT_FOUND, host.getName()));
+ }
+ pm.worked(100);
+
+ String root = home;
+ IPath root2 = new Path(root);
+ try {
+ IHostFile file = service.getFile(root2.removeLastSegments(1).toPortableString(), root2.lastSegment(), new NullProgressMonitor());
+ if( file == null || !file.exists()) {
+ pm.done();
+ return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_HOME_NOT_FOUND,
+ new Object[]{root2, service.getName(), host.getName()}));
+
+ }
+ pm.worked(300);
+
+ root2 = root2.append(IConstants.SERVER).append(config);
+ file = service.getFile(root2.removeLastSegments(1).toPortableString(), root2.lastSegment(), new NullProgressMonitor());
+ if( file == null || !file.exists()) {
+ pm.done();
+ return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_CONFIG_NOT_FOUND, root2));
+ }
+ pm.worked(300);
+ } catch(SystemMessageException sme) {
+ pm.done();
+ return getTestFailStatus(RSEUIMessages.ERROR_CHECKING_REMOTE_SYSTEM + sme.getLocalizedMessage());
+ }
+ pm.done();
+ return Status.OK_STATUS;
+ }
+
+ private IStatus getTestFailStatus(String string) {
+ return new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, string);
+ }
+
+ protected void browseClicked2() {
+ String browseVal = browseClicked3(rseServerHome.getShell());
+ if (browseVal != null) {
+ rseServerHome.setText(browseVal);
+ serverHomeChanged();
+ }
+ }
+ protected void propertyChangeBody(PropertyChangeEvent evt) {
+ super.propertyChangeBody(evt);
+ if( evt.getPropertyName().equals(RSEUtils.RSE_SERVER_HOME_DIR)) {
+ updateTextIfChanges(rseServerHome, evt.getNewValue().toString());
+ } else if( evt.getPropertyName().equals(RSEUtils.RSE_SERVER_CONFIG)) {
+ updateTextIfChanges(rseServerConfig, evt.getNewValue().toString());
+ }
+ }
+ protected void serverConfigChanged() {
+ if( !isUpdatingFromModelChange() ) {
+ callback.execute(new ChangeServerPropertyCommand(
+ callback.getServer(), RSEUtils.RSE_SERVER_CONFIG, rseServerConfig.getText(),
+ getRuntime() == null ? "" : getRuntime().getJBossConfiguration(),
+ RSEUIMessages.CHANGE_REMOTE_SERVER_CONFIG));
+ }
+ }
+ protected void serverHomeChanged() {
+ if( !isUpdatingFromModelChange()) {
+ String safeString = callback.getRuntime() != null ? callback.getRuntime().getLocation() != null ?
+ callback.getRuntime().getLocation().toString() : "" : "";
+ callback.execute(new ChangeServerPropertyCommand(
+ callback.getServer(), RSEUtils.RSE_SERVER_HOME_DIR, rseServerHome.getText(),
+ safeString, RSEUIMessages.CHANGE_REMOTE_SERVER_HOME));
+ }
+ }
+
+}
Modified: workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java
===================================================================
--- workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java 2011-05-12 08:37:02 UTC (rev 31234)
+++ workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPageCallback.java 2011-05-12 08:47:17 UTC (rev 31235)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.rse.ui;
import java.beans.PropertyChangeEvent;
Modified: workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-05-12 08:37:02 UTC (rev 31234)
+++ workspace/rstryker/andre2/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2011-05-12 08:47:17 UTC (rev 31235)
@@ -12,28 +12,17 @@
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
-import java.lang.reflect.InvocationTargetException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.osgi.util.NLS;
import org.eclipse.rse.core.RSECorePlugin;
import org.eclipse.rse.core.events.ISystemModelChangeEvent;
import org.eclipse.rse.core.events.ISystemModelChangeListener;
import org.eclipse.rse.core.model.IHost;
import org.eclipse.rse.files.ui.dialogs.SystemRemoteFileDialog;
-import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
-import org.eclipse.rse.services.files.IFileService;
-import org.eclipse.rse.services.files.IHostFile;
-import org.eclipse.rse.subsystems.files.core.servicesubsystem.IFileServiceSubSystem;
import org.eclipse.rse.subsystems.files.core.subsystems.IRemoteFile;
import org.eclipse.rse.ui.wizards.newconnection.RSEMainNewConnectionWizard;
import org.eclipse.swt.SWT;
@@ -50,22 +39,16 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressService;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.ui.internal.command.ServerCommand;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
-import org.jboss.ide.eclipse.as.core.util.IConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
-import org.jboss.ide.eclipse.as.rse.core.RSEPublishMethod;
import org.jboss.ide.eclipse.as.rse.core.RSEUtils;
-import org.jboss.ide.eclipse.as.ui.Messages;
import org.jboss.ide.eclipse.as.ui.UIUtil;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI;
import org.jboss.ide.eclipse.as.ui.editor.ServerModeSection;
@@ -84,15 +67,28 @@
@Override
public void fillComposite(Composite parent, IServerModeUICallback callback) {
parent.setLayout(new FillLayout());
- new RSEDeploymentPreferenceComposite(parent, SWT.NONE, callback);
+ RSEDeploymentPreferenceComposite composite = null;
+
+ IServerWorkingCopy cServer = callback.getServer();
+ JBossServer jbs = cServer.getOriginal() == null ?
+ ServerConverter.getJBossServer(cServer) :
+ ServerConverter.getJBossServer(cServer.getOriginal());
+ if( jbs != null && !cServer.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70) ) {
+ composite = new JBossRSEDeploymentPrefComposite(parent, SWT.NONE, callback);
+ } else if( cServer.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70) ){
+ composite = new JBoss7RSEDeploymentPrefComposite(parent, SWT.NONE, callback);
+ // TODO add for jboss 7
+ } else {
+ composite = new DeployOnlyRSEPrefComposite(parent, SWT.NONE, callback);
+ }
+ //return composite;
}
- public static class RSEDeploymentPreferenceComposite extends Composite implements PropertyChangeListener {
- private IServerModeUICallback callback;
- private CustomSystemHostCombo combo;
- private Text rseServerHome,rseServerConfig;
- private Button rseBrowse, rseTest;
- private ModifyListener comboMListener;
+ public static abstract class RSEDeploymentPreferenceComposite extends Composite implements PropertyChangeListener {
+ protected IServerModeUICallback callback;
+ protected CustomSystemHostCombo combo;
+ protected ModifyListener comboMListener;
+ private boolean updatingFromModelChange = false;
public RSEDeploymentPreferenceComposite(Composite parent, int style, IServerModeUICallback callback) {
super(parent, style);
this.callback = callback;
@@ -109,250 +105,44 @@
};
combo.getCombo().addModifyListener(comboMListener);
- IServerWorkingCopy cServer = callback.getServer();
- JBossServer jbs = cServer.getOriginal() == null ?
- ServerConverter.getJBossServer(cServer) :
- ServerConverter.getJBossServer(cServer.getOriginal());
- if( jbs != null && !cServer.getServerType().getId().equals(IJBossToolingConstants.SERVER_AS_70) ) {
- handleJBossServer(child);
- } else {
- handleDeployOnlyServer(child);
- }
+ createRSEWidgets(child);
}
- private IDeployableServer getServer() {
+
+ protected abstract void createRSEWidgets(Composite child);
+
+ protected IDeployableServer getServer() {
return (IDeployableServer) callback.getServer().loadAdapter(
IDeployableServer.class, new NullProgressMonitor());
}
- private Text deployText, tempDeployText;
- private Button deployButton, tempDeployButton;
- private ModifyListener deployListener, tempDeployListener;
-
- private void handleJBossServer(Composite composite) {
- Label serverHomeLabel = new Label(this, SWT.NONE);
- serverHomeLabel.setText("Remote Server Home: ");
- rseBrowse = new Button(this, SWT.NONE);
- rseBrowse.setText("Browse...");
- rseBrowse.setLayoutData(UIUtil.createFormData2(composite, 5, null,
- 0, null, 0, 100, -5));
- rseBrowse.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- browseClicked2();
+ protected String browseClicked3(Shell shell) {
+ SystemRemoteFileDialog d = new SystemRemoteFileDialog(
+ shell, RSEUIMessages.BROWSE_REMOTE_SYSTEM, combo.getHost());
+ if( d.open() == Dialog.OK) {
+ Object o = d.getOutputObject();
+ if( o instanceof IRemoteFile ) {
+ String path = ((IRemoteFile)o).getAbsolutePath();
+ return path;
}
-
- public void widgetDefaultSelected(SelectionEvent e) {
- browseClicked2();
- }
- });
- rseServerHome = new Text(this, SWT.SINGLE | SWT.BORDER);
- serverHomeLabel.setLayoutData(UIUtil.createFormData2(composite, 7,
- null, 0, 0, 10, null, 0));
- rseServerHome.setLayoutData(UIUtil.createFormData2(composite, 5,
- null, 0, serverHomeLabel, 5, rseBrowse, -5));
- rseServerHome.setText(callback.getServer().getAttribute(
- RSEUtils.RSE_SERVER_HOME_DIR, RSEUIMessages.UNSET_REMOTE_SERVER_HOME));
- rseServerHome.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- serverHomeChanged();
- }
- });
-
- Label serverConfigLabel = new Label(this, SWT.NONE);
- serverConfigLabel.setText(RSEUIMessages.REMOTE_SERVER_CONFIG);
- rseServerConfig = new Text(this, SWT.SINGLE | SWT.BORDER);
- serverConfigLabel.setLayoutData(UIUtil.createFormData2(
- rseServerHome, 7, null, 0, 0, 10, null, 0));
- rseServerConfig.setText(callback.getServer().getAttribute(
- RSEUtils.RSE_SERVER_CONFIG,
- getRuntime() == null ? "" : getRuntime()
- .getJBossConfiguration()));
- rseServerConfig.addModifyListener(new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- serverConfigChanged();
- }
- });
- callback.getServer().addPropertyChangeListener(this);
-
- rseTest = new Button(this, SWT.NONE);
- rseTest.setText(RSEUIMessages.TEST);
- rseTest.setLayoutData(UIUtil.createFormData2(rseServerHome, 5,
- null, 0, null, 0, 100, -5));
- rseServerConfig.setLayoutData(UIUtil.createFormData2(rseServerHome,
- 5, null, 0, serverConfigLabel, 5, rseTest, -5));
- rseTest.addSelectionListener(new SelectionListener() {
- public void widgetSelected(SelectionEvent e) {
- testPressed();
- }
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- });
+ }
+ return null;
}
-
-
-
- private void handleDeployOnlyServer(Composite composite) {
- Label label = new Label(this, SWT.NONE);
- label.setText(Messages.swf_DeployDirectory);
- deployText = new Text(this, SWT.BORDER);
- deployText.setText(getServer().getDeployFolder());
- deployListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- callback.execute(new SetDeployDirCommand());
- }
- };
- deployText.addModifyListener(deployListener);
-
- deployButton = new Button(this, SWT.PUSH);
- deployButton.setText(Messages.browse);
- label.setLayoutData(UIUtil.createFormData2(composite, 7, null, 0, 0, 10, null, 0));
- deployButton.setLayoutData(UIUtil.createFormData2(composite, 5, null, 0, null, 0, 100, -5));
- deployText.setLayoutData(UIUtil.createFormData2(composite, 5, null, 0, label, 5, deployButton, -5));
-
- deployButton.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- }
- });
-
- Label tempDeployLabel = new Label(this, SWT.NONE);
- tempDeployLabel.setText(Messages.swf_TempDeployDirectory);
- tempDeployText = new Text(this, SWT.BORDER);
- tempDeployText.setText(getServer().getTempDeployFolder());
- tempDeployListener = new ModifyListener() {
- public void modifyText(ModifyEvent e) {
- callback.execute(new SetTempDeployDirCommand());
- }
- };
- tempDeployText.addModifyListener(tempDeployListener);
-
- tempDeployButton = new Button(this, SWT.PUSH);
- tempDeployButton.setText(Messages.browse);
-
- tempDeployLabel.setLayoutData(UIUtil.createFormData2(deployText, 7, null, 0, 0, 10, null, 0));
- tempDeployButton.setLayoutData(UIUtil.createFormData2(deployText, 5, null, 0, null, 0, 100, -5));
- tempDeployText.setLayoutData(UIUtil.createFormData2(deployText, 5, null, 0, tempDeployLabel, 5, deployButton, -5));
-
- tempDeployButton.addSelectionListener(new SelectionListener() {
- public void widgetDefaultSelected(SelectionEvent e) {
- }
-
- public void widgetSelected(SelectionEvent e) {
- }
- });
- }
- private void updateDeployOnlyWidgets() {
- String newDir = callback.getServer().getAttribute(IDeployableServer.DEPLOY_DIRECTORY, "");
- String newTemp = callback.getServer().getAttribute(IDeployableServer.TEMP_DEPLOY_DIRECTORY, "");
- deployText.removeModifyListener(deployListener);
- deployText.setText(newDir);
- deployText.addModifyListener(deployListener);
- tempDeployText.removeModifyListener(tempDeployListener);
- tempDeployText.setText(newTemp);
- tempDeployText.addModifyListener(tempDeployListener);
+ protected IJBossServerRuntime getRuntime() {
+ IRuntime rt = callback.getRuntime();
+ if( rt == null ) return null;
+ return (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, null);
}
+
- private void testPressed(){
- rseTest.setEnabled(false);
- IWorkbench wb = PlatformUI.getWorkbench();
- IProgressService ps = wb.getProgressService();
- final IStatus[] s = new IStatus[1];
- Throwable e = null;
- final String home = rseServerHome.getText();
- final String config = rseServerConfig.getText();
- try {
- ps.busyCursorWhile(new IRunnableWithProgress() {
- public void run(IProgressMonitor pm) {
- s[0] = testPressed(home, config, pm);
- }
- });
- } catch(InvocationTargetException ite) {
- e = ite;
- } catch(InterruptedException ie) {
- e = ie;
- }
- if( s[0] == null && e != null ) {
- s[0] = new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, e.getMessage(), e);
- }
- rseTest.setEnabled(true);
- showMessageDialog(RSEUIMessages.REMOTE_SERVER_TEST, s[0]);
- }
- private void showMessageDialog(String title, IStatus s) {
- if( s.isOK() )
- s = new Status(IStatus.INFO, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID,
- RSEUIMessages.REMOTE_SERVER_TEST_SUCCESS);
- ErrorDialog d = new ErrorDialog(rseServerHome.getShell(), title, null, s, IStatus.INFO | IStatus.ERROR);
+ protected void showMessageDialog(String title, IStatus s, Shell shell) {
+ ErrorDialog d = new ErrorDialog(shell, title, null, s, IStatus.INFO | IStatus.ERROR);
d.open();
}
- private IStatus testPressed(String home, String config, IProgressMonitor pm) {
- pm.beginTask(RSEUIMessages.VALIDATING_REMOTE_CONFIG, 1200);
- IHost host = combo.getHost();
- if( host == null ) {
- pm.done();
- return getTestFailStatus(RSEUIMessages.EMPTY_HOST);
- }
- pm.worked(100);
-
- IFileServiceSubSystem fileSubSystem = RSEPublishMethod.findFileTransferSubSystem(host);
- if( fileSubSystem == null ) {
- pm.done();
- return getTestFailStatus(NLS.bind(RSEUIMessages.FILE_SUBSYSTEM_NOT_FOUND, host.getName()));
- }
- pm.worked(100);
-
- if(!fileSubSystem.isConnected()) {
- try {
- fileSubSystem.connect(new NullProgressMonitor(), false);
- } catch (Exception e) {
- pm.done();
- return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_FILESYSTEM_CONNECT_FAILED, e.getLocalizedMessage()));
- }
- }
- pm.worked(300);
-
- IFileService service = fileSubSystem.getFileService();
- if( service == null ) {
- pm.done();
- return getTestFailStatus(NLS.bind(RSEUIMessages.FILESERVICE_NOT_FOUND, host.getName()));
- }
- pm.worked(100);
-
- String root = home;
- IPath root2 = new Path(root);
- try {
- IHostFile file = service.getFile(root2.removeLastSegments(1).toPortableString(), root2.lastSegment(), new NullProgressMonitor());
- if( file == null || !file.exists()) {
- pm.done();
- return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_HOME_NOT_FOUND,
- new Object[]{root2, service.getName(), host.getName()}));
-
- }
- pm.worked(300);
-
- root2 = root2.append(IConstants.SERVER).append(config);
- file = service.getFile(root2.removeLastSegments(1).toPortableString(), root2.lastSegment(), new NullProgressMonitor());
- if( file == null || !file.exists()) {
- pm.done();
- return getTestFailStatus(NLS.bind(RSEUIMessages.REMOTE_CONFIG_NOT_FOUND, root2));
- }
- pm.worked(300);
- } catch(SystemMessageException sme) {
- pm.done();
- return getTestFailStatus(RSEUIMessages.ERROR_CHECKING_REMOTE_SYSTEM + sme.getLocalizedMessage());
- }
- pm.done();
- return Status.OK_STATUS;
- }
- private IStatus getTestFailStatus(String string) {
- return new Status(IStatus.ERROR, org.jboss.ide.eclipse.as.rse.core.RSECorePlugin.PLUGIN_ID, string);
- }
-
- private String discoverCurrentHost(IServerModeUICallback callback) {
+ protected String discoverCurrentHost(IServerModeUICallback callback) {
String current = callback.getServer().getAttribute(RSEUtils.RSE_SERVER_HOST, (String)null);
if( current == null ) {
String serverHost = callback.getServer().getHost().toLowerCase();
@@ -376,52 +166,29 @@
callback.getServer().removePropertyChangeListener(this);
}
- private boolean updatingFromModelChange = false;
public void propertyChange(PropertyChangeEvent evt) {
updatingFromModelChange = true;
- if( evt.getPropertyName().equals(RSEUtils.RSE_SERVER_HOME_DIR)) {
- updateTextIfChanges(rseServerHome, evt.getNewValue().toString());
- } else if( evt.getPropertyName().equals(RSEUtils.RSE_SERVER_CONFIG)) {
- updateTextIfChanges(rseServerConfig, evt.getNewValue().toString());
- } else if( evt.getPropertyName().equals(RSEUtils.RSE_SERVER_HOST)) {
- combo.setHostName(evt.getNewValue().toString());
- }
+ propertyChangeBody(evt);
updatingFromModelChange = false;
}
- private void updateTextIfChanges(Text control, String newValue) {
- if(!control.getText().equals(newValue)) {
- control.setText(newValue);
- }
+ protected boolean isUpdatingFromModelChange() {
+ return updatingFromModelChange;
}
-
- protected void browseClicked2() {
- String browseVal = browseClicked3();
- if (browseVal != null) {
- rseServerHome.setText(browseVal);
- serverHomeChanged();
+
+ protected void propertyChangeBody(PropertyChangeEvent evt) {
+ if( evt.getPropertyName().equals(RSEUtils.RSE_SERVER_HOST)) {
+ combo.setHostName(evt.getNewValue().toString());
}
}
-
- protected String browseClicked3() {
- SystemRemoteFileDialog d = new SystemRemoteFileDialog(
- rseBrowse.getShell(), RSEUIMessages.BROWSE_REMOTE_SYSTEM, combo.getHost());
- if( d.open() == Dialog.OK) {
- Object o = d.getOutputObject();
- if( o instanceof IRemoteFile ) {
- String path = ((IRemoteFile)o).getAbsolutePath();
- return path;
- }
+
+ protected void updateTextIfChanges(Text control, String newValue) {
+ if(!control.getText().equals(newValue)) {
+ control.setText(newValue);
}
- return null;
}
+
- protected IJBossServerRuntime getRuntime() {
- IRuntime rt = callback.getRuntime();
- if( rt == null ) return null;
- return (IJBossServerRuntime)rt.loadAdapter(IJBossServerRuntime.class, null);
- }
-
protected void rseHostChanged() {
if( !updatingFromModelChange ) {
String hostName = combo.getHost() == null ? null : combo.getHost().getAliasName();
@@ -436,26 +203,7 @@
}
}
}
-
- protected void serverHomeChanged() {
- if( !updatingFromModelChange) {
- String safeString = callback.getRuntime() != null ? callback.getRuntime().getLocation() != null ?
- callback.getRuntime().getLocation().toString() : "" : "";
- callback.execute(new ChangeServerPropertyCommand(
- callback.getServer(), RSEUtils.RSE_SERVER_HOME_DIR, rseServerHome.getText(),
- safeString, RSEUIMessages.CHANGE_REMOTE_SERVER_HOME));
- }
- }
- protected void serverConfigChanged() {
- if( !updatingFromModelChange ) {
- callback.execute(new ChangeServerPropertyCommand(
- callback.getServer(), RSEUtils.RSE_SERVER_CONFIG, rseServerConfig.getText(),
- getRuntime() == null ? "" : getRuntime().getJBossConfiguration(),
- RSEUIMessages.CHANGE_REMOTE_SERVER_CONFIG));
- }
- }
-
public class CustomSystemHostCombo extends Composite implements ModifyListener, ISystemModelChangeListener {
private String fileSubSystem;
private Combo combo;
@@ -598,59 +346,5 @@
RSECorePlugin.getTheSystemRegistry().removeSystemModelChangeListener(this);
}
}
-
- public class SetDeployDirCommand extends ServerCommand {
- private String oldDir;
- private String newDir;
- private Text text;
- private ModifyListener listener;
-
- public SetDeployDirCommand() {
- super(callback.getServer(), Messages.EditorSetDeployLabel);
- this.text = deployText;
- this.newDir = deployText.getText();
- this.listener = deployListener;
- this.oldDir = callback.getServer().getAttribute(
- IDeployableServer.DEPLOY_DIRECTORY, ""); //$NON-NLS-1$
- }
-
- public void execute() {
- callback.getServer().setAttribute(
- IDeployableServer.DEPLOY_DIRECTORY, newDir);
- updateDeployOnlyWidgets();
- }
-
- public void undo() {
- callback.getServer().setAttribute(
- IDeployableServer.DEPLOY_DIRECTORY, oldDir);
- updateDeployOnlyWidgets();
- }
- }
-
- public class SetTempDeployDirCommand extends ServerCommand {
- private String oldDir;
- private String newDir;
- private Text text;
- private ModifyListener listener;
-
- public SetTempDeployDirCommand() {
- super(callback.getServer(), Messages.EditorSetTempDeployLabel);
- text = tempDeployText;
- newDir = tempDeployText.getText();
- listener = tempDeployListener;
- oldDir = callback.getServer().getAttribute(
- IDeployableServer.TEMP_DEPLOY_DIRECTORY, ""); //$NON-NLS-1$
- }
-
- public void execute() {
- callback.getServer().setAttribute(
- IDeployableServer.TEMP_DEPLOY_DIRECTORY, newDir);
- }
-
- public void undo() {
- callback.getServer().setAttribute(
- IDeployableServer.TEMP_DEPLOY_DIRECTORY, oldDir);
- }
- }
}
}
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31234 - workspace/latestm2e/updatesite.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-05-12 04:37:02 -0400 (Thu, 12 May 2011)
New Revision: 31234
Added:
workspace/latestm2e/updatesite/compositeArtifacts.xml
workspace/latestm2e/updatesite/compositeContent.xml
Log:
Custom update site referencing the jbosstools indigo requirements and the latest m2e related update sites
Added: workspace/latestm2e/updatesite/compositeArtifacts.xml
===================================================================
--- workspace/latestm2e/updatesite/compositeArtifacts.xml (rev 0)
+++ workspace/latestm2e/updatesite/compositeArtifacts.xml 2011-05-12 08:37:02 UTC (rev 31234)
@@ -0,0 +1,22 @@
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name="JBoss Tools Requirements - Composite Indigo Mirror" type="org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository" version="1.0.0">
+<properties size="2">
+<property name="p2.compressed" value="true"/>
+<!--
+
+" add this to your ~/.vimrc file, then use \ts to update timestamp to current
+fun! ReplaceTimestamp()
+ let tstamp = strftime("%s000")
+ exe ":%s#<property name='p2.timestamp' value='[0-9]\\+'/>#<property name='p2.timestamp' value='" . tstamp . "'/>#g"
+ echo "New time: " . tstamp
+endfun
+nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
+-->
+<property name="p2.timestamp" value="1305086482000"/>
+</properties>
+<children size="3">
+<child location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/>
+<child location="https://repository.sonatype.org/content/sites/forge-sites/m2eclipse-wtp/0..."/>
+<child location="https://repository.sonatype.org/content/sites/forge-sites/m2e/0.13.0/N/0...."/>
+</children>
+</repository>
Added: workspace/latestm2e/updatesite/compositeContent.xml
===================================================================
--- workspace/latestm2e/updatesite/compositeContent.xml (rev 0)
+++ workspace/latestm2e/updatesite/compositeContent.xml 2011-05-12 08:37:02 UTC (rev 31234)
@@ -0,0 +1,20 @@
+<repository name="JBoss Tools Requirements - Composite Indigo Mirror" type="org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository" version="1.0.0">
+<properties size="2">
+<property name="p2.compressed" value="true"/>
+<!--
+" add this to your ~/.vimrc file, then use \ts to update timestamp to current
+fun! ReplaceTimestamp()
+ let tstamp = strftime("%s000")
+ exe ":%s#<property name='p2.timestamp' value='[0-9]\\+'/>#<property name='p2.timestamp' value='" . tstamp . "'/>#g"
+ echo "New time: " . tstamp
+endfun
+nnoremap <Leader>ts :call ReplaceTimestamp()<CR>
+-->
+<property name="p2.timestamp" value="1305086482000"/>
+</properties>
+<children size="3">
+<child location="http://download.jboss.org/jbosstools/updates/indigo/M7/"/>
+<child location="https://repository.sonatype.org/content/sites/forge-sites/m2eclipse-wtp/0..."/>
+<child location="https://repository.sonatype.org/content/sites/forge-sites/m2e/0.13.0/N/0...."/>
+</children>
+</repository>
13 years, 5 months
- 1
- 0
JBoss Tools SVN: r31233 - workspace/latestm2e.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-05-12 04:35:32 -0400 (Thu, 12 May 2011)
New Revision: 31233
Added:
workspace/latestm2e/updatesite/
Log:
Custom update site referencing the jbosstools indigo requirements and the latest m2e related update sites
13 years, 5 months
- 1
- 0