JBoss Tools SVN: r39408 - branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-03-09 10:43:14 -0500 (Fri, 09 Mar 2012)
New Revision: 39408
Modified:
branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples/pr...
Log:
JBIDE-10823 JBoss Central Quickstarts Updates
Modified: branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples/pr...
===================================================================
--- branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples/pr... 2012-03-09 15:24:38 UTC (rev 39407)
+++ branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples/pr... 2012-03-09 15:43:14 UTC (rev 39408)
@@ -230,8 +230,8 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71</property>
- <property name="description">works with JBoss AS 7.0/7.1</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">works with JBoss AS 7.1</property>
<property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
</fix>
<fix type="plugin">
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r39407 - workspace/snjeza/jbossas7-examples and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2012-03-09 10:24:38 -0500 (Fri, 09 Mar 2012)
New Revision: 39407
Modified:
branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples/pr...
branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples/pr...
workspace/snjeza/jbossas7-examples/helloworld.zip
workspace/snjeza/jbossas7-examples/kitchensink.zip
workspace/snjeza/jbossas7-examples/numberguess.zip
Log:
JBIDE-10823 JBoss Central Quickstarts Updates
Modified: branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples/pr...
===================================================================
--- branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples/pr... 2012-03-09 13:12:26 UTC (rev 39406)
+++ branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples/pr... 2012-03-09 15:24:38 UTC (rev 39407)
@@ -12,9 +12,9 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
- <property name="description">This project example requires JBoss AS 7.0/7.1 or EAP 6 </property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss AS 7.1 or EAP 6 </property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
@@ -59,9 +59,9 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
- <property name="description">This project example requires JBoss AS 7.0/7.1 or EAP 6 </property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss AS 7.1 or EAP 6 </property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
@@ -144,9 +144,9 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
- <property name="description">This project example requires JBoss AS 7.0/7.1 or EAP 6 </property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss 7.1 or EAP 6 </property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
@@ -188,9 +188,9 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
- <property name="description">This project example requires JBoss AS 7.0/7.1 or EAP 6 </property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss AS 7.1 or EAP 6 </property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
Modified: branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples/pr...
===================================================================
--- branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples/pr... 2012-03-09 13:12:26 UTC (rev 39406)
+++ branches/jbosstools-3.3.0.Beta1/download.jboss.org/jbosstools/examples/pr... 2012-03-09 15:24:38 UTC (rev 39407)
@@ -52,9 +52,9 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71</property>
- <property name="description">works with JBoss AS 7.0/7.1</property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">works with JBoss AS 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
@@ -99,9 +99,9 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71</property>
- <property name="description">works with JBoss AS 7.0/7.1</property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">works with JBoss AS 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
@@ -186,9 +186,9 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71</property>
- <property name="description">works with JBoss AS 7.0/7.1</property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">works with JBoss AS 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
@@ -271,9 +271,9 @@
<url>http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/jbossas7-examp...</url>
<fixes>
<fix type="wtpruntime">
- <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.70, org.jboss.ide.eclipse.as.runtime.71</property>
- <property name="description">works with JBoss AS 7.0/7.1</property>
- <property name="downloadId">org.jboss.tools.runtime.core.as.702</property>
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.71</property>
+ <property name="description">works with JBoss AS 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.710</property>
</fix>
<fix type="plugin">
<property name="id">org.eclipse.m2e.core</property>
Modified: workspace/snjeza/jbossas7-examples/helloworld.zip
===================================================================
(Binary files differ)
Modified: workspace/snjeza/jbossas7-examples/kitchensink.zip
===================================================================
(Binary files differ)
Modified: workspace/snjeza/jbossas7-examples/numberguess.zip
===================================================================
(Binary files differ)
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r39406 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-09 08:12:26 -0500 (Fri, 09 Mar 2012)
New Revision: 39406
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java
Log:
JBIDE-11062 - annoying bug in archives re: flatten (trunk)
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java 2012-03-09 11:47:10 UTC (rev 39405)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java 2012-03-09 13:12:26 UTC (rev 39406)
@@ -14,7 +14,7 @@
private String dir, includes, excludes;
private boolean inWorkspace;
- private boolean flattened = false;
+ private boolean flatten = false;
public XbFileSet () {
super("fileset"); //$NON-NLS-1$
@@ -31,7 +31,7 @@
this.includes = fileset.includes == null ? null : new String(fileset.includes);
this.excludes = fileset.excludes == null ? null : new String(fileset.excludes);
this.inWorkspace = fileset.inWorkspace;
- this.flattened = fileset.flattened;
+ this.flatten = fileset.flatten;
}
protected Object clone() throws CloneNotSupportedException {
@@ -71,10 +71,18 @@
}
public boolean isFlattened() {
- return flattened;
+ return flatten;
}
public void setFlattened(boolean flatten) {
- this.flattened = flatten;
+ this.flatten = flatten;
}
+
+ public boolean isFlatten() {
+ return flatten;
+ }
+
+ public void setFlatten(boolean flatten) {
+ this.flatten = flatten;
+ }
}
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r39405 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-09 06:47:10 -0500 (Fri, 09 Mar 2012)
New Revision: 39405
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java
Log:
JBIDE-11175 - Additions for tomcat and others
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2012-03-09 11:31:03 UTC (rev 39404)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.ui/src/org/jboss/ide/eclipse/as/rse/ui/RSEDeploymentPreferenceUI.java 2012-03-09 11:47:10 UTC (rev 39405)
@@ -111,6 +111,11 @@
e.printStackTrace();
}
}
+
+ @Override
+ public boolean canExplore(IServer server, IModule[] module) {
+ return true;
+ }
});
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2012-03-09 11:31:03 UTC (rev 39404)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/actions/ExploreUtils.java 2012-03-09 11:47:10 UTC (rev 39405)
@@ -19,6 +19,7 @@
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
@@ -102,7 +103,17 @@
if (server != null && deployableServer != null) {
return deployableServer.getDeployFolder();
}
- return server.getAttribute(IDeployableServer.DEPLOY_DIRECTORY, "").trim(); //$NON-NLS-1$
+ String ret = server.getAttribute(IDeployableServer.DEPLOY_DIRECTORY,(String) null); //$NON-NLS-1$
+ if( ret != null )
+ return ret.trim();
+
+ // Other runtimes like tomcat / default behavior (?)
+ IRuntime rt = server.getRuntime();
+ if( rt != null ) {
+ return rt.getLocation().toString();
+ }
+
+ return null; // No idea
}
public static boolean canExplore(IServer server) {
@@ -117,10 +128,13 @@
}
public static boolean canExplore(IServer server, IModule[] modules) {
IDeployableServer ds = ServerConverter.getDeployableServer(server);
- IPath p = PublishUtil.getDeployRootFolder(modules, ds);
- if (p == null || !p.toFile().exists() || ExploreUtils.getExploreCommand() == null)
- return false;
- return true;
+ if( ds != null ) {
+ IPath p = PublishUtil.getDeployRootFolder(modules, ds);
+ if (p == null || !p.toFile().exists() || ExploreUtils.getExploreCommand() == null)
+ return false;
+ return true;
+ }
+ return false;
}
public static void explore(String name) {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java 2012-03-09 11:31:03 UTC (rev 39404)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/tools/as/wst/server/ui/xpl/ExploreActionProvider.java 2012-03-09 11:47:10 UTC (rev 39405)
@@ -36,11 +36,18 @@
import org.jboss.ide.eclipse.as.ui.actions.ExploreUtils;
public class ExploreActionProvider extends CommonActionProvider {
public static interface IExploreBehavior {
+ public boolean canExplore(IServer server, IModule[] module);
public void openExplorer(IServer server, IModule[] module);
}
public static HashMap<String, IExploreBehavior> exploreBehaviorMap = new HashMap<String, IExploreBehavior>();
static {
exploreBehaviorMap.put(LocalPublishMethod.LOCAL_PUBLISH_METHOD, new IExploreBehavior() {
+ @Override
+ public boolean canExplore(IServer server, IModule[] module) {
+ if( module != null )
+ return ExploreUtils.canExplore(server, module);
+ return ExploreUtils.canExplore(server);
+ }
public void openExplorer(IServer server, IModule[] module) {
if( module != null )
runExploreModuleServer(server, module);
@@ -119,13 +126,13 @@
public void fillContextMenu(IMenuManager menu) {
String mode = getServer().getAttribute(IDeployableServer.SERVER_MODE, LocalPublishMethod.LOCAL_PUBLISH_METHOD);
IExploreBehavior beh = exploreBehaviorMap.get(mode);
- if( beh != null ) {
- if( getModuleServer() != null )
- menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, exploreAction);
- else if( getServer() != null )
- menu.insertBefore(ServerActionProvider.SERVER_ETC_SECTION_END_SEPARATOR, exploreAction);
- exploreAction.setEnabled(true);
- }
+ if( beh == null || !beh.canExplore(getServer(), getModuleServer() == null ? null : getModuleServer().module))
+ return;
+ if( getModuleServer() != null )
+ menu.insertBefore(ServerActionProvider.CONTROL_MODULE_SECTION_END_SEPARATOR, exploreAction);
+ else if( getServer() != null )
+ menu.insertBefore(ServerActionProvider.SERVER_ETC_SECTION_END_SEPARATOR, exploreAction);
+ exploreAction.setEnabled(true);
}
public IServer getServer() {
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r39404 - trunk/documentation/whatsnew/openshift.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-09 06:31:03 -0500 (Fri, 09 Mar 2012)
New Revision: 39404
Added:
trunk/documentation/whatsnew/openshift/openshift-console.png
Log:
[JBIDE-11031] wrinting N&N for OpenShift
Added: trunk/documentation/whatsnew/openshift/openshift-console.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/openshift-console.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r39403 - in trunk/documentation/whatsnew/openshift: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-09 06:14:56 -0500 (Fri, 09 Mar 2012)
New Revision: 39403
Added:
trunk/documentation/whatsnew/openshift/images/wizard-git.png
trunk/documentation/whatsnew/openshift/images/wizard-import.png
trunk/documentation/whatsnew/openshift/images/wizard-new-application.png
trunk/documentation/whatsnew/openshift/images/wizard-project.png
trunk/documentation/whatsnew/openshift/images/wizard-select-existing.png
Modified:
trunk/documentation/whatsnew/openshift/images/openshift-console.png
trunk/documentation/whatsnew/openshift/openshift-news-3.3.0.Beta1.html
Log:
[JBIDE-11031] wrinting N&N for OpenShift
Modified: trunk/documentation/whatsnew/openshift/images/openshift-console.png
===================================================================
(Binary files differ)
Added: trunk/documentation/whatsnew/openshift/images/wizard-git.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/wizard-git.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/openshift/images/wizard-import.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/wizard-import.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/openshift/images/wizard-new-application.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/wizard-new-application.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/openshift/images/wizard-project.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/wizard-project.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/openshift/images/wizard-select-existing.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/openshift/images/wizard-select-existing.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/openshift/openshift-news-3.3.0.Beta1.html
===================================================================
--- trunk/documentation/whatsnew/openshift/openshift-news-3.3.0.Beta1.html 2012-03-09 11:09:44 UTC (rev 39402)
+++ trunk/documentation/whatsnew/openshift/openshift-news-3.3.0.Beta1.html 2012-03-09 11:14:56 UTC (rev 39403)
@@ -6,7 +6,7 @@
<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>OpenShift Tools 2.3.0.Beta1 What's New</title>
+<title>OpenShift Tools 3.3.0.Beta1 What's New</title>
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push([ '_setAccount', 'UA-17645367-5' ]);
@@ -25,7 +25,7 @@
</script>
</head>
<body>
- <h1>OpenShift 2.3.0.Beta1 What's New</h1>
+ <h1>OpenShift 3.3.0.Beta1 What's New</h1>
<p align="right">
<a href="../index.html">< Main Index</a> <a
@@ -36,6 +36,24 @@
<tr>
<td colspan="2">
<hr />
+ <h3>General</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left">
+ <a name="itemname3" id="itemname3"></a>
+ <b>Complete overhaul</b>
+ </td>
+ <td valign="top">
+ Beta1 brought big changes to the <b>OpenShift Tools</b> in JBoss Tools. We tackled three times the amount of tickets we did in M5 (a total of 160).
+ We introduced the new <b>OpenShift Express console</b>, we split the single <b>wizard</b> into several ones with concise aims and
+ we brought a new <b>OpenShift Server adapter</b> with its own runtime. The new adapter may publish source and binary artifacts to the PaaS.
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
<h3>OpenShift Express Console</h3>
<hr />
</td>
@@ -46,15 +64,11 @@
<b>OpenShift Express Console</b>
</td>
<td valign="top">
- We reworked the whole UI for OpenShift in JBoss Tools 3.3.0 Beta1. What was a single wizard in M5 is now split up
- into different parts with concise aims. The central entry point is now what we call the <b>OpenShift Express console</b>.
- <p>
+ The central entry point is now what we call the <b>OpenShift Express console</b>.
+ It lists your accounts and applications. Actions in the context menu allow you manage your user accounts, domains, applications, embedded cartridges etc.<p>
<img src="images/openshift-console.png" alt="OpenShift Express Console" />
</p>
- The OpenShift Express console will list your accounts and
- applications. It allows you to manage your resources on the Red Hat
- PaaS. Actions in the context menu allow you to create new users,
- manage domains, applications, etc. <br />
+ <br />
<p>
<small>
<a href="https://issues.jboss.org/browse/JBIDE-10528">Related Jira</a>
@@ -62,6 +76,7 @@
</p>
</td>
</tr>
+ <tr><td colspan="2"><hr/></td></tr>
<tr>
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
<b>Properties</b>
@@ -77,12 +92,13 @@
</p>
</td>
</tr>
+ <tr><td colspan="2"><hr/></td></tr>
<tr>
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
<b>User passwords</b>
</td>
<td valign="top">
- We now allow you to store your OpenShift user password in the secure storage.
+ We now allow you to store your OpenShift user password in the <b>secure storage</b>.
You wont have to retype it over and over again.
<p>
<img src="images/secure-storage.png"/>
@@ -94,17 +110,14 @@
</p>
</td>
</tr>
+ <tr><td colspan="2"><hr/></td></tr>
<tr>
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
<b>Embedded cartridges</b>
</td>
<td valign="top">
- You may now add embed or remove cartridges from an existing application by choosing the appropriate
- entry in the context menu. We now offer a separate wizard for that sake.
+ You may now add or remove embedded cartridges for your applications. Beta1 offers it's own wizard for that sake.
<p>
- <img src="images/menu-edit-embedded-cartridges.png"/>
- </p>
- <p>
<img src="images/edit-embedded-cartridges.png"/>
</p>
</td>
@@ -112,6 +125,52 @@
<tr>
<td colspan="2">
<hr />
+ <h3>Creation and Import Wizards</h3>
+ <hr />
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
+ <b>Create Application</b></td>
+ <td valign="top">
+ You may now create a new <b>OpenShift application</b> and import it to your workspace in a single hop.
+ Choose name, type, embedded cartridges and get over to the settings for your local project.
+ <p>
+ <img src="images/wizard-new-application.png"/>
+ </p>
+ The next page allows you to choose to import the application to a <b>new project</b>
+ or to enable OpenShift for an existing project in your workspace.
+ <br /><p>
+ <img src="images/wizard-project.png" />
+ </p>
+ On last wizard page, you're able to pick custom settings when dealing with the OpenShift <b>git application repository</b>.
+ The default settings are usually just fine and you can leave them alone.
+ <p>
+ <img src="images/wizard-git.png" />
+ </p>
+ A further option allows you to create the <b>OpenShift Express Server</b> adapter for easy publishing.
+ <br /><br />As soon as you finish the wizard, the whole process is executed: the tolling will create the application, import it to your workspace
+ and create the server adapter for you.
+ </td>
+ </tr>
+ <tr><td colspan="2"><hr/></td></tr>
+ <tr>
+ <td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
+ <b>Import Application</b></td>
+ <td valign="top">
+ When importing, the application creation wizard will preselect the application you've chosen in the express console.
+ <p>
+ <img src="images/wizard-import.png" />
+ </p>
+ You may of course also make up your mind and choose another OpenShift application. A separate dialog allows you to pick among the applications you're currently running on your your Paas.
+ <p>
+ <img src="images/wizard-select-existing.png" />
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <hr />
<h3>OpenShift Server</h3>
<hr />
</td>
@@ -120,21 +179,28 @@
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
<b>OpenShift Server Runtime</b></td>
<td valign="top">
- You may now create the server adapter for an <b>OpenShift
- Express Application</b> by choosing <b>Create a Server Adapter</b> in the
- context menu of the <b>OpenShift Express Console</b>
+ In M5 the <b>server adapter</b> was only created when importing an OpenShift application.
+ Beta1 improves this a lot and allows you to exclusively create the server adapter.
+ Choose <b>Create a Server Adapter</b> in the
+ context menu of the <b>OpenShift Express Console</b> and here you go, you get a fresh adapter for your
+ existing OpenShift applciation.
<p>
<img src="images/console-create-a-server-adapter.png" alt="create server adapter" />
</p>
- You may now also create the server adapter like any other Eclipse WTP server adapter by invoking the <b>new server wizard</b>
+ We always tried to stick to the Eclipse standards and therefore now also allow you to create the adapter like
+ any other Eclipse WTP server adapter. Choose the Eclipse <b>new server wizard</b> and pick the
+ <b>OpenShift Express Server</b>.
<p>
<img src="images/server-adapter-wizard.png" />
</p>
+ The second wizard page configures all OpenShift specific settings: Your credentials, the OpenShift applicaton
+ and your workspace project.
<p>
<img src="images/server-adapter-wizard-2.png" />
</p>
- The new OpenShift Server Adapter is not bound to JBoss AS7 any longer, it has it's own runtime.
- The adapter may therefore now also publish to non-java applications.
+ The new OpenShift Server Adapter is not bound to JBoss AS7 any more, it has it's own runtime.
+ You may therefore use it to publish to <b>any OpenShift application</b>. The prior limitation that restricted
+ you to publish to jbossas-7 applications only, is gone.
<p>
<small>
<a href="https://issues.jboss.org/browse/JBIDE-10716">Related Jira</a>
@@ -142,16 +208,17 @@
</p>
</td>
</tr>
+ <tr><td colspan="2"><hr/></td></tr>
<tr>
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
<b>OpenShift Server Editor</b></td>
<td valign="top">
- The OpenShift <b>Server Editor</b> now reports
+ The <b>Server Editor</b> now reports all relevant informations that are involved when publishing the
+ workspace project to the OpenShift PaaS.
+ You'll find the project, the OpenShift application, the host, user name, git branch and deployments directory.
<p>
<img src="images/server-editor.png" />
</p>
- The <b>Server Editor</b> now reports all relevant details of the <b>workspace project</b> it will publish to the <b>OpenShift PaaS</b>.
- You'll find the project, the OpenShift application, the host, user name, git branch and deployments directory.
<p>
<small>
<a href="https://issues.jboss.org/browse/JBIDE-10716">Related Jira</a>
@@ -159,6 +226,7 @@
</p>
</td>
</tr>
+ <tr><td colspan="2"><hr/></td></tr>
<tr>
<td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
<b>Source & Binary Deployment</b></td>
@@ -171,23 +239,10 @@
you always could with Eclipse WTP server adapters.
The adapter will build wars for these projects,
copy them to the <b>deployments</b> folder of your project (the project the adapter is bound to)
- and push them to the OpenShift application. JBoss AS7.1, will then pick those wars and deploy them.
+ and push them to the OpenShift application. The JBoss AS7.1 will then pick those wars and deploy them.
This is what we call the <b>binary</b> mode where binary artifacts are published to OpenShift.
</td>
</tr>
- <tr>
- <td colspan="2">
- <hr />
- <h3>Import wizards</h3>
- <hr />
- </td>
- </tr>
- <tr>
- <td valign="top" align="left"><a name="itemname3" id="itemname3"></a>
- <b>Existing projects</b></td>
- <td valign="top">
-
- </td>
</table>
</body>
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r39402 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core: jbosscore/org/jboss/ide/eclipse/as/core/server and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-09 06:09:44 -0500 (Fri, 09 Mar 2012)
New Revision: 39402
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListener.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListenerManager.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties
trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.71.default.ports.properties
Log:
JBIDE-11058 - updates for cache-clearing
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-03-09 10:06:57 UTC (rev 39401)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-03-09 11:09:44 UTC (rev 39402)
@@ -28,11 +28,14 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
+import org.eclipse.wst.server.core.ServerCore;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.Messages;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathFileResult.XPathResultNode;
import org.jboss.ide.eclipse.as.core.server.UnitedServerListener;
+import org.jboss.ide.eclipse.as.core.server.UnitedServerListenerManager;
import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper;
import org.jboss.ide.eclipse.as.core.util.IConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
@@ -398,4 +401,46 @@
}
return l.toArray(new XPathResultNode[l.size()]);
}
+
+
+
+
+ public boolean canHandleServer(IServer server) {
+ if (!UnitedServerListenerManager.isJBossServer(server))
+ return false;
+ return true;
+ }
+ public boolean canHandleRuntime(IRuntime runtime) {
+ return findAllServersForRuntime(runtime).length > 0;
+ }
+
+ public void serverChanged(IServer server) {
+ clearCache(server);
+ }
+ public void runtimeChanged(IRuntime runtime) {
+ IServer[] relevent = findAllServersForRuntime(runtime);
+ for( int i = 0; i < relevent.length; i++ )
+ clearCache(relevent[i]);
+ }
+
+ protected IServer[] findAllServersForRuntime(IRuntime rt) {
+ if( rt == null )
+ return new IServer[] {};
+ ArrayList<IServer> ret = new ArrayList<IServer>();
+ IServer[] all = ServerCore.getServers();
+ for( int i = 0; i < all.length; i++ ) {
+ if( rt.equals(all[i].getRuntime())) {
+ ret.add(all[i]);
+ }
+ }
+ return (IServer[]) ret.toArray(new IServer[ret.size()]);
+ }
+
+ public void clearCache(IServer server) {
+ XPathCategory[] cats = getCategories(server);
+ for( int i = 0; i < cats.length; i++ ) {
+ cats[i].clearCache();
+ }
+ }
+
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2012-03-09 10:06:57 UTC (rev 39401)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathQuery.java 2012-03-09 11:09:44 UTC (rev 39402)
@@ -153,7 +153,10 @@
public void clearCache() {
results = null;
+ filter = null;
setEffectiveBaseDir();
+ setEffectiveFilePattern();
+ refresh();
}
public boolean resultsLoaded() {
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListener.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListener.java 2012-03-09 10:06:57 UTC (rev 39401)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListener.java 2012-03-09 11:09:44 UTC (rev 39402)
@@ -11,6 +11,7 @@
package org.jboss.ide.eclipse.as.core.server;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.ServerEvent;
@@ -36,4 +37,13 @@
return false;
return true;
}
+ public boolean canHandleRuntime(IRuntime server) {
+ return false;
+ }
+ public void runtimeAdded(IRuntime runtime) {
+ }
+ public void runtimeChanged(IRuntime runtime) {
+ }
+ public void runtimeRemoved(IRuntime runtime) {
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListenerManager.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListenerManager.java 2012-03-09 10:06:57 UTC (rev 39401)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/UnitedServerListenerManager.java 2012-03-09 11:09:44 UTC (rev 39402)
@@ -17,6 +17,7 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IPublishListener;
import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IRuntimeLifecycleListener;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerLifecycleListener;
import org.eclipse.wst.server.core.IServerListener;
@@ -34,7 +35,7 @@
*
*/
public class UnitedServerListenerManager implements
- IServerLifecycleListener, IServerListener, IPublishListener {
+ IServerLifecycleListener, IServerListener, IPublishListener, IRuntimeLifecycleListener {
protected static UnitedServerListenerManager instance;
public static UnitedServerListenerManager getDefault() {
if( instance == null )
@@ -46,6 +47,7 @@
protected UnitedServerListenerManager() {
list = new ArrayList<UnitedServerListener>();
ServerCore.addServerLifecycleListener(this);
+ ServerCore.addRuntimeLifecycleListener(this);
IServer[] allServers = ServerCore.getServers();
for( int i = 0; i < allServers.length; i++ ) {
allServers[i].addServerListener(this);
@@ -144,4 +146,26 @@
listeners[i].publishFinished(server, status);
}
}
+
+ public void runtimeAdded(IRuntime runtime) {
+ UnitedServerListener[] listeners = getListeners();
+ for( int i = 0; i < listeners.length; i++) {
+ if( listeners[i].canHandleRuntime(runtime))
+ listeners[i].runtimeAdded(runtime);
+ }
+ }
+ public void runtimeChanged(IRuntime runtime) {
+ UnitedServerListener[] listeners = getListeners();
+ for( int i = 0; i < listeners.length; i++) {
+ if( listeners[i].canHandleRuntime(runtime))
+ listeners[i].runtimeChanged(runtime);
+ }
+ }
+ public void runtimeRemoved(IRuntime runtime) {
+ UnitedServerListener[] listeners = getListeners();
+ for( int i = 0; i < listeners.length; i++) {
+ if( listeners[i].canHandleRuntime(runtime))
+ listeners[i].runtimeRemoved(runtime);
+ }
+ }
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties 2012-03-09 10:06:57 UTC (rev 39401)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.70.default.ports.properties 2012-03-09 11:09:44 UTC (rev 39402)
@@ -1,5 +1,5 @@
JBoss_Web=//*[@name="standard-sockets"]/*[@name="http"]
-JBoss_Web_FILE=standalone/configuration/standalone.xml
+JBoss_Web_FILE=standalone/configuration/${jboss_config_file}
JBoss_Web_ATTRIBUTE=port
JBoss_Management=//*[local-name()="management-interfaces"]/*[local-name()="native-interface"]
JBoss_Management_ATTRIBUTE=port
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.71.default.ports.properties
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.71.default.ports.properties 2012-03-09 10:06:57 UTC (rev 39401)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/properties/jboss.71.default.ports.properties 2012-03-09 11:09:44 UTC (rev 39402)
@@ -1,5 +1,5 @@
JBoss_Web=//*[@name="standard-sockets"]/*[@name="http"]
-JBoss_Web_FILE=standalone/configuration/standalone.xml
+JBoss_Web_FILE=standalone/configuration/${jboss_config_file}
JBoss_Web_ATTRIBUTE=port
JBoss_Management=//*[local-name()="socket-binding-group"]/*[local-name()="socket-binding"][@name="management-native"]
JBoss_Management_ATTRIBUTE=port
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r39401 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-03-09 05:06:57 -0500 (Fri, 09 Mar 2012)
New Revision: 39401
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IExtendedPropertiesProvider.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/ServerExtendedProperties.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java
Removed:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ShowInWelcomePageActionProvider.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java
Log:
JBIDE-11231 unifying the welcome page url actions (to trunk only)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-03-09 08:54:01 UTC (rev 39400)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/ExtendedServerPropertiesAdapterFactory.java 2012-03-09 10:06:57 UTC (rev 39401)
@@ -10,12 +10,15 @@
******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal;
+import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossAS710ExtendedProperties;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossAS7ExtendedProperties;
import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties;
+import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
public class ExtendedServerPropertiesAdapterFactory implements IAdapterFactory, IJBossToolingConstants {
@@ -26,7 +29,7 @@
@Override
public Object getAdapter(Object adaptableObject, Class adapterType) {
- if( adapterType != JBossExtendedProperties.class )
+ if( adapterType != ServerExtendedProperties.class )
return null;
String typeId = null;
IServer s = null;
@@ -38,39 +41,49 @@
typeId = ((IRuntime)adaptableObject).getRuntimeType().getId();
r = (IRuntime)adaptableObject;
}
+ IAdaptable adaptable = s == null ? r : s;
if( typeId != null ) {
if( SERVER_AS_32.equals(typeId) || AS_32.equals(typeId))
- return new JBossExtendedProperties(s == null ? r : s);
+ return new JBossExtendedProperties(adaptable);
if( SERVER_AS_40.equals(typeId) || AS_40.equals(typeId))
- return new JBossExtendedProperties(s == null ? r : s);
+ return new JBossExtendedProperties(adaptable);
if( SERVER_AS_42.equals(typeId) || AS_42.equals(typeId))
- return new JBossExtendedProperties(s == null ? r : s);
+ return new JBossExtendedProperties(adaptable);
if( SERVER_AS_50.equals(typeId) || AS_50.equals(typeId))
- return new JBossExtendedProperties(s == null ? r : s);
+ return new JBossExtendedProperties(adaptable);
if( SERVER_AS_51.equals(typeId) || AS_51.equals(typeId))
- return new JBossExtendedProperties(s == null ? r : s);
+ return new JBossExtendedProperties(adaptable);
if( SERVER_AS_60.equals(typeId) || AS_60.equals(typeId))
- return new JBossExtendedProperties(s == null ? r : s);
+ return new JBossExtendedProperties(adaptable);
if( SERVER_EAP_43.equals(typeId) || EAP_43.equals(typeId))
- return new JBossExtendedProperties(s == null ? r : s);
+ return new JBossExtendedProperties(adaptable);
if( SERVER_EAP_50.equals(typeId) || EAP_50.equals(typeId))
- return new JBossExtendedProperties(s == null ? r : s);
+ return new JBossExtendedProperties(adaptable);
if( SERVER_AS_70.equals(typeId) || AS_70.equals(typeId))
- return new JBossAS7ExtendedProperties(s == null ? r : s);
+ return new JBossAS7ExtendedProperties(adaptable);
if( SERVER_AS_71.equals(typeId) || AS_71.equals(typeId))
- return new JBossAS710ExtendedProperties(s == null ? r : s);
+ return new JBossAS710ExtendedProperties(adaptable);
if( SERVER_EAP_60.equals(typeId) || EAP_60.equals(typeId))
- return new JBossAS710ExtendedProperties(s == null ? r : s);
+ return new JBossAS710ExtendedProperties(adaptable);
// NEW_SERVER_ADAPTER
}
+
+ // Last ditch
+ if( s != null ) {
+ IExtendedPropertiesProvider propProvider = (IExtendedPropertiesProvider)
+ s.loadAdapter(IExtendedPropertiesProvider.class, new NullProgressMonitor());
+ if( propProvider != null ) {
+ return propProvider.getExtendedProperties();
+ }
+ }
return null;
}
@Override
public Class[] getAdapterList() {
- return new Class[]{ JBossExtendedProperties.class};
+ return new Class[]{ ServerExtendedProperties.class};
}
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IExtendedPropertiesProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IExtendedPropertiesProvider.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/IExtendedPropertiesProvider.java 2012-03-09 10:06:57 UTC (rev 39401)
@@ -0,0 +1,7 @@
+package org.jboss.ide.eclipse.as.core.server.internal;
+
+import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
+
+public interface IExtendedPropertiesProvider {
+ public ServerExtendedProperties getExtendedProperties();
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java 2012-03-09 08:54:01 UTC (rev 39400)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/JBossExtendedProperties.java 2012-03-09 10:06:57 UTC (rev 39401)
@@ -1,11 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.ide.eclipse.as.core.server.internal.extendedproperties;
+import java.text.MessageFormat;
+
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.resolvers.ConfigNameResolver;
import org.jboss.ide.eclipse.as.core.server.bean.ServerBeanLoader;
+import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
+import org.jboss.ide.eclipse.as.core.util.ServerUtil;
/**
* The superclass containing most functionality, to be overridden as necessary.
@@ -13,22 +26,19 @@
* else, but need to be customized on a per-server or per-server-type basis
*
*/
-public class JBossExtendedProperties {
- private IServer server;
- private IRuntime runtime;
+public class JBossExtendedProperties extends ServerExtendedProperties {
public JBossExtendedProperties(IAdaptable adaptable) {
- if( adaptable instanceof IServer) {
- this.server = (IServer)adaptable;
- this.runtime = server.getRuntime();
- } else if( adaptable instanceof IRuntime){
- this.runtime = (IRuntime)adaptable;
- }
+ super(adaptable);
}
- public String getNewFilesetDefaultRootFolder() {
- return "servers/${jboss_config}"; //$NON-NLS-1$
+ public boolean runtimeSupportsBindingToAllInterfaces() {
+ return true;
}
+ protected ServerBeanLoader getServerBeanLoader() {
+ return new ServerBeanLoader(runtime.getLocation().toFile());
+ }
+
/**
* Returns the full path of a local server's server/{config}/deploy folder
*/
@@ -38,21 +48,26 @@
return new ConfigNameResolver().performSubstitutions(
original, server.getName());
}
-
-
- public static final int JMX_DEFAULT_PROVIDER = 0;
- public static final int JMX_AS_3_TO_6_PROVIDER = 1;
- public static final int JMX_AS_710_PROVIDER = 2;
+
public int getJMXProviderType() {
return JMX_AS_3_TO_6_PROVIDER;
}
-
- public boolean runtimeSupportsBindingToAllInterfaces() {
+ public boolean hasWelcomePage() {
return true;
}
- protected ServerBeanLoader getServerBeanLoader() {
- return new ServerBeanLoader(runtime.getLocation().toFile());
+ protected static final String WELCOME_PAGE_URL_PATTERN = "http://{0}:{1}/"; //$NON-NLS-1$
+ public String getWelcomePageUrl() {
+ try {
+ JBossServer jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class);
+ String host = jbossServer.getHost();
+ int webPort = jbossServer.getJBossWebPort();
+ String consoleUrl = MessageFormat.format(WELCOME_PAGE_URL_PATTERN, host, String.valueOf(webPort));
+ return consoleUrl;
+ } catch(CoreException ce) {
+ return null;
+ }
}
+
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/ServerExtendedProperties.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/ServerExtendedProperties.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/extendedproperties/ServerExtendedProperties.java 2012-03-09 10:06:57 UTC (rev 39401)
@@ -0,0 +1,38 @@
+package org.jboss.ide.eclipse.as.core.server.internal.extendedproperties;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.wst.server.core.IRuntime;
+import org.eclipse.wst.server.core.IServer;
+
+public class ServerExtendedProperties {
+ protected IServer server;
+ protected IRuntime runtime;
+ public ServerExtendedProperties(IAdaptable adaptable) {
+ if( adaptable instanceof IServer) {
+ this.server = (IServer)adaptable;
+ this.runtime = server.getRuntime();
+ } else if( adaptable instanceof IRuntime){
+ this.runtime = (IRuntime)adaptable;
+ }
+ }
+
+ public String getNewFilesetDefaultRootFolder() {
+ return "servers/${jboss_config}"; //$NON-NLS-1$
+ }
+
+ public static final int JMX_NULL_PROVIDER = -1;
+ public static final int JMX_DEFAULT_PROVIDER = 0;
+ public static final int JMX_AS_3_TO_6_PROVIDER = 1;
+ public static final int JMX_AS_710_PROVIDER = 2;
+ public int getJMXProviderType() {
+ return JMX_NULL_PROVIDER;
+ }
+
+ public boolean hasWelcomePage() {
+ return false;
+ }
+
+ public String getWelcomePageUrl() {
+ return null;
+ }
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2012-03-09 08:54:01 UTC (rev 39400)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2012-03-09 10:06:57 UTC (rev 39401)
@@ -1196,7 +1196,7 @@
adaptableType="org.eclipse.wst.server.core.IServer"
class="org.jboss.ide.eclipse.as.core.server.internal.ExtendedServerPropertiesAdapterFactory">
<adapter
- type="org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.JBossExtendedProperties">
+ type="org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties">
</adapter>
</factory>
</extension>
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java 2012-03-09 08:54:01 UTC (rev 39400)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ShowInWelcomePageActionProvider.java 2012-03-09 10:06:57 UTC (rev 39401)
@@ -11,9 +11,11 @@
package org.jboss.ide.eclipse.as.ui.views.server.extensions;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.wst.server.core.IServer;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -28,8 +30,12 @@
protected boolean shouldAddForSelection(IStructuredSelection sel) {
IServer server = getSingleServer(sel);
- if( server != null )
- return ServerUtil.isJBossServerType(server.getServerType()) && accepts(server);
+ if( server != null ) {
+ ServerExtendedProperties props = (ServerExtendedProperties)
+ server.loadAdapter(ServerExtendedProperties.class, new NullProgressMonitor());
+ if( props != null && props.hasWelcomePage())
+ return true;
+ }
return false;
}
@@ -38,11 +44,8 @@
}
protected String getURL(IServer server) throws CoreException {
- JBossServer jbossServer = ServerUtil.checkedGetServerAdapter(server, JBossServer.class);
- String host = jbossServer.getHost();
- int webPort = jbossServer.getJBossWebPort();
- String consoleUrl = MessageFormat.format(WELCOME_PAGE_URL_PATTERN, host, String.valueOf(webPort));
- return consoleUrl;
+ ServerExtendedProperties props = (ServerExtendedProperties)
+ server.loadAdapter(ServerExtendedProperties.class, new NullProgressMonitor());
+ return props.getWelcomePageUrl();
}
-
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-03-09 08:54:01 UTC (rev 39400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-03-09 10:06:57 UTC (rev 39401)
@@ -177,31 +177,7 @@
</viewerActionBinding>
</extension>
- <extension
- point="org.eclipse.ui.navigator.navigatorContent">
- <actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.behaviour.ShowInWelcomePageActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.behaviour.ShowInWelcomePageActionProvider">
- <enablement>
- <instanceof
- value="org.eclipse.wst.server.core.IServer">
- </instanceof>
- </enablement>
- </actionProvider>
- </extension>
- <extension point="org.eclipse.ui.navigator.viewer">
- <viewerContentBinding viewerId="org.eclipse.wst.server.ui.ServersView">
- </viewerContentBinding>
- <viewerActionBinding viewerId="org.eclipse.wst.server.ui.ServersView">
- <includes>
- <actionExtension
- pattern="org.jboss.tools.openshift.express.internal.ui.behaviour.ShowInWelcomePageActionProvider"/>
- </includes>
- </viewerActionBinding>
- </extension>
-
<!-- Extensions to Server View to provide 'tail' of the remote server.log file -->
-
<extension point="org.eclipse.ui.navigator.navigatorContent">
<actionProvider
class="org.jboss.tools.openshift.express.internal.ui.console.TailServerLogActionProvider"
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-03-09 08:54:01 UTC (rev 39400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-03-09 10:06:57 UTC (rev 39401)
@@ -22,11 +22,13 @@
import org.eclipse.wst.server.core.model.IURLProvider;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServer;
+import org.jboss.ide.eclipse.as.core.server.internal.IExtendedPropertiesProvider;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
+import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
-public class ExpressServer extends DeployableServer implements IURLProvider {
+public class ExpressServer extends DeployableServer implements IURLProvider, IExtendedPropertiesProvider {
public void setDefaults(IProgressMonitor monitor) {
getServerWorkingCopy().setName(ServerUtil.getDefaultServerName(getServer().getServerType().getName()));
setAttribute(IDeployableServer.SERVER_MODE, ExpressBehaviourDelegate.OPENSHIFT_ID);
@@ -54,7 +56,6 @@
IProgressMonitor monitor) throws CoreException {
}
- @Override
public URL getModuleRootURL(IModule module) {
String appProjString = ExpressServerUtils.getExpressDeployProject(getServer());
IProject appProj = appProjString == null ? null : ResourcesPlugin.getWorkspace().getRoot().getProject(appProjString);
@@ -62,4 +63,8 @@
boolean shouldIgnore = ExpressServerUtils.getIgnoresContextRoot(getServer()) && p.equals(appProj);
return JBossServer.getModuleRootURL(module, getServer().getHost(), 80, shouldIgnore);
}
+
+ public ServerExtendedProperties getExtendedProperties() {
+ return new ExpressServerExtendedProperties(getServer());
+ }
}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java 2012-03-09 10:06:57 UTC (rev 39401)
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Red Hat Inc..
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat Incorporated - initial API and implementation
+ *******************************************************************************/
+package org.jboss.tools.openshift.express.internal.core.behaviour;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.osgi.util.NLS;
+import org.jboss.ide.eclipse.as.core.server.internal.extendedproperties.ServerExtendedProperties;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+
+import com.openshift.express.client.IApplication;
+import com.openshift.express.client.OpenShiftException;
+
+public class ExpressServerExtendedProperties extends ServerExtendedProperties {
+
+ public ExpressServerExtendedProperties(IAdaptable adaptable) {
+ super(adaptable);
+ }
+ public boolean hasWelcomePage() {
+ return true;
+ }
+
+ public String getWelcomePageUrl() {
+ if (!ExpressServerUtils.isOpenShiftRuntime(server)) {
+ return null;
+ }
+ IApplication application = ExpressServerUtils.findApplicationForServer(server);
+ if (application != null) {
+ try {
+ return application.getApplicationUrl();
+ } catch (OpenShiftException e) {
+ IStatus status = OpenShiftUIActivator.createErrorStatus(
+ NLS.bind("Could not get application url for server {0}", server.getName()), e);
+ OpenShiftUIActivator.log(status);
+ }
+ }
+ return null;
+ }
+}
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ShowInWelcomePageActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ShowInWelcomePageActionProvider.java 2012-03-09 08:54:01 UTC (rev 39400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ShowInWelcomePageActionProvider.java 2012-03-09 10:06:57 UTC (rev 39401)
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * 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.tools.openshift.express.internal.ui.behaviour;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.server.core.IServer;
-import org.jboss.ide.eclipse.as.ui.Messages;
-import org.jboss.ide.eclipse.as.ui.views.server.extensions.AbstractOpenBrowserServerAction;
-import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
-import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
-
-import com.openshift.express.client.IApplication;
-import com.openshift.express.client.OpenShiftException;
-
-/**
- * Action that shows the welcome page for a given openshift application. This is
- * actually a copy of org.jboss.ide.eclipse.as.ui.views.server.extensions.
- * ShowInWelcomePageActionProvider, should be consolidated at some point.
- *
- * @author Andre Dietisheim
- */
-public class ShowInWelcomePageActionProvider extends AbstractOpenBrowserServerAction {
-
- protected String getActionText() {
- return Messages.ShowInWelcomePage_Action_Text;
- }
-
- protected boolean shouldAddForSelection(IStructuredSelection sel) {
- IServer server = getSingleServer(sel);
- boolean shouldAddForSelection = false;
- /**
- * TODO: move this logic to the server, allow this action to ask the
- * server if it supports welcome page: ex. #hasWelcomePage
- */
- if (server != null) {
- shouldAddForSelection =
- ExpressServerUtils.isOpenShiftRuntime(server)
- && accepts(server);
- }
- return shouldAddForSelection;
- }
-
- protected boolean accepts(IServer server) {
- return server.getServerState() == IServer.STATE_STARTED;
- }
-
- /**
- * TODO: move this logic to the server, allow this action to ask the
- * server for welcome page: ex. #getWelcomePage
- */
- protected String getURL(IServer server) throws CoreException {
- if (!ExpressServerUtils.isOpenShiftRuntime(server)) {
- return null;
- }
- IApplication application = ExpressServerUtils.findApplicationForServer(server);
- if (application == null) {
- return null;
- }
- try {
- return application.getApplicationUrl();
- } catch (OpenShiftException e) {
- IStatus status = OpenShiftUIActivator.createErrorStatus(
- NLS.bind("Could not get application url for server {0}", server.getName()), e);
- throw new CoreException(status);
- }
- }
-}
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r39400 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/core/behaviour and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-03-09 03:54:01 -0500 (Fri, 09 Mar 2012)
New Revision: 39400
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IUserModelListener.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java
Log:
[JBIDE-11230] replaced all occurrencies of IUser by UserDelegate in the openshift UI
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-03-09 08:54:01 UTC (rev 39400)
@@ -398,7 +398,7 @@
<enablement>
<and>
<instanceof
- value="com.openshift.express.client.IUser">
+ value=" org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
</instanceof>
</and>
</enablement>
@@ -409,7 +409,7 @@
<enablement>
<and>
<instanceof
- value="com.openshift.express.client.IUser">
+ value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
</instanceof>
</and>
</enablement>
@@ -420,7 +420,7 @@
<enablement>
<and>
<instanceof
- value="com.openshift.express.client.IUser">
+ value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
</instanceof>
</and>
</enablement>
@@ -497,7 +497,7 @@
<enablement>
<or>
<instanceof
- value="com.openshift.express.client.IUser">
+ value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
</instanceof>
<instanceof
value="com.openshift.express.client.IApplication">
@@ -539,7 +539,7 @@
<extension
point="org.eclipse.core.runtime.adapters">
<factory
- adaptableType="com.openshift.express.client.IUser"
+ adaptableType="org.jboss.tools.openshift.express.internal.core.console.UserDelegate"
class="org.jboss.tools.openshift.express.internal.ui.viewer.property.PropertySourceAdapterFactory">
<adapter
type="org.eclipse.ui.views.properties.IPropertySource">
@@ -596,7 +596,7 @@
id="org.jboss.tools.openshift.express.ui.userPropertySection"
tab="org.jboss.tools.openshift.express.ui.viewer.expressConsolePropertyTab">
<input
- type="com.openshift.express.client.IUser">
+ type="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
</input>
</propertySection>
</propertySections>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -35,6 +35,7 @@
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
import org.jboss.ide.eclipse.as.core.util.ServerCreationUtils;
import org.jboss.tools.openshift.egit.core.EGitUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.jboss.tools.openshift.express.internal.ui.wizard.IOpenShiftExpressWizardModel;
@@ -171,7 +172,7 @@
}
public static void fillServerWithOpenShiftDetails(IServerWorkingCopy wc, IApplication application,
- IUser user, String mode, String deployProject,
+ UserDelegate user, String mode, String deployProject,
String projectRelativeFolder, String remoteName) throws OpenShiftException {
fillServerWithOpenShiftDetails(wc,
application == null ? null : application.getApplicationUrl(),
@@ -340,7 +341,7 @@
public static IApplication findApplicationForServer(IServer server) {
try {
String user = ExpressServerUtils.getExpressUsername(server);
- IUser user2 = UserModel.getDefault().findUser(user);
+ UserDelegate user2 = UserModel.getDefault().findUser(user);
String appName = ExpressServerUtils.getExpressApplicationName(server);
IApplication app = user2.getApplicationByName(appName);
return app;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IUserModelListener.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IUserModelListener.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/IUserModelListener.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -10,10 +10,9 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.core.console;
-import com.openshift.express.client.IUser;
public interface IUserModelListener {
- public void userAdded(IUser user);
- public void userRemoved(IUser user);
- public void userChanged(IUser user);
+ public void userAdded(UserDelegate user);
+ public void userRemoved(UserDelegate user);
+ public void userChanged(UserDelegate user);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserDelegate.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -30,7 +30,7 @@
import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
-public class UserDelegate implements IUser {
+public class UserDelegate {
private IUser delegate;
private boolean rememberPassword;
private boolean connected;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -82,14 +82,14 @@
fireModelChange(user, ADDED);
}
- public void removeUser(IUser user) {
+ public void removeUser(UserDelegate user) {
allUsers.remove(user.getRhlogin());
if (this.recentUser == user)
this.recentUser = null;
fireModelChange(user, REMOVED);
}
- private void fireModelChange(IUser user, int type) {
+ private void fireModelChange(UserDelegate user, int type) {
Iterator<IUserModelListener> i = listeners.iterator();
while (i.hasNext()) {
IUserModelListener l = i.next();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -14,6 +14,7 @@
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -37,9 +38,9 @@
public void run() {
final ITreeSelection treeSelection = (ITreeSelection) selection;
if (selection instanceof ITreeSelection
- && treeSelection.getFirstElement() instanceof IUser) {
+ && treeSelection.getFirstElement() instanceof UserDelegate) {
IWizard domainDialog = null;
- final IUser user = (IUser) treeSelection.getFirstElement();
+ final UserDelegate user = (UserDelegate) treeSelection.getFirstElement();
try {
if (user.getDomain() == null || user.getDomain().getNamespace() == null) {
domainDialog = new NewDomainDialog(user);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -12,9 +12,11 @@
import java.util.List;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Display;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
@@ -26,6 +28,7 @@
import org.eclipse.wst.server.ui.internal.wizard.fragment.TasksWizardFragment;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
@@ -52,8 +55,10 @@
&& treeSelection.getFirstElement() instanceof IApplication) {
final IApplication application = (IApplication) treeSelection.getFirstElement();
IUser user = application.getUser();
+ Assert.isNotNull(user, NLS.bind("application {0} does not reference any user", application.getName()));
+ UserDelegate userDelegate = UserModel.getDefault().findUser(user.getRhlogin());
NewServerWizard w = new NewServerWizard(ExpressServerUtils.OPENSHIFT_SERVER_TYPE);
- w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, UserModel.getDefault().findUser(user.getRhlogin()));
+ w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, userDelegate);
w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP, application);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), w);
dialog.open();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -11,11 +11,10 @@
package org.jboss.tools.openshift.express.internal.ui.action;
import org.eclipse.jface.viewers.ITreeSelection;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
-import com.openshift.express.client.IUser;
-
/**
* @author Xavier Coulon
*/
@@ -24,15 +23,15 @@
public DeleteConnectionAction() {
super(OpenShiftExpressUIMessages.DELETE_CONNECTION_ACTION);
}
-
+
@Override
public void run() {
- final ITreeSelection treeSelection = (ITreeSelection)selection;
- if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IUser) {
- final IUser user = (IUser) treeSelection.getFirstElement();
+ if (selection instanceof ITreeSelection
+ && ((ITreeSelection) selection).getFirstElement() instanceof UserDelegate) {
+ final ITreeSelection treeSelection = (ITreeSelection) selection;
+ final UserDelegate user = (UserDelegate) treeSelection.getFirstElement();
UserModel.getDefault().removeUser(user);
}
}
-
}
\ No newline at end of file
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -14,13 +14,13 @@
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.wizard.EmbedCartridgeWizard;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
/**
* @author Xavier Coulon
@@ -37,7 +37,7 @@
final ITreeSelection treeSelection = (ITreeSelection)selection;
if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) {
final IApplication application = (IApplication) treeSelection.getFirstElement();
- final IUser user = UserModel.getDefault().getRecentUser();
+ final UserDelegate user = UserModel.getDefault().getRecentUser();
EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(application, user);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
dialog.create();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -15,11 +15,10 @@
import org.eclipse.ui.navigator.CommonNavigator;
import org.eclipse.ui.navigator.CommonViewer;
import org.jboss.tools.openshift.express.internal.core.console.IUserModelListener;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.utils.DisposeUtils;
-import com.openshift.express.client.IUser;
-
public class ExpressConsoleView extends CommonNavigator implements IUserModelListener {
protected Object getInitialInput() {
return UserModel.getDefault();
@@ -46,15 +45,15 @@
});
}
- public void userAdded(IUser user) {
+ public void userAdded(UserDelegate user) {
refreshViewer();
}
- public void userRemoved(IUser user) {
+ public void userRemoved(UserDelegate user) {
refreshViewer();
}
- public void userChanged(IUser user) {
+ public void userChanged(UserDelegate user) {
refreshViewer();
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -28,11 +28,10 @@
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.core.console.UserModel;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
-import com.openshift.express.client.IUser;
-
/**
* @author Xavier Coulon
*
@@ -90,7 +89,7 @@
int returnCode = WizardUtils.openWizardDialog(connectToOpenShiftWizard, shell);
if (returnCode == Window.OK) {
Logger.debug("OpenShift Auth succeeded.");
- final IUser user = UserModel.getDefault().getRecentUser();
+ final UserDelegate user = UserModel.getDefault().getRecentUser();
getCommonViewer().setInput(new OpenShiftExpressConsoleContentCategory(user));
switchToCommonViewer();
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -10,23 +10,23 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.viewer;
-import com.openshift.express.client.IUser;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
/**
* @author Xavier Coulon
*/
public class OpenShiftExpressConsoleContentCategory {
- private final IUser user;
+ private final UserDelegate user;
- public OpenShiftExpressConsoleContentCategory(final IUser user) {
+ public OpenShiftExpressConsoleContentCategory(final UserDelegate user) {
this.user = user;
}
/**
* @return the user
*/
- public IUser getUser() {
+ public UserDelegate getUser() {
return user;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -60,9 +60,9 @@
}
// Keep track of what's loading and what's finished
- private ArrayList<IUser> loadedUsers = new ArrayList<IUser>();
- private ArrayList<IUser> loadingUsers = new ArrayList<IUser>();
- private HashMap<IUser, OpenShiftException> errors = new HashMap<IUser, OpenShiftException>();
+ private ArrayList<UserDelegate> loadedUsers = new ArrayList<UserDelegate>();
+ private ArrayList<UserDelegate> loadingUsers = new ArrayList<UserDelegate>();
+ private HashMap<UserDelegate, OpenShiftException> errors = new HashMap<UserDelegate, OpenShiftException>();
@Override
public Object[] getElements(final Object parentElement) {
@@ -74,7 +74,7 @@
return UserModel.getDefault().getUsers();
}
if (parentElement instanceof UserModel) {
- IUser[] users = ((UserModel) parentElement).getUsers();
+ UserDelegate[] users = ((UserModel) parentElement).getUsers();
return users;
}
return new Object[0];
@@ -90,12 +90,12 @@
if (!loadedUsers.contains(parentElement)) {
if (!loadingUsers.contains(parentElement)) {
// Load the data
- launchLoadingUserJob((IUser) parentElement);
+ launchLoadingUserJob((UserDelegate) parentElement);
}
// return a stub object that says loading...
return new Object[] { new LoadingStub() };
}
- OpenShiftException ose = errors.get((IUser)parentElement);
+ OpenShiftException ose = errors.get((UserDelegate)parentElement);
if( ose != null ) {
return new Object[]{ose};
}
@@ -125,16 +125,14 @@
Object[] children = new Object[0];
// try {
if (parentElement instanceof OpenShiftExpressConsoleContentCategory) {
- IUser user = ((OpenShiftExpressConsoleContentCategory) parentElement).getUser();
+ UserDelegate user = ((OpenShiftExpressConsoleContentCategory) parentElement).getUser();
children = new Object[] { user };
- }
- if (parentElement instanceof UserDelegate) {
+ } else if (parentElement instanceof UserDelegate) {
final UserDelegate user = (UserDelegate) parentElement;
if (user.hasDomain()) {
children = user.getApplications().toArray();
}
- }
- if (parentElement instanceof IApplication) {
+ } else if (parentElement instanceof IApplication) {
children = ((IApplication) parentElement).getEmbeddedCartridges().toArray();
}
@@ -147,7 +145,7 @@
return children;
}
- private void launchLoadingUserJob(final IUser user) {
+ private void launchLoadingUserJob(final UserDelegate user) {
Job job = new Job("Loading OpenShift Express User information...") {
@Override
@@ -188,7 +186,7 @@
@Override
public boolean hasChildren(Object element) {
- if (element instanceof IUser) {
+ if (element instanceof UserDelegate) {
return true;
}
if (element instanceof IApplication) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -17,6 +17,7 @@
import org.eclipse.swt.graphics.Image;
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentProvider.LoadingStub;
@@ -24,7 +25,6 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.IEmbeddableCartridge;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -58,7 +58,7 @@
@Override
public Image getImage(Object element) {
- if (element instanceof IUser) {
+ if (element instanceof UserDelegate) {
return OpenShiftUIActivator.getDefault().createImage("repository-middle.gif");
}
if (element instanceof IApplication) {
@@ -83,8 +83,8 @@
@Override
public StyledString getStyledText(Object element) {
- if (element instanceof IUser) {
- String message = ((IUser) element).getRhlogin();
+ if (element instanceof UserDelegate) {
+ String message = ((UserDelegate) element).getRhlogin();
StyledString styledString = new StyledString(message);
styledString.setStyle(0, message.length(), StyledString.DECORATIONS_STYLER);
return new StyledString(message);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -80,6 +80,7 @@
import org.jboss.tools.common.ui.WizardUtils;
import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport;
import org.jboss.tools.common.ui.databinding.ValueBindingBuilder;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
@@ -90,7 +91,6 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.ICartridge;
import com.openshift.express.client.IEmbeddableCartridge;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.NotFoundOpenShiftException;
import com.openshift.express.client.OpenShiftException;
@@ -655,7 +655,7 @@
return;
}
try {
- final IUser user = this.pageModel.getUser();
+ final UserDelegate user = this.pageModel.getUser();
if (user != null && !user.hasDomain()) {
IWizard domainDialog = new NewDomainDialog(user);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), domainDialog);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -18,13 +18,13 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import com.openshift.express.client.IApplication;
import com.openshift.express.client.ICartridge;
import com.openshift.express.client.IEmbeddableCartridge;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -67,12 +67,12 @@
return wizardModel;
}
- public IUser getUser() {
+ public UserDelegate getUser() {
return wizardModel.getUser();
}
public List<IApplication> getApplications() throws OpenShiftException {
- IUser user = getUser();
+ UserDelegate user = getUser();
if (user == null || !user.hasDomain()) {
return Collections.emptyList();
}
@@ -129,7 +129,7 @@
}
public void loadExistingApplications() throws OpenShiftException {
- IUser user = getUser();
+ UserDelegate user = getUser();
if (user != null) {
setExistingApplications(user.getApplications());
setExistingApplicationsLoaded(true);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -14,10 +14,10 @@
import java.util.List;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -48,7 +48,7 @@
public List<IApplication> getApplications() {
try {
- IUser user = getUser();
+ UserDelegate user = getUser();
if (user == null) {
return Collections.emptyList();
}
@@ -68,7 +68,7 @@
this.selectedApplication = application);
}
- public IUser getUser() {
+ public UserDelegate getUser() {
// return OpenShiftUIActivator.getDefault().getUser();
return wizardModel.getUser();
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationWizardModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -13,11 +13,11 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import com.openshift.express.client.IApplication;
import com.openshift.express.client.ICartridge;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftApplicationNotAvailableException;
import com.openshift.express.client.OpenShiftException;
@@ -34,21 +34,21 @@
*/
private static final int APP_CREATION_TIMEOUT = 10;
- private IUser user;
+ private UserDelegate user;
private IApplication application;
private String name;
private ICartridge cartridge;
- public ApplicationWizardModel(IUser user) {
+ public ApplicationWizardModel(UserDelegate user) {
this(null, user);
}
- public ApplicationWizardModel(IApplication application, IUser user) {
+ public ApplicationWizardModel(IApplication application, UserDelegate user) {
this.application = application;
this.user = user;
}
- public IUser getUser() {
+ public UserDelegate getUser() {
return user;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -24,7 +24,6 @@
import org.jboss.tools.openshift.express.internal.ui.utils.SecurePasswordStoreException;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.NotFoundOpenShiftException;
import com.openshift.express.client.configuration.OpenShiftConfiguration;
@@ -81,7 +80,7 @@
protected String initRhLogin() {
String rhLogin = null;
- IUser user = wizardModel.getUser();
+ UserDelegate user = wizardModel.getUser();
if (user == null) {
user = UserModel.getDefault().getRecentUser();
}
@@ -113,7 +112,7 @@
return password;
}
- private void storePassword(IUser user) {
+ private void storePassword(UserDelegate user) {
try {
if (store != null ) {
OpenShiftPasswordStorageKey key = new OpenShiftPasswordStorageKey(libraServer, user.getRhlogin());
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainDialog.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -17,9 +17,9 @@
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftEndpointException;
/**
@@ -30,7 +30,7 @@
private EditDomainWizardPageModel model;
- public EditDomainDialog(IUser user) {
+ public EditDomainDialog(UserDelegate user) {
this.model = new EditDomainWizardPageModel(user);
setNeedsProgressMonitor(true);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EditDomainWizardPageModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -11,9 +11,9 @@
package org.jboss.tools.openshift.express.internal.ui.wizard;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -26,9 +26,9 @@
private String namespace;
- private final IUser user;
+ private final UserDelegate user;
- public EditDomainWizardPageModel(IUser user) {
+ public EditDomainWizardPageModel(UserDelegate user) {
this.user = user;
try {
if (user.getDomain() != null) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/EmbedCartridgeWizard.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -11,9 +11,9 @@
package org.jboss.tools.openshift.express.internal.ui.wizard;
import org.eclipse.jface.wizard.Wizard;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
/**
* @author André Dietisheim
@@ -23,7 +23,7 @@
private ApplicationWizardModel wizardModel;
private EmbedCartridgeWizardPage embedCartridgeWizardPage;
- public EmbedCartridgeWizard(IApplication application, IUser user) {
+ public EmbedCartridgeWizard(IApplication application, UserDelegate user) {
this.wizardModel = new ApplicationWizardModel(application, user);
setNeedsProgressMonitor(true);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewApplicationWizard.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -11,9 +11,9 @@
package org.jboss.tools.openshift.express.internal.ui.wizard;
import org.eclipse.jface.wizard.Wizard;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
/**
* @author André Dietisheim
@@ -24,7 +24,7 @@
private NewApplicationWizardPage applicationPage;
private EmbedCartridgeWizardPage embedCartridgePage;
- public NewApplicationWizard(IUser user) {
+ public NewApplicationWizard(UserDelegate user) {
this.wizardModel = new ApplicationWizardModel(user);
setNeedsProgressMonitor(true);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainDialog.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -17,9 +17,9 @@
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.osgi.util.NLS;
import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftEndpointException;
/**
@@ -29,7 +29,7 @@
private NewDomainWizardPageModel model;
- public NewDomainDialog(IUser user) {
+ public NewDomainDialog(UserDelegate user) {
this.model = new NewDomainWizardPageModel(user);
setNeedsProgressMonitor(true);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPageModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -18,11 +18,11 @@
import org.eclipse.jsch.internal.core.IConstants;
import org.eclipse.jsch.internal.core.JSchCorePlugin;
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils;
import com.openshift.express.client.IDomain;
import com.openshift.express.client.ISSHPublicKey;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
import com.openshift.express.client.SSHKeyPair;
import com.openshift.express.client.SSHPublicKey;
@@ -41,9 +41,9 @@
private String namespace;
private IDomain domain;
private String sshKey;
- private IUser user;
+ private UserDelegate user;
- public NewDomainWizardPageModel(IUser user) {
+ public NewDomainWizardPageModel(UserDelegate user) {
this.user = user;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -32,7 +32,6 @@
import com.openshift.express.client.IApplication;
import com.openshift.express.client.ICartridge;
import com.openshift.express.client.IEmbeddableCartridge;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftApplicationNotAvailableException;
import com.openshift.express.client.OpenShiftException;
@@ -349,7 +348,7 @@
protected IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor)
throws OpenShiftApplicationNotAvailableException, OpenShiftException {
- IUser user = getUser();
+ UserDelegate user = getUser();
if (user == null) {
throw new OpenShiftException("Could not create application, have no valid user credentials");
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -31,13 +31,13 @@
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.RegExUtils;
import org.jboss.tools.openshift.egit.core.EGitUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIException;
import org.jboss.tools.openshift.express.internal.ui.UnCommittedChangesException;
import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.ResourceUtils;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -49,7 +49,7 @@
public class ConfigureGitSharedProject extends AbstractImportApplicationOperation {
public ConfigureGitSharedProject(String projectName, IApplication application, String remoteName,
- IUser user) {
+ UserDelegate user) {
super(projectName, application, remoteName);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -25,11 +25,11 @@
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.tools.openshift.egit.core.EGitUtils;
import org.jboss.tools.openshift.egit.core.GitIgnore;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.ResourceUtils;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -41,7 +41,7 @@
public class ConfigureUnsharedProject extends AbstractImportApplicationOperation {
public ConfigureUnsharedProject(String projectName, IApplication application, String remoteName,
- IUser user) {
+ UserDelegate user) {
super(projectName, application, remoteName);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-03-09 03:22:05 UTC (rev 39399)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ServerAdapterFactory.java 2012-03-09 08:54:01 UTC (rev 39400)
@@ -33,11 +33,11 @@
import org.eclipse.wst.server.core.ServerUtil;
import org.eclipse.wst.server.core.internal.Server;
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
+import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.wizard.IOpenShiftExpressWizardModel;
import com.openshift.express.client.IApplication;
-import com.openshift.express.client.IUser;
import com.openshift.express.client.OpenShiftException;
/**
@@ -55,7 +55,7 @@
}
public void create(IProject project, IServerType serverType, IRuntime runtime, String mode,
- IApplication application, IUser user, IProgressMonitor monitor) throws OpenShiftException {
+ IApplication application, UserDelegate user, IProgressMonitor monitor) throws OpenShiftException {
createServerAdapter(project, serverType, runtime, mode, application, user, null, monitor);
}
@@ -67,7 +67,7 @@
* @throws OpenShiftException
*/
protected void createServerAdapter(IProject project, IServerType serverType, IRuntime runtime, String mode,
- IApplication application, IUser user,
+ IApplication application, UserDelegate user,
String remoteName, IProgressMonitor monitor) throws OpenShiftException {
String name = project.getName();
monitor.subTask(NLS.bind("Creating server adapter for project {0}", name));
@@ -76,7 +76,7 @@
}
protected void createServerAdapter(List<IProject> importedProjects, IServerType serverType,
- IRuntime runtime, String mode, IApplication application, IUser user,
+ IRuntime runtime, String mode, IApplication application, UserDelegate user,
String deployProject, String remoteName, IProgressMonitor monitor) {
try {
renameWebContextRoot(importedProjects);
@@ -98,7 +98,7 @@
}
private IServer doCreateServerAdapter(IServerType serverType, IRuntime rt, String mode,
- IApplication application, IUser user, String deployProject, String remoteName) throws CoreException,
+ IApplication application, UserDelegate user, String deployProject, String remoteName) throws CoreException,
OpenShiftException {
Assert.isLegal(serverType != null);
Assert.isLegal(mode != null);
14 years, 1 month
- 1
- 0
JBoss Tools SVN: r39399 - trunk/documentation/guides/GettingStartedGuide/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2012-03-08 22:22:05 -0500 (Thu, 08 Mar 2012)
New Revision: 39399
Added:
trunk/documentation/guides/GettingStartedGuide/en-US/uninstalling.xml
Log:
adding in uninstall chapter
Added: trunk/documentation/guides/GettingStartedGuide/en-US/uninstalling.xml
===================================================================
--- trunk/documentation/guides/GettingStartedGuide/en-US/uninstalling.xml (rev 0)
+++ trunk/documentation/guides/GettingStartedGuide/en-US/uninstalling.xml 2012-03-09 03:22:05 UTC (rev 39399)
@@ -0,0 +1,11 @@
+<chapter id="Uninstalling">
+ <title>Uninstalling the JBoss Developer Studio</title>
+ <itemizedlist>
+ <listitem>
+ <para>Ensure <property>JBoss Developer Studio</property> is not running</para>
+ </listitem>
+ <listitem>
+ <para>Run the Uninstaller</para>
+ </listitem>
+ </itemizedlist>
+</chapter>
\ No newline at end of file
14 years, 1 month
- 1
- 0