JBoss Tools SVN: r44410 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: ldimaggio
Date: 2012-10-10 07:57:27 -0400 (Wed, 10 Oct 2012)
New Revision: 44410
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java
Log:
Forcing an update to ExampleTest.java - changed text in logging only
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-10-10 11:00:36 UTC (rev 44409)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/ExampleTest.java 2012-10-10 11:57:27 UTC (rev 44410)
@@ -130,7 +130,7 @@
/* ldimaggi - debugging failures of SOA examples on Jenkins/Mac */
SWTBotShell shell = null;
- log.info("Downloading the example");
+ log.info("Downloading the example...");
try {
shell = bot.shell("Downloading...");
}
@@ -140,7 +140,7 @@
}
/* ldimaggi - debugging failures of SOA examples on Jenkins/Mac */
- log.info("Activate the downloading shell");
+ log.info("Activate the downloading shell...");
try {
shell.activate();
}
@@ -150,7 +150,7 @@
}
/* ldimaggi - debugging failures of SOA examples on Jenkins/Mac */
- log.info("waiting until shell closes");
+ log.info("waiting until shell closes...");
try {
bot.waitUntil(shellCloses(shell),Timing.time(projSize*20*1000));;
}
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r44409 - in branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooling: 3.3.0.Nightly and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-10-10 07:00:36 -0400 (Wed, 10 Oct 2012)
New Revision: 44409
Added:
branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
Modified:
branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
Log:
Reinstated the 3.3.x composite site
Modified: branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
===================================================================
--- branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c... 2012-10-10 10:58:19 UTC (rev 44408)
+++ branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c... 2012-10-10 11:00:36 UTC (rev 44409)
@@ -13,14 +13,14 @@
<!-- SOA Tooling : 10 x 1 = 10 -->
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--bpel/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--droolsjbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--esb/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--flow/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--jbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--modeshape/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--runtime-soa/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--teiid-designer/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--bpel/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--droolsjbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--esb/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--flow/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--jbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--modeshape/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--runtime-soa/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--teiid-designer/all/repo/'/>
<child location='http://download.jboss.org/savara/releases/updates/2.0.x/' />
<child location='../../../../staging/SwitchYard-Tools/eclipse/'/>
Modified: branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
===================================================================
--- branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c... 2012-10-10 10:58:19 UTC (rev 44408)
+++ branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c... 2012-10-10 11:00:36 UTC (rev 44409)
@@ -13,14 +13,14 @@
<!-- SOA Tooling : 10 x 1 = 10 -->
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--bpel/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--droolsjbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--esb/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--flow/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--jbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--modeshape/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--runtime-soa/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.x_Nightly.component--teiid-designer/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--bpel/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--droolsjbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--esb/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--flow/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--jbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--modeshape/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--runtime-soa/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.0_Nightly.component--teiid-designer/all/repo/'/>
<child location='http://download.jboss.org/savara/releases/updates/2.0.x/' />
<child location='../../../../staging/SwitchYard-Tools/eclipse/'/>
Added: branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
===================================================================
--- branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c... (rev 0)
+++ branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c... 2012-10-10 11:00:36 UTC (rev 44409)
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeArtifactRepository version='1.0.0'?>
+<repository name='JBoss Tools - SOA Tooling - Staging Repository' type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1331922270000'/>
+</properties>
+<children size='10'>
+
+<!-- SOA Tooling : 10 x 1 = 10 -->
+
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--bpel/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--droolsjbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--esb/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--flow/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--jbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--modeshape/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--runtime-soa/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--teiid-designer/all/repo/'/>
+<child location='http://download.jboss.org/savara/releases/updates/2.0.x/' />
+<child location='../../../../staging/SwitchYard-Tools/eclipse/'/>
+
+</children>
+</repository>
Added: branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
===================================================================
--- branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c... (rev 0)
+++ branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c... 2012-10-10 11:00:36 UTC (rev 44409)
@@ -0,0 +1,28 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<?compositeMetadataRepository version='1.0.0'?>
+<repository name='JBoss Tools - SOA Tooling - Staging Repository' type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
+<properties size='2'>
+<property name='p2.compressed' value='true'/>
+<!--
+ get new time w/
+ date +%s000
+-->
+<property name='p2.timestamp' value='1331922270000'/>
+</properties>
+<children size='10'>
+
+<!-- SOA Tooling : 10 x 1 = 10 -->
+
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--bpel/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--droolsjbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--esb/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--flow/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--jbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--modeshape/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--runtime-soa/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--teiid-designer/all/repo/'/>
+<child location='http://download.jboss.org/savara/releases/updates/2.0.x/' />
+<child location='../../../../staging/SwitchYard-Tools/eclipse/'/>
+
+</children>
+</repository>
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r44408 - trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-10-10 06:58:19 -0400 (Wed, 10 Oct 2012)
New Revision: 44408
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java
Log:
Refactor deleting of project items within tearDown() method.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java 2012-10-10 10:55:22 UTC (rev 44407)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2AttributeRenameTest.java 2012-10-10 10:58:19 UTC (rev 44408)
@@ -6,7 +6,6 @@
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotStyledText;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ui.bot.test.WidgetVariables;
public class JSF2AttributeRenameTest extends JSF2AbstractRefactorTest {
@@ -74,18 +73,8 @@
@Override
public void tearDown() throws Exception {
- SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
- .bot();
- SWTBotTree tree = innerBot.tree();
- tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
- bot.button("OK").click(); //$NON-NLS-1$
- delay();
- tree.expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
- bot.shell(IDELabel.Shell.CONFIRM_DELETE).activate();
- bot.button("OK").click(); //$NON-NLS-1$
- delay();
+ eclipse.deleteFile(JBT_TEST_PROJECT_NAME,"WebContent",JSF2_Test_Page_Name + ".xhtml");
+ eclipse.deleteFile(JBT_TEST_PROJECT_NAME,"WebContent","resources","mycomp","echo.xhtml");
super.tearDown();
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java 2012-10-10 10:55:22 UTC (rev 44407)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2MoveParticipantTest.java 2012-10-10 10:58:19 UTC (rev 44408)
@@ -69,20 +69,8 @@
@Override
public void tearDown() throws Exception {
- SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
- .bot();
- SWTBotTree tree = innerBot.tree();
- delay();
- tree
- .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
- bot.button("OK").click(); //$NON-NLS-1$
- delay();
- tree
- .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp1").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
- bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
- bot.button("OK").click(); //$NON-NLS-1$
- delay();
+ eclipse.deleteFile(JBT_TEST_PROJECT_NAME,"WebContent",JSF2_Test_Page_Name + ".xhtml");
+ eclipse.deleteFile(JBT_TEST_PROJECT_NAME,"WebContent","resources","mycomp1");
super.tearDown();
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java 2012-10-10 10:55:22 UTC (rev 44407)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/src/org/jboss/tools/jsf/ui/bot/test/jsf2/refactor/JSF2RenameParticipantTest.java 2012-10-10 10:58:19 UTC (rev 44408)
@@ -45,19 +45,8 @@
@Override
public void tearDown() throws Exception {
- SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER)
- .bot();
- SWTBotTree tree = innerBot.tree();
- tree
- .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode(JSF2_Test_Page_Name + ".xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
- bot.button("OK").click(); //$NON-NLS-1$
- delay();
- tree
- .expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent").expandNode("resources").expandNode("mycomp").expandNode("echo1.xhtml").select(); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
- bot.menu("Edit").menu("Delete").click(); //$NON-NLS-1$ //$NON-NLS-2$
- bot.button("OK").click(); //$NON-NLS-1$
- delay();
+ eclipse.deleteFile(JBT_TEST_PROJECT_NAME, "WebContent",JSF2_Test_Page_Name + ".xhtml");
+ eclipse.deleteFile(JBT_TEST_PROJECT_NAME,"WebContent","resources","mycomp","echo1.xhtml");
super.tearDown();
}
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r44407 - trunk/download.jboss.org/jbosstools/examples.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-10-10 06:55:22 -0400 (Wed, 10 Oct 2012)
New Revision: 44407
Added:
trunk/download.jboss.org/jbosstools/examples/project-examples-community-4...
trunk/download.jboss.org/jbosstools/examples/project-examples-maven-4.0.B...
trunk/download.jboss.org/jbosstools/examples/project-examples-shared-4.0....
Log:
JBIDE-12554 Clean up project examples sites from current JBT/JBDS wizard
Added: trunk/download.jboss.org/jbosstools/examples/project-examples-community-4...
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-community-4... (rev 0)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-community-4... 2012-10-10 10:55:22 UTC (rev 44407)
@@ -0,0 +1,1075 @@
+<projects>
+ <project>
+ <category>Seam</category>
+ <name>registration</name>
+ <included-projects>
+ registration,registration-ejb,registration-ear,registration-test
+ </included-projects>
+ <shortDescription>Seam Registration Example - EAR (including a test project)</shortDescription>
+ <description>This is a trivial example for the Seam tutorial. It requires JBoss Enterprise Application Platform 4.3/JBoss Application Server 4.2.x, Seam 2.0 and TestNG plugin.
+It includes the registration,registration-ejb,registration-ear,registration-test projects.
+</description>
+ <size>31657984</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">registration,registration-ejb,registration-ear</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3 or JBoss Application Server 4.2.x</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property>
+ <property name="eclipse-projects">registration</property>
+ <property name="description">This project example requires Seam 2.0</property>
+ </fix>
+
+ <fix type="plugin">
+ <property name="id">org.testng.eclipse</property>
+ <property name="versions">5.8.0, 5.9.0</property>
+ <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>Seam</category>
+ <name>registration2</name>
+ <included-projects>
+ registration,registration-ejb,registration-ear
+ </included-projects>
+ <shortDescription>Seam Registration Example - EAR</shortDescription>
+ <description>This is a trivial example for the Seam tutorial. It requires JBoss Enterprise Application Platform 4.3/JBoss Application Server 4.2.x and Seam 2.0.
+The example creates the registration,registration-ejb,registration-ear projects.
+It includes a tutorial.
+</description>
+ <size>8450048</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <welcome type="cheatsheets" url="/registration/cheatsheets/registration.xml"/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">registration,registration-ejb,registration-ear</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3 or JBoss Application Server 4.2.x</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.423</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property>
+ <property name="eclipse-projects">registration</property>
+ <property name="description">This project example requires Seam 2.0</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.seam.202</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>Seam</category>
+ <name>messages</name>
+ <included-projects>
+ messages,messages-ejb,messages-ear
+ </included-projects>
+ <shortDescription>Seam Messages Example - EAR</shortDescription>
+ <description>This is a simple example of the use of @DataModel for the Seam tutorial. It requires JBoss Enterprise Application Platform 4.3/JBoss Application Server 4.2.x and Seam 2.0.
+The example creates the messages,messages-ejb and messages-ear projects.
+It includes a tutorial.
+</description>
+ <size>7680000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <welcome type="cheatsheets" url="/messages/cheatsheets/messages.xml"/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">messages,messages-ejb,messages-ear</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3 or JBoss Application Server 4.2.x</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.423</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property>
+ <property name="eclipse-projects">messages</property>
+ <property name="description">This project example requires Seam 2.0</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.seam.202</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>Seam</category>
+ <name>todo</name>
+ <included-projects>
+ todo,todo-ejb,todo-ear
+ </included-projects>
+ <shortDescription>Seam and jBPM: the todo list example - EAR</shortDescription>
+ <description>This is a simple example for the Seam tutorial, demonstrating the
+use of jBPM-based business process management. It requires JBoss Enterprise Application Platform 4.3/JBoss Application Server 4.2.x and Seam 2.0.
+The example creates the todo,todo-ejb and todo-ear projects.
+It includes a tutorial.
+</description>
+ <size>2183168</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <welcome type="cheatsheets" url="/todo/cheatsheets/todo.xml"/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">todo,todo-ejb,todo-ear</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3 or JBoss Application Server 4.2.x</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.423</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property>
+ <property name="eclipse-projects">todo</property>
+ <property name="description">This project example requires Seam 2.0</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.seam.202</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>Seam</category>
+ <name>numberguess</name>
+ <included-projects>
+ numberguess,numberguess-ejb,numberguess-ear
+ </included-projects>
+ <shortDescription>Seam pageflow: the numberguess example - EAR</shortDescription>
+ <description>This is a simple example for the Seam tutorial, demonstrating the use of
+jBPM-based page flow. It requires JBoss Enterprise Application Platform 4.3/JBoss Application Server 4.2.x and Seam 2.0.
+The example creates the numberguess,numberguess-ejb and numberguess-ear projects.
+It includes a tutorial.
+</description>
+ <size>2203648</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <welcome type="cheatsheets" url="/numberguess/cheatsheets/numberguess.xml"/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">numberguess,numberguess-ejb,numberguess-ear</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3 or JBoss Application Server 4.2.x</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.423</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property>
+ <property name="eclipse-projects">numberguess</property>
+ <property name="description">This project example requires Seam 2.0</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.seam.202</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>Seam</category>
+ <name>booking3-mavenized</name>
+ <included-projects>
+ booking,booking-ear,booking-ejb,booking-parent,booking-test
+ </included-projects>
+ <shortDescription>Seam Booking Example - EAR mavenized - Seam 2.1.1.GA</shortDescription>
+ <description>This example demonstrates the use of Seam in a Java EE 5 environment.
+Transaction and persistence context management is handled by the EJB container.
+It includes the booking, booking-ear, booking-ejb, booking-test and booking-parent projects.
+Requires JBoss Enterprise Application Platform 4.3/JBoss Application Server 4.2.x, Seam 2.1, m2eclipse and testng plugins.
+</description>
+ <size>196608</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">booking,booking-ejb,booking-ear</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3 or JBoss Application Server 4.2.x</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.1.0, 2.1.1, 2.1.2</property>
+ <property name="eclipse-projects">booking</property>
+ <property name="description">This project example requires Seam 2.1</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse</property>
+ <property name="versions">0.9.9, 0.12.9</property>
+ <property name="description">This project example requires m2eclipse <= 0.12.x. You can install it using the following update sites: http://m2eclipse.sonatype.org/sites/m2e and http://m2eclipse.sonatype.org/sites/m2e-extras</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">0.9.9, 0.12.9</property>
+ <property name="description">This project example requires m2eclipse-wtp <= 0.12.x. You can install it using the following update site: http://m2eclipse.sonatype.org/sites/m2e-extras</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.testng.eclipse</property>
+ <property name="versions">5.8.0, 5.9.0</property>
+ <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property>
+ </fix>
+
+ </fixes>
+ </project>
+
+ <project>
+ <category>Seam</category>
+ <name>booking3</name>
+ <included-projects>
+ booking,booking-ear,booking-ejb,booking-test
+ </included-projects>
+ <shortDescription>Seam Booking Example - EAR (including a tutorial)</shortDescription>
+ <description>This example demonstrates the use of Seam in a Java EE 5 environment.
+Transaction and persistence context management is handled by the EJB container.
+The example requires JBoss Enterprise Application Platform 4.3/JBoss Application Server 4.2.x, Seam 2.0 and TestNG plugin.
+It includes the booking, booking-ear,booking-test and booking-ejb projects.
+</description>
+ <size>36036608</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <welcome type="cheatsheets" url="/booking/cheatsheets/booking.xml"/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">booking,booking-ear,booking-ejb</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3 or JBoss Application Server 4.2.x</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property>
+ <property name="eclipse-projects">booking</property>
+ <property name="description">This project example requires Seam 2.0</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.testng.eclipse</property>
+ <property name="versions">5.8.0, 5.9.0</property>
+ <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>Seam</category>
+
+ <name>booking2</name>
+ <included-projects>
+ booking,booking-ear,booking-ejb,booking-parent,booking-test
+ </included-projects>
+ <shortDescription>Seam Booking Example - EAR mavenized</shortDescription>
+ <description>This example demonstrates the use of Seam in a Java EE 5 environment.
+Transaction and persistence context management is handled by the EJB container.
+It includes the booking, booking-ear, booking-ejb,booking-test and booking-parent projects.
+Requires JBoss Enterprise Application Platform 4.3/JBoss Application Server 4.2.x, Seam 2.0, m2eclipse and testng plugins.
+</description>
+ <size>203639</size>
+
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">booking,booking-ejb,booking-ear</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3 or JBoss Application Server 4.2.x</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property>
+ <property name="eclipse-projects">booking</property>
+ <property name="description">This project example requires Seam 2.0</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse</property>
+ <property name="versions">0.9.9, 0.12.9</property>
+ <property name="description">This project example requires m2eclipse <= 0.12.x. You can install it using the following update sites: http://m2eclipse.sonatype.org/sites/m2e and http://m2eclipse.sonatype.org/sites/m2e-extras</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">0.9.9, 0.12.9</property>
+ <property name="description">This project example requires m2eclipse-wtp <= 0.12.x. You can install it using the following update site: http://m2eclipse.sonatype.org/sites/m2e-extras</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.testng.eclipse</property>
+ <property name="versions">5.8.0, 5.9.0</property>
+ <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property>
+ </fix>
+
+ </fixes>
+ </project>
+
+ <project>
+ <category>Seam</category>
+ <name>booking22</name>
+ <included-projects>
+ booking22,booking22-ear,booking22-ejb,booking22-test
+ </included-projects>
+ <shortDescription>Seam 2.2 Booking Example - EAR (including a tutorial)</shortDescription>
+ <description>This example demonstrates the use of Seam in a Java EE 5 environment.
+Transaction and persistence context management is handled by the EJB container.
+This example has been tested on JBoss Enterprise Application Platform 5.0.
+It includes the booking22, booking22-ear,booking22-test and booking22-ejb projects.
+</description>
+ <size>38203392</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <welcome type="cheatsheets" url="/booking22/cheatsheets/booking.xml"/>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">booking22,booking22-ejb,booking22-ear</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 5.0</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.eap.50</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.2.0</property>
+ <property name="eclipse-projects">booking22</property>
+ <property name="description">This project example requires Seam 2.2</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.eap.50</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.testng.eclipse</property>
+ <property name="versions">5.8.0</property>
+ <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property>
+ <property name="connectorIds">org.testng.eclipse</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>Seam</category>
+ <name>photoalbum-mavenized</name>
+ <included-projects>
+ photoalbum-mavenized,photoalbum-mavenized-ear,photoalbum-mavenized-ejb,photoalbum-mavenized-parent
+ </included-projects>
+ <shortDescription>PhotoAlbum - EAR mavenized (RichFaces 3.3.1.GA, Seam 2.2.0.GA)</shortDescription>
+ <description>This example demonstrates the use of RichFaces components. It includes the photoalbum-mavenized,photoalbum-mavenized-ear,photoalbum-mavenized-ejb and photoalbum-mavenized-parent projects.
+The example requires Seam 2.2,JBoss Enterprise Application Platform 4.3/5.0 or JBoss Application Server 4.2.x/5.x and m2eclipse.
+ </description>
+ <size>16441344</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.51, org.jboss.ide.eclipse.as.runtime.50, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">photoalbum-mavenized,photoalbum-mavenized-ear,photoalbum-mavenized-ejb</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3/5.0 or JBoss Application Server 4.2.x/5.x</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.2.0</property>
+ <property name="eclipse-projects">photoalbum-mavenized</property>
+ <property name="description">This project example requires Seam 2.2</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse</property>
+ <property name="versions">0.9.9, 0.12.9</property>
+ <property name="description">This project example requires m2eclipse <= 0.12.x. You can install it using the following update sites: http://m2eclipse.sonatype.org/sites/m2e and http://m2eclipse.sonatype.org/sites/m2e-extras</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">0.9.9, 0.12.9</property>
+ <property name="description">This project example requires m2eclipse-wtp <= 0.12.x. You can install it using the following update site: http://m2eclipse.sonatype.org/sites/m2e-extras</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>Seam</category>
+ <name>photoalbum</name>
+ <included-projects>
+ photoalbum,photoalbum-ear,photoalbum-ejb
+ </included-projects>
+ <shortDescription>PhotoAlbum - EAR (RichFaces 3.3.1.GA, Seam 2.2.0.GA)</shortDescription>
+ <description>This example demonstrates the use of RichFaces components. It includes the photoalbum,photoalbum-ear and photoalbum-ejb projects.
+The example requires Seam 2.2 and JBoss Enterprise Application Platform 4.3/5.0 or JBoss Application Server 4.2.x/5.x.
+ </description>
+ <size>25833472</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.51, org.jboss.ide.eclipse.as.runtime.50, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">photoalbum,photoalbum-ear,photoalbum-ejb</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3/5.0 or JBoss Application Server 4.2.x/5.x</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.2.0</property>
+ <property name="eclipse-projects">photoalbum</property>
+ <property name="description">This project example requires Seam 2.2</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>Seam</category>
+
+ <name>dvdstore22</name>
+ <included-projects>
+ dvdstore22,dvdstore22-ear,dvdstore22-ejb,dvdstore22-test
+ </included-projects>
+ <shortDescription>Seam 2.2 DVD Store Example - EAR (including a test project)</shortDescription>
+ <description>This example demonstrates the use of Seam with jBPM pageflow and business process management. It includes the dvdstore22,dvdstore22-ear,dvdstore22-test and dvdstore22-ejb projects.
+ </description>
+ <size>35225600</size>
+
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/seam-examples/...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50</property>
+ <property name="eclipse-projects">dvdstore22,dvdstore22-ejb,dvdstore22-ear</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 5.0</property>
+ </fix>
+
+ <fix type="seam">
+ <property name="allowed-versions">2.2.0</property>
+ <property name="eclipse-projects">dvdstore22</property>
+ <property name="description">This project example requires Seam 2.2</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.testng.eclipse</property>
+ <property name="versions">5.8.0, 5.9.0</property>
+ <property name="description">The TestNG plugin is required if you want to run Seam tests. You can install it using the following update site: http://beust.com/eclipse</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>RESTEasy</category>
+ <name>simple</name>
+ <included-projects>
+ simple
+ </included-projects>
+
+ <shortDescription>RESTEasy Simple Example</shortDescription>
+ <description>This project is a simple example showing usage of @Path, @GET, PUT, POST, and @PathParam. It uses pure streaming output and includes the 'simple' project.
+Requires m2eclipse and JBoss Enterprise Application Platform 4.3/5.0 or JBoss Application Server 4.2.x/5.x.
+ </description>
+ <size>16939</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/resteasy-examp...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.51, org.jboss.ide.eclipse.as.runtime.50, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">simple</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 4.3/5.0 or JBoss Application Server 4.2.x/5.x</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">0.10.0</property>
+ <property name="description">This project example requires m2eclipse. You can install it using the following update sites: http://m2eclipse.sonatype.org/sites/m2e and http://m2eclipse.sonatype.org/sites/m2e-extras</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>Portlet</category>
+ <name>testjsfportlet</name>
+ <shortDescription>JBoss JSF Portlet Example</shortDescription>
+
+ <description>This example demonstrates the use of JBoss JSF Portlet. It runs on JBoss Enterprise Portal Platform 4.3 or JBoss Portal 2.7.x.</description>
+ <size>4000000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/portlet-exampl...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">testjsfportlet</property>
+ <property name="description">This project example requires the JBoss Enterprise Portal Platform 4.3 or JBoss Portal 2.7.x</property>
+ </fix>
+
+ </fixes>
+ </project>
+
+ <project>
+ <category>Portlet</category>
+
+ <name>testseamportlet</name>
+ <shortDescription>JBoss Seam Portlet Example</shortDescription>
+ <description>This example demonstrates the use of JBoss Seam Portlet. It runs on JBoss Enterprise Portal Platform 4.3/JBoss Portal 2.7.x and Seam 2.0.</description>
+ <size>10000000</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/portlet-exampl...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43, org.jboss.ide.eclipse.as.runtime.42</property>
+ <property name="eclipse-projects">testseamportlet</property>
+ <property name="description">This project example requires JBoss Enterprise Portal Platform 4.3 or JBoss Portal 2.7.x</property>
+ </fix>
+ <fix type="seam">
+ <property name="allowed-versions">2.0.0, 2.0.1, 2.0.2</property>
+ <property name="eclipse-projects">testseamportlet</property>
+ <property name="description">This project example requires Seam 2.0</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>Portlet for JBoss Enterprise Portal Platform 5.x/GateIn 3.1</category>
+ <name>JSFPortlet</name>
+ <included-projects>JSFPortlet</included-projects>
+ <shortDescription>JBoss JSF RI Portlet</shortDescription>
+
+ <description>This example demonstrates the use of JBoss JSF Portlet. It runs on JBoss Enterprise Portal Platform 5.x or on GateIn 3.1.</description>
+ <size>1372160</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/portlet-exampl...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">JSFPortlet</property>
+ <property name="required-components">portlet</property>
+ <property name="description">This project example requires the JBoss Enterprise Portal Platform 5.x or GateIn 3.1</property>
+ </fix>
+
+ </fixes>
+ </project>
+
+ <project>
+ <category>Portlet for JBoss Enterprise Portal Platform 5.x/GateIn 3.1</category>
+ <name>RichFacesPortlet</name>
+ <included-projects>RichfacesPortlet</included-projects>
+ <shortDescription>JBoss Portlet Bridge - RichFaces Application</shortDescription>
+
+ <description>This example demonstrates the use of JBoss JSF Portlet with RichFaces. It runs on JBoss Enterprise Portal Platform 5.x or on GateIn 3.1.</description>
+ <size>7098368</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/portlet-exampl...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">RichfacesPortlet</property>
+ <property name="required-components">portlet</property>
+ <property name="description">This project example requires the JBoss Enterprise Portal Platform 5.x or GateIn 3.1</property>
+ </fix>
+
+ </fixes>
+ </project>
+
+ <project>
+ <category>Portlet for JBoss Enterprise Portal Platform 5.x/GateIn 3.1</category>
+ <name>SeamPortlet</name>
+ <included-projects>seam-portlet-ear,seam-portlet-ejb,seam-portlet-web</included-projects>
+ <shortDescription>JBoss Portlet Bridge - Seam Portlet</shortDescription>
+
+ <description>This example demonstrates the use of JBoss JSF Portlet with Seam. It runs on JBoss Enterprise Portal Platform 5.x or on GateIn 3.1.</description>
+ <size>8978432</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/portlet-exampl...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">seam-portlet-ejb,seam-portlet-web,seam-portlet-ear</property>
+ <property name="required-components">portlet</property>
+ <property name="description">This project example requires the JBoss Enterprise Portal Platform 5.x or GateIn 3.1</property>
+ </fix>
+ <fix type="seam">
+ <property name="allowed-versions">2.2.0</property>
+ <property name="eclipse-projects">seam-portlet-web</property>
+ <property name="description">This project example requires Seam version 2.2.0</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 5.0</category>
+ <name>helloworld</name>
+ <included-projects> helloworld,helloworld_testclient </included-projects>
+ <shortDescription>JBoss ESB HelloWorld Example - ESB</shortDescription>
+ <description>This example is to prove that the ESB is is properly configured and happy.
+As well as to demonstrate the needed minimal files to make a basic ESB component execute.
+Example requires a JBoss Enterprise SOA Platform 5.x runtime.</description>
+ <size>1101025</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">helloworld,helloworld_testclient</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 5.0</category>
+ <name>helloworld_action</name>
+ <included-projects>helloworld_action,helloworld_action_client </included-projects>
+ <shortDescription>JBoss ESB HelloWorld Action Example - ESB</shortDescription>
+ <description>This sample is to demonstrate the use of multiple action invocations from a single configuration. You can use
+ a single Action class and make multiple method calls or use multiple Action
+ classes. Example requires a JBoss Enterprise SOA Platform 5.x runtime.</description>
+ <size>26261</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">helloworld_action,helloworld_action_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+<!-- This example works only on SOA-P 5.1 due to some jar incompatibilities with other SOA-P versions -->
+<!-- <project>
+ <category>ESB for JBoss Enterprise SOA Platform 5.0</category>
+ <name>helloworld_mail</name>
+ <included-projects>helloworld_mail,helloworld_mail_testclient</included-projects>
+ <shortDescription>JBoss ESB HelloWorld Email Example</shortDescription>
+ <description>This is a very basic example that demonstrates how to configure a mail
+gateway using a JCA mail adapter and a Camel mail endpoint. Both gateways
+route the messages through a JMS queue and finally to your action class for
+processing.
+NOTE: Before you import this example, please make sure that there is a runtime named "jboss-soa-p.5.0 Runtime" defined in the workspace.
+</description>
+ <size>1132232</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/rcernich/examples/esb...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">helloworld_mail,helloworld_mail_testclient</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires a JBoss Enterprise SOA Platform 5.0 runtime named "jboss-soa-p.5.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+-->
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 5.0</category>
+ <name>helloworld_file_action</name>
+ <included-projects>helloworld_file_action,helloworld_file_action_client</included-projects>
+ <shortDescription>JBoss ESB HelloWorld File Action Example - ESB</shortDescription>
+ <description>This is a basic example of using the File gateway feature of the JBoss ESB.
+ Files that are found in a particular directory with a particular extension
+ are sent to a JMS queue with actions for processing. Before deploy the project,
+ please change some properties according to the readme.txt file. Example requires a
+ SOA-P 5.x runtime.</description>
+ <size>16505</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">helloworld_file_action, helloworld_file_action_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 5.0</category>
+ <name>webservice_consumer1</name>
+ <included-projects>webservice_consumer1,webservice_consumer1_client</included-projects>
+ <shortDescription>JBoss ESB Web Service consumer1 Example</shortDescription>
+ <description>This example demonstrates how to consume a 181 Web Service in an ESB action.
+ This ESB will make a webservice request that requires a single "toWhom" string parameter.
+ The webservice will return a greeting response. The ESB simply dislays the response on the
+ console. Example requires a JBoss Enterprise SOA Platform 5.x runtime.</description>
+ <size>1120499</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">webservice_consumer1,webservice_consumer1_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 5.0</category>
+ <name>webservice_producer</name>
+ <included-projects>webservice_producer,webservice_producer_client</included-projects>
+ <shortDescription>JBoss ESB Web Service producer Example</shortDescription>
+ <description>This sample demonstrates how to deploy a JSR181 Webservice endpoint on
+ JBossESB using the SOAPProcessor action. Example requires a JBoss Enterprise SOA Platform 5.x runtime.</description>
+ <size>55269</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">webservice_producer, webservice_producer_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 5.0</category>
+ <name>transform_CSV2XML</name>
+ <included-projects>transform_CSV2XML,transform_CSV2XML_client</included-projects>
+ <shortDescription>JBoss ESB Smooks CSV->XML Example</shortDescription>
+ <description>This sample demonstrates how to transform a comma separated value (CSV) file to an xml.
+ The tranformation is done by configuring Smooks and performing two transformation, one
+ transformation from CSV to an intermediate xml format, and a second transformation from
+ the intermediate xml format to the target xml. Example requires a JBoss Enterprise SOA Platform 5.x runtime.</description>
+ <size>19434</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">transform_CSV2XML,transform_CSV2XML_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 5.0</category>
+ <name>transform_XML2POJO</name>
+ <included-projects>transform_XML2POJO,transform_XML2POJO_client</included-projects>
+ <shortDescription>JBoss ESB Smooks XML->POJO Example</shortDescription>
+ <description>The purpose of the simple_transformation sample is to illustrate the
+use of Smooks performing a simple transformation by converting a XML file into
+Java POJOs. Example requires a JBoss Enterprise SOA Platform 5.x runtime.</description>
+ <size>40936</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">transform_XML2POJO,transform_XML2POJO_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 5.0</category>
+ <name>transform_XML2XML_date_manipulation</name>
+ <included-projects>transform_XML2XML_date_manipulation,transform_XML2XML_date_manipulation_client</included-projects>
+ <shortDescription>JBoss ESB Smooks XML->XML date-manipulation Example</shortDescription>
+ <description>This is another simple sample of how to manually define and apply a Message
+ Transformation within JBoss ESB. Example requires a JBoss Enterprise SOA Platform 5.x runtime.
+
+ This sample is an extension of the "transformation_XML2XML_simple"
+ Quickstart, demonstrating how JBoss ESB Transformations can simplify your
+ XSLT transformations by combining the power of XSLT with Java. In this
+ Quickstart, we use Java to perform the ugly string manipulation on the
+ SampleOrder date field (see OrderDate.java) and use XSLT for what it's good at
+ i.e. Templating. Again, the transformed SampleOrder.xml message is just
+ printed to the Java console (message before and after).</description>
+ <size>22071</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">transform_XML2XML_date_manipulation,transform_XML2XML_date_manipulation_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 5.0</category>
+ <name>transform_XML2XML_simple</name>
+ <included-projects>transform_XML2XML_simple,transform_XML2XML_simple_client</included-projects>
+ <shortDescription>JBoss ESB Smooks XML->XML Example</shortDescription>
+ <description>This is a very basic sample of how to manually define and apply a Message
+ Transformation within JBoss ESB. It applies a very simple XSLT to a
+ SampleOrder.xml message and prints the before and after XML to the console.
+ Example requires a JBoss Enterprise SOA Platform 5.x runtime.</description>
+ <size>19224</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example-soa...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.50, org.jboss.ide.eclipse.as.runtime.51</property>
+ <property name="eclipse-projects">transform_XML2XML_simple, transform_XML2XML_simple_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 5.0 and the runtime name should be "jboss-soa-p.5.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 4.3</category>
+ <name>helloworld</name>
+ <included-projects> helloworld,helloworld_testclient </included-projects>
+ <shortDescription>JBoss ESB HelloWorld Example - ESB</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is a runtime named "jboss-soa-p.4.3.0 Runtime" in the workspace.
+ This example is to prove that the ESB is is properly configured and happy.
+As well as to demonstrate the needed minimal files to make a basic ESB component execute.</description>
+ <size>1087454</size>
+
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/hel...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
+ <property name="eclipse-projects">helloworld, helloworld_testclient</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 4.3</category>
+ <name>helloworld_action</name>
+ <included-projects>helloworld_action,helloworld_action_client </included-projects>
+ <shortDescription>JBoss ESB HelloWorld Action Example - ESB</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is a runtime named "jboss-soa-p.4.3.0 Runtime" in the workspace.
+ This example is to demonstrate the use of multiple action invocations from a single configuration. You can use a single Action class and make multiple method calls or use multiple Action
+ classes.</description>
+ <size>24456</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/hel...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
+ <property name="eclipse-projects">helloworld_action, helloworld_action_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
+ </fix>
+ </fixes>
+
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 4.3</category>
+ <name>helloworld_file_action</name>
+ <included-projects>helloworld_file_action,helloworld_file_action_client </included-projects>
+ <shortDescription>JBoss ESB HelloWorld File Action Example - ESB</shortDescription>
+
+ <description>NOTE: Before import this example, please make sure that there is a runtime named "jboss-soa-p.4.3.0 Runtime" in the workspace.
+ This is a basic example of using the File gateway feature of the JBoss ESB.
+ Files that are found in a particular directory with a particular extension
+ are sent to a JMS queue with actions for processing. Before deploy the project, please change some properties according to the readme.txt file.</description>
+ <size>15140</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/hel...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
+ <property name="eclipse-projects">helloworld_file_action, helloworld_file_action_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 4.3</category>
+ <name>webservice_consumer1</name>
+ <included-projects>webservice_consumer1,webservice_consumer1_client </included-projects>
+ <shortDescription>JBoss ESB Web Service consumer1 Example</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is a runtime named "jboss-soa-p.4.3.0 Runtime" in the workspace.
+ This example demonstrates how to consume a 181 Web Service in an ESB action.
+ This ESB will make a webservice request that requires a single "toWhom" string parameter.
+ The webservice will return a greeting response. The ESB simply displays the response on the console.
+ </description>
+ <size>1094434</size>
+
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/web...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
+ <property name="eclipse-projects">webservice_consumer1,webservice_consumer1_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 4.3</category>
+ <name>webservice_producer</name>
+ <included-projects>webservice_producer,webservice_producer_client </included-projects>
+ <shortDescription>JBoss ESB Web Service producer Example</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is a runtime named "jboss-soa-p.4.3.0 Runtime" in the workspace.
+ This sample demonstrates how to deploy a JSR181 Webservice endpoint on
+ JBossESB using the SOAPProcessor action.</description>
+ <size>52601</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/web...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
+ <property name="eclipse-projects">webservice_producer, webservice_producer_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
+ </fix>
+ </fixes>
+
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 4.3</category>
+ <name>transform_CSV2XML</name>
+ <included-projects>transform_CSV2XML,transform_CSV2XML_client </included-projects>
+ <shortDescription>JBoss ESB Smooks CSV->XML Example</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is a runtime named "jboss-soa-p.4.3.0 Runtime" in the workspace.
+ This sample demonstrates how to transform a comma separated value (CSV) file to an xml.
+ The tranformation is done by configuring Smooks and performing two transformation, one transformation from CSV to an intermediate xml format, and a second transformation from the intermediate xml format to the target xml.</description>
+ <size>18354</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/tra...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
+ <property name="eclipse-projects">transform_CSV2XML,transform_CSV2XML_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 4.3</category>
+ <name>transform_XML2POJO</name>
+ <included-projects>transform_XML2POJO,transform_XML2POJO_client </included-projects>
+ <shortDescription>JBoss ESB Smooks XML->POJO Example</shortDescription>
+
+ <description>NOTE: Before import this example, please make sure that there is a runtime named "jboss-soa-p.4.3.0 Runtime" in the workspace.
+ The purpose of the simple_transformation sample is to illustrate the
+use of Smooks performing a simple transformation by converting a XML file into
+Java POJOs.</description>
+ <size>33104</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/tra...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
+ <property name="eclipse-projects">transform_XML2POJO,transform_XML2POJO_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 4.3</category>
+ <name>transform_XML2XML_date_manipulation</name>
+ <included-projects>transform_XML2XML_date_manipulation,transform_XML2XML_date_manipulation_client </included-projects>
+ <shortDescription>JBoss ESB Smooks XML->XML date-manipulation Example</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is a runtime named "jboss-soa-p.4.3.0 Runtime" in the workspace.
+ This is another simple sample of how to manually define and apply a Message
+ Transformation within JBoss ESB.
+
+ This sample is an extension of the "transformation_XML2XML_simple"
+ Quickstart, demonstrating how JBoss ESB Transformations can simplify your
+ XSLT transformations by combining the power of XSLT with Java. In this
+ Quickstart, we use Java to perform the ugly string manipulation on the
+ SampleOrder date field (see OrderDate.java) and use XSLT for what it's good at
+ i.e. Templating. Again, the transformed SampleOrder.xml message is just
+ printed to the Java console (message before and after).</description>
+
+ <size>20313</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/tra...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
+ <property name="eclipse-projects">transform_XML2XML_date_manipulation,transform_XML2XML_date_manipulation_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>ESB for JBoss Enterprise SOA Platform 4.3</category>
+ <name>transform_XML2XML_simple</name>
+ <included-projects>transform_XML2XML_simple,transform_XML2XML_simple_client </included-projects>
+ <shortDescription>JBoss ESB Smooks XML->XML Example</shortDescription>
+ <description>NOTE: Before import this example, please make sure that there is a runtime named "jboss-soa-p.4.3.0 Runtime" in the workspace.
+ This is a very basic sample of how to manually define and apply a Message
+ Transformation within JBoss ESB. It applies a very simple XSLT to a
+ SampleOrder.xml message and prints the before and after XML to the console.</description>
+ <size>18168</size>
+
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/Denny/esb-example/tra...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.eap.43</property>
+ <property name="eclipse-projects">transform_XML2XML_simple, transform_XML2XML_simple_client</property>
+ <property name="required-components">esb</property>
+ <property name="description">This project example requires the JBoss Enterprise SOA Platform 4.3.0 and the runtime name should be "jboss-soa-p.4.3.0 Runtime"</property>
+ </fix>
+ </fixes>
+ </project>
+
+ <project>
+ <category>Richfaces 4.0/JSF 2.0</category>
+ <name>richfaces-simpleapp</name>
+ <included-projects>richfaces-simpleapp</included-projects>
+ <shortDescription>RichFaces 4.0 Simple Application</shortDescription>
+ <description>This example creates a simple RichFaces 4.0 Application. It requires JBoss Application Server 6.0 and m2eclipse.
+It includes the richfaces-simpleapp project.
+</description>
+ <size>9046</size>
+ <url>
+ http://anonsvn.jboss.org/repos/jbosstools/workspace/snjeza/richfaces-exam...
+ </url>
+ <fixes>
+ <fix type="wtpruntime">
+ <property name="allowed-types">org.jboss.ide.eclipse.as.runtime.60</property>
+ <property name="eclipse-projects">richfaces-simpleapp</property>
+ <property name="description">This project example requires the JBoss Application Server 6.0</property>
+ </fix>
+
+ <fix type="plugin">
+ <property name="id">org.maven.ide.eclipse.wtp</property>
+ <property name="versions">0.10.0, 0.11.0,0.12.0</property>
+ <property name="description">The m2eclipse-wtp plugin is required. You can install it using the following update sites: http://m2eclipse.sonatype.org/sites/m2e/ and http://m2eclipse.sonatype.org/sites/m2e-extras/</property>
+ </fix>
+ </fixes>
+ </project>
+
+</projects>
Added: trunk/download.jboss.org/jbosstools/examples/project-examples-maven-4.0.B...
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-maven-4.0.B... (rev 0)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-maven-4.0.B... 2012-10-10 10:55:22 UTC (rev 44407)
@@ -0,0 +1,271 @@
+<projects>
+ <project>
+ <category>JBoss Quickstarts</category>
+ <name>helloworld</name>
+
+ <included-projects>jboss-as-helloworld</included-projects>
+ <shortDescription>Helloworld</shortDescription>
+ <description>
+This example demonstrates the use of CDI 1.0 and Servlet 3 in JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
+The example can be deployed using Maven from the command line or from Eclipse using JBoss Tools.
+ </description>
+ <size>8192</size>
+ <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.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>maven</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
+ <welcome type="cheatsheets" url="/jboss-as-helloworld/.cheatsheet.xml"/>
+ <tags>central</tags>
+ <icon path="icons/jboss.png" />
+ </project>
+
+ <project>
+ <category>JBoss Quickstarts</category>
+ <name>helloworld-osgi</name>
+ <included-projects>jboss-as-helloworld-osgi</included-projects>
+ <shortDescription>Helloworld OSGi Example</shortDescription>
+ <description>
+This example demonstrates the use of OSGi in JBoss Application Server 7.1.
+The example can be deployed using Maven from the command line, by using the AS 7 web console or by dropping the OSGi bundle in the deployments folder.
+
+To deploy to JBoss Application Server 7.1 using JBoss Tools, start JBoss Application Server 7.1, right-click the project, select Run As>Maven build..., enter "package jboss-as:deploy" in the Goals field and click the Run button.
+This will build, deploy and start the OSGi bundle.
+You will see a Hello AS7 World!! message appear on the console when this is done.
+ </description>
+ <size>8192</size>
+ <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.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>maven</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
+ <icon path="icons/jboss.png" />
+ </project>
+
+
+ <project>
+ <category>JBoss Quickstarts</category>
+ <name>login</name>
+
+ <included-projects>jboss-as-login</included-projects>
+ <shortDescription>Login</shortDescription>
+ <description>
+This example demonstrates the use of CDI 1.0, JPA 2.0, JTA 1.1, EJB 3.1 and JSF 2.0 in JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
+The example can be deployed using Maven from the command line or from Eclipse using JBoss Tools.
+ </description>
+<size>8192</size>
+ <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.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.jsf.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>maven</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
+ <welcome type="cheatsheets" url="/jboss-as-login/cheatsheets/login.xml"/>
+ <tags>central</tags>
+ <icon path="icons/jboss.png" />
+ </project>
+
+ <project>
+ <category>JBoss Quickstarts</category>
+ <name>numberguess</name>
+
+ <included-projects>jboss-as-numberguess</included-projects>
+ <shortDescription>Numberguess</shortDescription>
+ <description>
+This example demonstrates the use of CDI 1.0 and JSF 2.0 in JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
+The example can be deployed using Maven from the command line or from Eclipse using JBoss Tools.
+ </description>
+<size>8192</size>
+ <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.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.jsf.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>maven</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
+ <welcome type="cheatsheets" url="/jboss-as-numberguess/.cheatsheet.xml"/>
+ <tags>central</tags>
+ <icon path="icons/jboss.png" />
+ </project>
+
+ <project>
+ <category>JBoss Quickstarts</category>
+ <name>kitchensink</name>
+
+ <included-projects>jboss-as-kitchensink</included-projects>
+ <shortDescription>Kitchensink</shortDescription>
+ <description>
+This is your project! It's a sample, deployable Maven 3 project to help you get your foot in the door developing with Java EE 6 on JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
+This project is setup to allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0.
+It includes a persistence unit and some sample persistence and transaction code to help you get your feet wet with database access in enterprise Java.
+ </description>
+<size>8192</size>
+ <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.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.jsf.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>maven</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
+ <welcome type="cheatsheets" url="/jboss-as-kitchensink/.cheatsheet.xml"/>
+ <tags>central</tags>
+ <icon path="icons/jboss.png" />
+ </project>
+ <project>
+ <category>JBoss Quickstarts</category>
+ <name>helloworld-html5</name>
+
+ <included-projects>helloworld-html5</included-projects>
+ <shortDescription>HTML5</shortDescription>
+ <description>This example demonstrates the use of *CDI 1.0* and *JAX-RS* in *JBoss Application Server 7* using the Plain Old HTML5 (POH5) architecture.
+POH5 is basically a smart, HTML5+CSS3+JavaScript front-end using RESTful services on the backend.</description>
+ <size>7266</size>
+ <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.71, org.jboss.ide.eclipse.as.runtime.eap.60</property>
+ <property name="description">This project example requires JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.jsf.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>maven</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Project Examples feature.</importTypeDescription>
+ <!-- no cheatsheet yet
+ <welcome type="cheatsheets" url="/helloworld-html5/cheatsheets/helloworld-html5.xml"/>
+ -->
+ <welcome type="editor" url="/helloworld-html5/README.md"/>
+ <tags>central</tags>
+ <icon path="icons/jboss.png" />
+ </project>
+
+</projects>
+
Added: trunk/download.jboss.org/jbosstools/examples/project-examples-shared-4.0....
===================================================================
--- trunk/download.jboss.org/jbosstools/examples/project-examples-shared-4.0.... (rev 0)
+++ trunk/download.jboss.org/jbosstools/examples/project-examples-shared-4.0.... 2012-10-10 10:55:22 UTC (rev 44407)
@@ -0,0 +1,367 @@
+<projects>
+ <!--
+ Beware : the project name MUST NOT be changed. It's referenced in JBoss Central
+ -->
+
+ <!-- Java EE Web Project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>jboss-javaee6-webapp</name>
+ <included-projects>jboss-javaee6-webapp</included-projects>
+ <shortDescription>Java EE Web Project</shortDescription>
+ <priority>1</priority>
+ <description>
+This is your project! It's a sample, deployable Maven 3 project to help you get your foot in the door developing with Java EE 6 on JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1.
+This project is setup to allow you to create a compliant Java EE 6 application using JSF 2.0, CDI 1.0, EJB 3.1, JPA 2.0 and Bean Validation 1.0.
+ </description>
+ <size>8192</size>
+ <url/>
+ <stacksId>jboss-javaee6-webapp-archetype</stacksId>
+ <fixes>
+ <fix type="wtpruntime">
+ <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 Enterprise Application Platform 6 or JBoss Application Server 7.1</property>
+ <property name="downloadId">org.jboss.tools.runtime.core.as.711</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.core</property>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spec.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-javaee6-webapp-archetype</archetypeArtifactId>
+ <archetypeVersion>7.1.1.CR1</archetypeVersion>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.examples</groupId>
+ <artifactId>jboss-javaee6-webapp</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.examples</javaPackage>
+ <properties>
+ <property name="name" value="Java EE 6 webapp project"/>
+ </properties>
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/newwebprj_wiz.gif" />
+ </project>
+ <!-- Java EE Project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>multi-javaee6-archetype</name>
+ <included-projects>multi-javaee6-archetype</included-projects>
+ <shortDescription>Java EE Project</shortDescription>
+ <priority>2</priority>
+ <description>An archetype that generates a starter Java EE 6 webapp project for JBoss Enterprise Application Platform 6 or JBoss Application Server. The project is an EAR, with an EJB-JAR and WAR.</description>
+ <size>13806</size>
+ <url/>
+ <stacksId>jboss-javaee6-webapp-ear-archetype</stacksId>
+ <fixes>
+ <fix type="wtpruntime">
+ <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 Enterprise Application Platform 6 or JBoss Application Server 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>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spec.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-javaee6-webapp-ear-archetype</archetypeArtifactId>
+ <archetypeVersion>7.1.1.CR1</archetypeVersion>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>multi</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example</javaPackage>
+ </mavenArchetype>
+ <!--targetProjectFacet facet="jst.ear" version="6.0"/-->
+ <tags>wizard</tags>
+ <icon path="icons/ear-wiz-icon.gif" />
+ </project>
+ <!-- HTML5 project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>jboss-javaee6-poh5-archetype</name>
+ <included-projects>jboss-javaee6-poh5</included-projects>
+ <shortDescription>HTML5 Project</shortDescription>
+ <priority>3</priority>
+ <description>An archetype that generates a Java EE 6 HTML5 Mobile Webapp project for JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</description>
+ <size>165567</size>
+ <url/>
+ <stacksId>jboss-html5-mobile-archetype</stacksId>
+ <fixes>
+ <fix type="wtpruntime">
+ <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 Enterprise Application Platform 6 or JBoss Application Server 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>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.aerogear.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-html5-mobile-archetype</archetypeArtifactId>
+ <archetypeVersion>1.0.0.M5</archetypeVersion>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>poh5</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example.html5</javaPackage>
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/html5.png" />
+ </project>
+ <!-- Richfaces project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>richfaces-archetype-simpleapp</name>
+ <included-projects>richfaces-archetype-simpleapp</included-projects>
+ <shortDescription>RichFaces Project</shortDescription>
+ <priority>4</priority>
+ <description>An archetype that generates a simple Richfaces application</description>
+ <size>165567</size>
+ <url/>
+ <stacksId>richfaces-archetype-kitchensink</stacksId>
+ <fixes>
+ <fix type="wtpruntime">
+ <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 Enterprise Application Platform 6 or JBoss Application Server 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>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.hibernate.feature,org.jboss.tools.maven.jaxrs.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ <mavenArchetype>
+ <archetypeGroupId>org.richfaces.archetypes</archetypeGroupId>
+ <archetypeArtifactId>richfaces-archetype-kitchensink</archetypeArtifactId>
+ <archetypeVersion>4.2.2.Final-2</archetypeVersion>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ <archetypeRepository>https://repository.jboss.org/nexus/content/repositories/jboss_releases_st...</archetypeRepository>
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/snapshots/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>richfaces-webapp</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example.richfaces</javaPackage>
+ <properties>
+ <property name="richfaces-enterprise-version" value="4.2.2.Final-redhat-1" /> <!-- RF is broken in WFK / WFK repo not available-->
+ <property name="richfaces-version" value="4.2.2.Final" />
+ <property name="javaee6-with-tools-enterprise-version" value="1.0.0.M12-redhat-1" />
+ </properties>
+ </mavenArchetype>
+ <essentialEnterpriseDependencies>org.jboss.bom:jboss-javaee-6.0-with-tools:pom:1.0.0.M12-redhat-1::,org.richfaces:richfaces-bom:pom:4.2.2.Final-redhat-1::,</essentialEnterpriseDependencies>
+ <!--
+ <essentialEnterpriseDependencies>org.richfaces:richfaces-bom:pom:4.2.1.Final-redhat-1::,</essentialEnterpriseDependencies>
+ -->
+ <tags>wizard</tags>
+ <icon path="icons/rf_logo.png" />
+ </project>
+ <!-- Spring MVC -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>spring-mvc-webapp</name>
+ <included-projects>spring-mvc-webapp</included-projects>
+ <shortDescription>Spring MVC Project</shortDescription>
+ <priority>5</priority>
+ <description>An archetype that generates a starter Spring MVC application with Java EE persistence settings (server bootstrapped JPA, JTA transaction management) for JBoss Enterprise Application Platform 6 or JBoss Application Server 7.1</description>
+ <size>165567</size>
+ <url/>
+ <fixes>
+ <fix type="wtpruntime">
+ <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 Enterprise Application Platform 6 or JBoss Application Server 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>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.hibernate.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp and JBoss Maven Integration features.</importTypeDescription>
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.spring.archetypes</archetypeGroupId>
+ <archetypeArtifactId>spring-mvc-webapp</archetypeArtifactId>
+ <archetypeVersion>1.0.0.CR6</archetypeVersion>
+ <!--
+ <archetypeRepository>http://repository.jboss.org/nexus/content/repositories/releases/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>springmvc</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.example.springmvc</javaPackage>
+ <!--
+ <properties>
+ <property name="springBomVersion" value="2.0.0-redhat-5" />
+ </properties>
+ -->
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/spring_wiz.gif" />
+ </project>
+ <!-- GWT/Errai Project -->
+ <project>
+ <category>JBoss Maven Archetypes</category>
+ <name>gwt-webapp</name>
+ <included-projects>gwt-kitchensink</included-projects>
+ <priority>6</priority>
+ <shortDescription>GWT Web Project</shortDescription>
+ <description>An archetype that generates a starter GWT application with Java EE 6 and Errai.
+Make sure you read the deployment instructions in README.md.</description>
+ <size>165567</size>
+ <url/>
+ <stacksId>jboss-errai-kitchensink-archetype</stacksId>
+ <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 Enterprise Application Platform 6 or JBoss Application Server 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>
+ <property name="versions">[1.0.0,2.0.0)</property>
+ <property name="description">This project example requires m2e >= 1.0.</property>
+ <property name="connectorIds">org.eclipse.m2e.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.eclipse.m2e.wtp</property>
+ <property name="versions">[0.16,2.0)</property>
+ <property name="description">This project example requires m2e-wtp >= 0.16.0.</property>
+ <property name="connectorIds">org.maven.ide.eclipse.wtp.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">org.jboss.tools.maven.core</property>
+ <property name="versions">[1.3.0,2.0.0)</property>
+ <property name="description">This project example requires JBoss Maven Tools.</property>
+ <property name="connectorIds">org.jboss.tools.maven.feature,org.jboss.tools.maven.cdi.feature,org.jboss.tools.maven.gwt.feature</property>
+ </fix>
+ <fix type="plugin">
+ <property name="id">com.google.gwt.eclipse.core</property>
+ <property name="versions">[2.4,)</property>
+ <property name="description">This project example requires Google Plugin for Eclipse</property>
+ <property name="connectorIds">com.google.gwt.eclipse.sdkbundle.e37.feature,com.google.gdt.eclipse.suite.e37.feature</property>
+ </fix>
+ </fixes>
+ <importType>mavenArchetype</importType>
+ <importTypeDescription>The project example requires the m2e, m2e-wtp, JBoss Maven GWT Integration and Google Plugin for Eclipse features.</importTypeDescription>
+ <!-- Activating the profile causes a build error :
+ 'dependencies.dependency.version' for org.jboss.as:jboss-as-arquillian-container-remote:jar is missing.
+ <defaultMavenProfiles>arq-jbossas-remote</defaultMavenProfiles>
+ -->
+ <mavenArchetype>
+ <archetypeGroupId>org.jboss.errai.archetypes</archetypeGroupId>
+ <archetypeArtifactId>jboss-errai-kitchensink-archetype</archetypeArtifactId>
+ <archetypeVersion>2.0.0.Final</archetypeVersion>
+ <!--
+ <archetypeRepository>http://anonsvn.jboss.org/repos/jbosstools/workspace/fred/repositories/sna...</archetypeRepository>
+ <archetypeRepository>https://repository.jboss.org/nexus/content/groups/public/</archetypeRepository>
+ -->
+ <groupId>org.jboss.tools.example</groupId>
+ <artifactId>gwt-kitchensink</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <javaPackage>org.jboss.tools.gwt.kitchensink</javaPackage>
+ </mavenArchetype>
+ <tags>wizard</tags>
+ <icon path="icons/new-gdt-project.png" />
+ </project>
+
+</projects>
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r44406 - branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_composite_/soa-tooling/3.3.0.Nightly.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-10-10 06:27:42 -0400 (Wed, 10 Oct 2012)
New Revision: 44406
Modified:
branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
Log:
Updated job names
Modified: branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
===================================================================
--- branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c... 2012-10-10 09:44:10 UTC (rev 44405)
+++ branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c... 2012-10-10 10:27:42 UTC (rev 44406)
@@ -13,14 +13,14 @@
<!-- SOA Tooling : 10 x 1 = 10 -->
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--bpel/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--droolsjbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--esb/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--flow/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--jbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--modeshape/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--runtime-soa/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--teiid-designer/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--bpel/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--droolsjbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--esb/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--flow/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--jbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--modeshape/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--runtime-soa/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--teiid-designer/all/repo/'/>
<child location='http://download.jboss.org/savara/releases/updates/2.0.x/' />
<child location='../../../../staging/SwitchYard-Tools/eclipse/'/>
Modified: branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c...
===================================================================
--- branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c... 2012-10-10 09:44:10 UTC (rev 44405)
+++ branches/jbosstools-3.3.x/download.jboss.org/jbosstools/builds/staging/_c... 2012-10-10 10:27:42 UTC (rev 44406)
@@ -13,14 +13,14 @@
<!-- SOA Tooling : 10 x 1 = 10 -->
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--bpel/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--droolsjbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--esb/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--flow/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--jbpm/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--modeshape/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--runtime-soa/all/repo/'/>
-<child location='../../../../staging/soatools-3.3.0_Nightly.component--teiid-designer/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--bpel/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--droolsjbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--esb/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--flow/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--jbpm/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--modeshape/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--runtime-soa/all/repo/'/>
+<child location='../../../../staging/soatools-3.3.x_Nightly.component--teiid-designer/all/repo/'/>
<child location='http://download.jboss.org/savara/releases/updates/2.0.x/' />
<child location='../../../../staging/SwitchYard-Tools/eclipse/'/>
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r44405 - trunk/archives/tests/org.jboss.tools.archives.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-10-10 05:44:10 -0400 (Wed, 10 Oct 2012)
New Revision: 44405
Modified:
trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml
Log:
added eclipse.jdt.feature dependency to be able to set default jdk on mac
Modified: trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml
===================================================================
--- trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml 2012-10-10 09:43:47 UTC (rev 44404)
+++ trunk/archives/tests/org.jboss.tools.archives.ui.bot.test/pom.xml 2012-10-10 09:44:10 UTC (rev 44405)
@@ -81,6 +81,12 @@
<artifactId>org.eclipse.jst.enterprise_ui.feature.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
+ <!-- This entry should enable creating of default JDK on Mac -->
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jdt.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
</dependencies>
</configuration>
</plugin>
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r44404 - trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-10-10 05:43:47 -0400 (Wed, 10 Oct 2012)
New Revision: 44404
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/JenkinsTestSuite.java
Log:
removing two struts tests from stable suite - they are not stable yet
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/JenkinsTestSuite.java
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/JenkinsTestSuite.java 2012-10-10 09:43:15 UTC (rev 44403)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/src/org/jboss/tools/struts/ui/bot/test/JenkinsTestSuite.java 2012-10-10 09:43:47 UTC (rev 44404)
@@ -2,15 +2,13 @@
import org.jboss.tools.struts.ui.bot.test.smoke.CreateNewStrutsProjectTest;
import org.jboss.tools.struts.ui.bot.test.smoke.ImportStrutsProjectTest;
-import org.jboss.tools.struts.ui.bot.test.smoke.RenameStrutsConfigXmlFile;
-import org.jboss.tools.struts.ui.bot.test.smoke.RenameTldFile;
import org.jboss.tools.struts.ui.bot.test.smoke.RunStrutsProjectOnServer;
import org.jboss.tools.ui.bot.ext.RequirementAwareSuite;
import org.junit.runner.RunWith;
import org.junit.runners.Suite.SuiteClasses;
/**
- * Suite of tests executed on jenkins slave *
+ * Suite of tests executed on jenkins slave
* @author jjankovi
*
*/
@@ -19,11 +17,12 @@
CreateNewStrutsProjectTest.class,
RunStrutsProjectOnServer.class,
ImportStrutsProjectTest.class,
- RenameStrutsConfigXmlFile.class,
- RenameTldFile.class,
+
/** Not stable yet
+ RenameStrutsConfigXmlFile.class,
+ RenameTldFile.class,
AddRemoveStrutsCapabilities.class,
TutorialTest.class,
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r44403 - trunk/struts/tests/org.jboss.tools.struts.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-10-10 05:43:15 -0400 (Wed, 10 Oct 2012)
New Revision: 44403
Modified:
trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml
Log:
added eclipse.jdt.feature dependency to be able to set default jdk on mac
Modified: trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml
===================================================================
--- trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
+++ trunk/struts/tests/org.jboss.tools.struts.ui.bot.test/pom.xml 2012-10-10 09:43:15 UTC (rev 44403)
@@ -77,6 +77,12 @@
<artifactId>org.jboss.ide.eclipse.as.feature.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
+ <!-- This entry should enable creating of default JDK on Mac -->
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jdt.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
</dependencies>
</configuration>
</plugin>
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r44402 - in branches/jbosstools-3.3.x/runtime-soa: features and 15 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-10-10 05:42:20 -0400 (Wed, 10 Oct 2012)
New Revision: 44402
Modified:
branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.drools.detector.feature/feature.xml
branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.drools.detector.feature/pom.xml
branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.esb.detector.feature/feature.xml
branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.esb.detector.feature/pom.xml
branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.jbpm.detector.feature/feature.xml
branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.jbpm.detector.feature/pom.xml
branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.soa.test.feature/feature.xml
branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.soa.test.feature/pom.xml
branches/jbosstools-3.3.x/runtime-soa/features/pom.xml
branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.drools.detector/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.drools.detector/pom.xml
branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.esb.detector/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.esb.detector/pom.xml
branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.jbpm.detector/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.jbpm.detector/pom.xml
branches/jbosstools-3.3.x/runtime-soa/plugins/pom.xml
branches/jbosstools-3.3.x/runtime-soa/pom.xml
branches/jbosstools-3.3.x/runtime-soa/site/pom.xml
branches/jbosstools-3.3.x/runtime-soa/tests/org.jboss.tools.runtime.soa.test/META-INF/MANIFEST.MF
branches/jbosstools-3.3.x/runtime-soa/tests/org.jboss.tools.runtime.soa.test/pom.xml
branches/jbosstools-3.3.x/runtime-soa/tests/pom.xml
Log:
[JBIDE-12061][JBIDE-12384][JBDS-2269] Relaxed restrictions on which eclipse version is required
Modified: branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.drools.detector.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.drools.detector.feature/feature.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.drools.detector.feature/feature.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.runtime.drools.detector.feature"
label="%featureName"
- version="1.3.0.qualifier"
+ version="1.4.0.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.runtime.drools.detector">
Modified: branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.drools.detector.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.drools.detector.feature/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.drools.detector.feature/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.runtime-soa</groupId>
<artifactId>features</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.runtime.features</groupId>
<artifactId>org.jboss.tools.runtime.drools.detector.feature</artifactId>
Modified: branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.esb.detector.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.esb.detector.feature/feature.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.esb.detector.feature/feature.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.runtime.esb.detector.feature"
label="%featureName"
- version="1.3.0.qualifier"
+ version="1.4.0.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.runtime.esb.detector">
Modified: branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.esb.detector.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.esb.detector.feature/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.esb.detector.feature/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.runtime-soa</groupId>
<artifactId>features</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.runtime.features</groupId>
<artifactId>org.jboss.tools.runtime.esb.detector.feature</artifactId>
Modified: branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.jbpm.detector.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.jbpm.detector.feature/feature.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.jbpm.detector.feature/feature.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.tools.runtime.jbpm.detector.feature"
label="%featureName"
- version="1.3.0.qualifier"
+ version="1.4.0.qualifier"
provider-name="%providerName"
plugin="org.jboss.tools.runtime.jbpm.detector">
Modified: branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.jbpm.detector.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.jbpm.detector.feature/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.jbpm.detector.feature/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.runtime-soa</groupId>
<artifactId>features</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.runtime.features</groupId>
<artifactId>org.jboss.tools.runtime.jbpm.detector.feature</artifactId>
Modified: branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.soa.test.feature/feature.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.soa.test.feature/feature.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.soa.test.feature/feature.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<feature id="org.jboss.tools.runtime.soa.test.feature" label="JBoss Tools - Tests - Runtime Detection" version="1.3.0.qualifier">
+<feature id="org.jboss.tools.runtime.soa.test.feature" label="JBoss Tools - Tests - Runtime Detection" version="1.4.0.qualifier">
<description>
%description
@@ -14,9 +14,9 @@
</license>
<requires>
- <import feature="org.jboss.tools.runtime.drools.detector.feature" version="1.3.0" match="compatible"/>
- <import feature="org.jboss.tools.runtime.esb.detector.feature" version="1.3.0" match="compatible"/>
- <import feature="org.jboss.tools.runtime.jbpm.detector.feature" version="1.3.0" match="compatible"/>
+ <import feature="org.jboss.tools.runtime.drools.detector.feature" version="1.4.0" match="compatible"/>
+ <import feature="org.jboss.tools.runtime.esb.detector.feature" version="1.4.0" match="compatible"/>
+ <import feature="org.jboss.tools.runtime.jbpm.detector.feature" version="1.4.0" match="compatible"/>
<import feature="org.jboss.tools.runtime.test.feature" version="1.3.0" match="compatible"/>
<import feature="org.jboss.tools.runtime.core.feature" version="1.3.0" match="compatible"/>
Modified: branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.soa.test.feature/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.soa.test.feature/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/features/org.jboss.tools.runtime.soa.test.feature/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.runtime-soa</groupId>
<artifactId>features</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.runtime-soa.features</groupId>
<artifactId>org.jboss.tools.runtime.soa.test.feature</artifactId>
Modified: branches/jbosstools-3.3.x/runtime-soa/features/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/features/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/features/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>runtime-soa</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.runtime-soa</groupId>
<artifactId>features</artifactId>
Modified: branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.drools.detector/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.drools.detector/META-INF/MANIFEST.MF 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.drools.detector/META-INF/MANIFEST.MF 2012-10-10 09:42:20 UTC (rev 44402)
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.runtime.drools.detector;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-Activator: org.jboss.tools.runtime.drools.detector.RuntimeDroolsActivator
-Require-Bundle: org.eclipse.ui;bundle-version="[3.7.0,3.8.0)",
- org.eclipse.core.runtime;bundle-version="[3.7.0,3.8.0)",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.7.0,4.3.0)",
+ org.eclipse.core.runtime;bundle-version="[3.7.0,4.3.0)",
org.jboss.tools.runtime.core,
org.drools.eclipse
Bundle-ActivationPolicy: lazy
Modified: branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.drools.detector/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.drools.detector/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.drools.detector/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.runtime-soa</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.runtime.plugins</groupId>
<artifactId>org.jboss.tools.runtime.drools.detector</artifactId>
Modified: branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.esb.detector/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.esb.detector/META-INF/MANIFEST.MF 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.esb.detector/META-INF/MANIFEST.MF 2012-10-10 09:42:20 UTC (rev 44402)
@@ -2,10 +2,10 @@
Bundle-ManifestVersion: 2
Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.runtime.esb.detector;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-Activator: org.jboss.tools.runtime.esb.detector.RuntimeEsbActivator
-Require-Bundle: org.eclipse.ui;bundle-version="[3.7.0,3.8.0)",
- org.eclipse.core.runtime;bundle-version="[3.7.0,3.8.0)",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.7.0,4.3.0)",
+ org.eclipse.core.runtime;bundle-version="[3.7.0,4.3.0)",
org.jboss.tools.esb.project.core,
org.jboss.tools.runtime.core
Bundle-ActivationPolicy: lazy
Modified: branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.esb.detector/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.esb.detector/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.esb.detector/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.runtime-soa</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.runtime.plugins</groupId>
<artifactId>org.jboss.tools.runtime.esb.detector</artifactId>
Modified: branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.jbpm.detector/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.jbpm.detector/META-INF/MANIFEST.MF 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.jbpm.detector/META-INF/MANIFEST.MF 2012-10-10 09:42:20 UTC (rev 44402)
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.jboss.tools.runtime.jbpm.detector;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
Bundle-Activator: org.jboss.tools.runtime.jbpm.detector.RuntimeJbpmActivator
-Require-Bundle: org.eclipse.ui;bundle-version="[3.7.0,3.8.0)",
- org.eclipse.core.runtime;bundle-version="[3.7.0,3.8.0)",
+Require-Bundle: org.eclipse.ui;bundle-version="[3.7.0,4.3.0)",
+ org.eclipse.core.runtime;bundle-version="[3.7.0,4.3.0)",
org.jboss.tools.runtime.core,
org.jboss.tools.jbpm.common
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.jbpm.detector/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.jbpm.detector/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/plugins/org.jboss.tools.runtime.jbpm.detector/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.runtime-soa</groupId>
<artifactId>plugins</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.runtime.plugins</groupId>
<artifactId>org.jboss.tools.runtime.jbpm.detector</artifactId>
Modified: branches/jbosstools-3.3.x/runtime-soa/plugins/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/plugins/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/plugins/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>runtime-soa</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.runtime-soa</groupId>
<artifactId>plugins</artifactId>
Modified: branches/jbosstools-3.3.x/runtime-soa/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,12 +5,12 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>parent</artifactId>
- <version>3.3.0.CR1-SNAPSHOT</version>
+ <version>3.3.0.Final-SNAPSHOT</version>
<relativePath>../build/parent/pom.xml</relativePath>
</parent>
<groupId>org.jboss.tools</groupId>
<artifactId>runtime-soa</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<name>runtime-soa.all</name>
<packaging>pom</packaging>
<modules>
Modified: branches/jbosstools-3.3.x/runtime-soa/site/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/site/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/site/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,11 +5,11 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>runtime-soa</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.runtime-soa</groupId>
<artifactId>runtime-soa.site</artifactId>
<name>runtime-soa.site</name>
<packaging>eclipse-repository</packaging>
-</project>
\ No newline at end of file
+</project>
Modified: branches/jbosstools-3.3.x/runtime-soa/tests/org.jboss.tools.runtime.soa.test/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/tests/org.jboss.tools.runtime.soa.test/META-INF/MANIFEST.MF 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/tests/org.jboss.tools.runtime.soa.test/META-INF/MANIFEST.MF 2012-10-10 09:42:20 UTC (rev 44402)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %BundleName
Bundle-SymbolicName: org.jboss.tools.runtime.soa.test;singleton:=true
-Bundle-Version: 1.3.0.qualifier
+Bundle-Version: 1.4.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.junit4,
org.jboss.tools.runtime.ui,
Modified: branches/jbosstools-3.3.x/runtime-soa/tests/org.jboss.tools.runtime.soa.test/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/tests/org.jboss.tools.runtime.soa.test/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/tests/org.jboss.tools.runtime.soa.test/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools.runtime-soa</groupId>
<artifactId>tests</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.runtime.soa.tests</groupId>
<artifactId>org.jboss.tools.runtime.soa.test</artifactId>
Modified: branches/jbosstools-3.3.x/runtime-soa/tests/pom.xml
===================================================================
--- branches/jbosstools-3.3.x/runtime-soa/tests/pom.xml 2012-10-10 09:40:51 UTC (rev 44401)
+++ branches/jbosstools-3.3.x/runtime-soa/tests/pom.xml 2012-10-10 09:42:20 UTC (rev 44402)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.jboss.tools</groupId>
<artifactId>runtime-soa</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.jboss.tools.runtime-soa</groupId>
<artifactId>tests</artifactId>
12 years, 3 months
- 1
- 0
JBoss Tools SVN: r44401 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui: src/org/jboss/tools/openshift/express/internal/core and 25 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-10-10 05:40:51 -0400 (Wed, 10 Oct 2012)
New Revision: 44401
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/IConnectionsModelListener.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ICredentialsPrompter.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleTypePropertyTester.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/OpenShiftConsoleView.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/HostNameValidator.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/AbstractLabelProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/ConnectToOpenShiftWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/OpenShiftExplorerContentCategory.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/OpenShiftExplorerContentProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/OpenShiftExplorerLabelProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/OpenShiftExplorerView.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionDelegate/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/IOpenShiftPreferenceConstants.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/OpenShiftPreferences.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/ServerPreferencePage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/CollectionUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ContentProposalUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IConnectionAwareModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/CredentialsPrompter.java
Removed:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleTypePropertyTester.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/ConnectToOpenShiftWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/LabelProvider.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/viewer/actionDelegate/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IUserAwareModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/CredentialsWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/CredentialsWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/credentials/
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/CartridgeNameComparator.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryBehaviourDelegate.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryPublishMethod.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressLaunchDelegate.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
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/ExpressServerExtendedProperties.java
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/OpenShiftRuntime.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/OpenshiftDelegatingStartLaunchConfiguration.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationConfigurationTab.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationDebuggingLaunchConfigurationDelegate.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.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/DeleteDomainAction.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/action/ImportApplicationAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftLaunchTabGroup.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/command/ManageSSHKeysHandler.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/JschToEclipseLogger.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ServerTypePropertyTester.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailConsolePageParticipant.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/RequiredStringValidator.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionDelegate/OpenConnectionDialogActionDelegate.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionDelegate/RefreshViewerActionDelegate.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/AbstractOpenShiftExplorerViewerActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ApplicationPortForwardingActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/CreateApplicationActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/CreateOrEditDomainActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/CreateServerAdapterActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/DeleteApplicationActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/DeleteConnectionActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/DeleteDomainActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/EditCartridgesActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ImportApplicationActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/OpenInWebBrowserActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/RefreshElementActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ShowDetailsActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ShowEnvironmentActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ShowPropertiesActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/TailServerLogActionProvider.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/ApplicationPropertySource.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/EmbeddableCartridgePropertySource.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/PropertySourceAdapterFactory.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/TypeMapper.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/UserPropertySection.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/UserPropertySource.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/LoadKeysJob.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/UIUtils.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ConnectToOpenShiftWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationConfigurationWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationConfigurationWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationSelectionDialogModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/GitCloningSettingsWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/IOpenShiftExpressWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ImportOpenShiftExpressApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/NewOpenShiftExpressApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/OpenShiftExpressApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/OpenShiftExpressApplicationWizardModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ServerAdapterFactory.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/AbstractImportApplicationOperation.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/ConfigureGitSharedProject.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/ConfigureUnsharedProject.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/ImportNewProject.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/EditDomainDialog.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/EditDomainWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/NewDomainDialog.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/NewDomainWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/EmbedCartridgeWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/EmbedCartridgeWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/IEmbedCartridgesWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AbstractSSHKeyWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ManageSSHKeysWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ManageSSHKeysWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ManageSSHKeysWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPageModel.java
Log:
[JBIDE-12572] added server combo-box to connection dialog
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-10-10 09:40:51 UTC (rev 44401)
@@ -292,26 +292,26 @@
point="org.eclipse.ui.views">
<!--view
category="org.jboss.tools.common.model.ui.views"
- class="org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftConsoleExpressView"
+ class="org.jboss.tools.openshift.express.internal.ui.explorerOpenShiftConsoleExpressView"
icon="icons/openshift-logo-white-icon.png"
- id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView"
+ id="org.jboss.tools.openshift.express.ui.explorer.expressConsoleView"
name="OpenShift Explorer">
</view-->
<view
category="org.jboss.tools.common.model.ui.views"
- class="org.jboss.tools.openshift.express.internal.ui.console.ExpressConsoleView"
+ class="org.jboss.tools.openshift.express.internal.ui.console.OpenShiftConsoleView"
icon="icons/openshift-logo-white-icon.png"
- id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView"
+ id="org.jboss.tools.openshift.express.ui.explorer.expressConsoleView"
name="OpenShift Explorer">
</view>
</extension>
<extension point="org.eclipse.ui.navigator.viewer">
<viewer
- viewerId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView">
+ viewerId="org.jboss.tools.openshift.express.ui.explorer.expressConsoleView">
<popupMenu
allowsPlatformContributions="true"
- id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView.popup">
+ id="org.jboss.tools.openshift.express.ui.explorer.expressConsoleView.popup">
<insertionPoint
name="group.showIn"
separator="true">
@@ -336,20 +336,20 @@
</property>
</options>
</viewer>
- <viewerActionBinding viewerId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView">
+ <viewerActionBinding viewerId="org.jboss.tools.openshift.express.ui.explorer.expressConsoleView">
<includes>
<actionExtension
- pattern="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.*"/>
+ pattern="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.*"/>
<!--actionExtension
pattern="org.jboss.tools.openshift.express.internal.core.portforward.applicationPortForwardActionProvider"/-->
</includes>
</viewerActionBinding>
<viewerContentBinding
- viewerId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView">
+ viewerId="org.jboss.tools.openshift.express.ui.explorer.expressConsoleView">
<includes>
<contentExtension
isRoot="false"
- pattern="org.jboss.tools.openshift.express.ui.viewer.expressConsoleContent">
+ pattern="org.jboss.tools.openshift.express.ui.explorer.expressConsoleContent">
</contentExtension>
</includes>
</viewerContentBinding>
@@ -357,52 +357,52 @@
<extension
point="org.eclipse.ui.navigator.navigatorContent">
<navigatorContent
- contentProvider="org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentProvider"
- id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleContent"
- labelProvider="org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleLabelProvider"
+ contentProvider="org.jboss.tools.openshift.express.internal.ui.explorer.OpenShiftExplorerContentProvider"
+ id="org.jboss.tools.openshift.express.ui.explorer.expressConsoleContent"
+ labelProvider="org.jboss.tools.openshift.express.internal.ui.explorer.OpenShiftExplorerLabelProvider"
name="OpenShift Explorer Content">
<triggerPoints></triggerPoints>
</navigatorContent>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.CreateApplicationActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.createApplicationActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.CreateApplicationActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.createApplicationActionProvider">
<enablement>
<and>
<instanceof
- value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
+ value="org.jboss.tools.openshift.express.internal.core.connection.Connection">
</instanceof>
</and>
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.CreateOrEditDomainActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.editDomainActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.CreateOrEditDomainActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.editDomainActionProvider">
<enablement>
<and>
<instanceof
- value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
+ value="org.jboss.tools.openshift.express.internal.core.connection.Connection">
</instanceof>
</and>
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.DeleteDomainActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.deleteDomainActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.DeleteDomainActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.deleteDomainActionProvider">
<enablement>
<and>
<instanceof
- value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
+ value="org.jboss.tools.openshift.express.internal.core.connection.Connection">
</instanceof>
</and>
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.RefreshElementActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.RefreshElementActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.RefreshElementActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.RefreshElementActionProvider">
<enablement>
<or>
<instanceof
- value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
+ value="org.jboss.tools.openshift.express.internal.core.connection.Connection">
</instanceof>
<instanceof
value="com.openshift.client.IApplication">
@@ -411,19 +411,19 @@
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.DeleteConnectionActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.DeleteConnectionActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.DeleteConnectionActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.DeleteConnectionActionProvider">
<enablement>
<and>
<instanceof
- value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
+ value="org.jboss.tools.openshift.express.internal.core.connection.Connection">
</instanceof>
</and>
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.OpenInWebBrowserActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.openInWebBrowserActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.OpenInWebBrowserActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.openInWebBrowserActionProvider">
<enablement>
<and>
<instanceof
@@ -433,8 +433,8 @@
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.TailServerLogActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.tailServerLogActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.TailServerLogActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.tailServerLogActionProvider">
<enablement>
<and>
<instanceof
@@ -444,8 +444,8 @@
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.ApplicationPortForwardingActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.applicationPortForwardingActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.ApplicationPortForwardingActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.applicationPortForwardingActionProvider">
<enablement>
<and>
<instanceof
@@ -456,8 +456,8 @@
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.EditCartridgesActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.editCartridgesActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.EditCartridgesActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.editCartridgesActionProvider">
<enablement>
<and>
<instanceof
@@ -467,8 +467,8 @@
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.ImportApplicationActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.importApplicationActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.ImportApplicationActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.importApplicationActionProvider">
<enablement>
<and>
<instanceof
@@ -478,8 +478,8 @@
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.DeleteApplicationActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.deleteApplicationActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.DeleteApplicationActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.deleteApplicationActionProvider">
<enablement>
<and>
<instanceof
@@ -489,8 +489,8 @@
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.CreateServerAdapterActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.createServerAdapterActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.CreateServerAdapterActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.createServerAdapterActionProvider">
<enablement>
<and>
<instanceof
@@ -500,12 +500,12 @@
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.ShowPropertiesActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.showPropertiesActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.ShowPropertiesActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.showPropertiesActionProvider">
<enablement>
<or>
<instanceof
- value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
+ value="org.jboss.tools.openshift.express.internal.core.connection.Connection">
</instanceof>
<!-- Not showing it for IApp since it has show details -->
<!-- <instanceof
@@ -518,8 +518,8 @@
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.ShowDetailsActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.showDetailsActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.ShowDetailsActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.showDetailsActionProvider">
<enablement>
<or>
<instanceof
@@ -529,8 +529,8 @@
</enablement>
</actionProvider>
<actionProvider
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.ShowEnvironmentActionProvider"
- id="org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider.showEnvironmentActionProvider">
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.ShowEnvironmentActionProvider"
+ id="org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider.showEnvironmentActionProvider">
<enablement>
<or>
<instanceof
@@ -544,10 +544,10 @@
<extension
point="org.eclipse.ui.viewActions">
<viewContribution
- id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleViewContribution"
- targetID="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView">
+ id="org.jboss.tools.openshift.express.ui.explorer.expressConsoleViewContribution"
+ targetID="org.jboss.tools.openshift.express.ui.explorer.expressConsoleView">
<!--action
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionDelegate.RefreshViewerActionDelegate"
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionDelegate.RefreshViewerActionDelegate"
icon="icons/refresh.gif"
id="org.jboss.tools.openshift.express.ui.viewActions.refreshAction"
label="Refresh"
@@ -555,7 +555,7 @@
toolbarPath="openshift">
</action-->
<action
- class="org.jboss.tools.openshift.express.internal.ui.viewer.actionDelegate.OpenConnectionDialogActionDelegate"
+ class="org.jboss.tools.openshift.express.internal.ui.explorer.actionDelegate.OpenConnectionDialogActionDelegate"
icon="icons/resource_obj.gif"
id="org.jboss.tools.openshift.express.ui.viewActions.openConnectionWizard"
label="Connect"
@@ -569,22 +569,22 @@
<extension
point="org.eclipse.core.runtime.adapters">
<factory
- adaptableType="org.jboss.tools.openshift.express.internal.core.console.UserDelegate"
- class="org.jboss.tools.openshift.express.internal.ui.viewer.property.PropertySourceAdapterFactory">
+ adaptableType="org.jboss.tools.openshift.express.internal.core.connection.Connection"
+ class="org.jboss.tools.openshift.express.internal.ui.explorerproperty.PropertySourceAdapterFactory">
<adapter
type="org.eclipse.ui.views.properties.IPropertySource">
</adapter>
</factory>
<factory
adaptableType="com.openshift.client.IApplication"
- class="org.jboss.tools.openshift.express.internal.ui.viewer.property.PropertySourceAdapterFactory">
+ class="org.jboss.tools.openshift.express.internal.ui.explorerproperty.PropertySourceAdapterFactory">
<adapter
type="org.eclipse.ui.views.properties.IPropertySource">
</adapter>
</factory>
<factory
adaptableType="com.openshift.client.IEmbeddableCartridge"
- class="org.jboss.tools.openshift.express.internal.ui.viewer.property.PropertySourceAdapterFactory">
+ class="org.jboss.tools.openshift.express.internal.ui.explorerproperty.PropertySourceAdapterFactory">
<adapter
type="org.eclipse.ui.views.properties.IPropertySource">
</adapter>
@@ -634,24 +634,24 @@
<!--extension
point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
<propertyContributor
- contributorId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView"
- typeMapper="org.jboss.tools.openshift.express.internal.ui.viewer.TypeMapper">
+ contributorId="org.jboss.tools.openshift.express.ui.explorer.expressConsoleView"
+ typeMapper="org.jboss.tools.openshift.express.internal.ui.explorerTypeMapper">
<propertyCategory
- category="org.jboss.tools.openshift.express.ui.viewer.expressConsolePropertyTabCategory"></propertyCategory>
+ category="org.jboss.tools.openshift.express.ui.explorer.expressConsolePropertyTabCategory"></propertyCategory>
</propertyContributor>
</extension>
<extension
point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
<propertyTabs
- contributorId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView">
+ contributorId="org.jboss.tools.openshift.express.ui.explorer.expressConsoleView">
<propertyTab
- category="org.jboss.tools.openshift.express.ui.viewer.expressConsolePropertyTabCategory"
- id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleUserTab"
+ category="org.jboss.tools.openshift.express.ui.explorer.expressConsolePropertyTabCategory"
+ id="org.jboss.tools.openshift.express.ui.explorer.expressConsoleUserTab"
label="Account">
</propertyTab>
<propertyTab
- category="org.jboss.tools.openshift.express.ui.viewer.expressConsolePropertyTabCategory"
- id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleApplicationsTab"
+ category="org.jboss.tools.openshift.express.ui.explorer.expressConsolePropertyTabCategory"
+ id="org.jboss.tools.openshift.express.ui.explorer.expressConsoleApplicationsTab"
label="Account">
</propertyTab>
</propertyTabs>
@@ -659,11 +659,11 @@
<extension
point="org.eclipse.ui.views.properties.tabbed.propertySections">
<propertySections
- contributorId="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView">
+ contributorId="org.jboss.tools.openshift.express.ui.explorer.expressConsoleView">
<propertySection
- class="org.jboss.tools.openshift.express.internal.ui.viewer.property.UserPropertySection"
+ class="org.jboss.tools.openshift.express.internal.ui.explorerproperty.UserPropertySection"
id="org.jboss.tools.openshift.express.ui.userPropertySection"
- tab="org.jboss.tools.openshift.express.ui.viewer.expressConsolePropertyTab">
+ tab="org.jboss.tools.openshift.express.ui.explorer.expressConsolePropertyTab">
<input
type="org.jboss.tools.openshift.express.internal.core.console.UserDelegate">
</input>
@@ -676,7 +676,7 @@
targetID="org.jboss.tools.common.ui.JBossPerspective">
<view relative="org.eclipse.ui.views.ProblemView"
relationship="stack"
- id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView">
+ id="org.jboss.tools.openshift.express.ui.explorer.expressConsoleView">
</view>
</perspectiveExtension>
</extension>
@@ -697,7 +697,7 @@
<extension
point="org.eclipse.ui.menus">
<menuContribution
- locationURI="popup:org.jboss.tools.openshift.express.ui.viewer.expressConsoleView.popup?before=group.server">
+ locationURI="popup:org.jboss.tools.openshift.express.ui.explorer.expressConsoleView.popup?before=group.server">
<command
commandId="org.jboss.tools.openshift.express.ui.command.manageKeys"
icon="icons/key-icon.png"
@@ -709,7 +709,7 @@
<count value="1" />
<iterate ifEmpty="false" operator="or">
<instanceof
- value="org.jboss.tools.openshift.express.internal.core.console.UserDelegate" />
+ value="org.jboss.tools.openshift.express.internal.core.connection.Connection" />
</iterate>
</and>
</with>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/CartridgeNameComparator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/CartridgeNameComparator.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/CartridgeNameComparator.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -35,11 +35,7 @@
return -1;
}
} else if (thatCartridge == null) {
- if (thisCartridge == null) {
- return 0;
- } else {
- return 1;
- }
+ return 1;
}
return collator.compare(thisCartridge.getName(), thatCartridge.getName());
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviour.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -21,8 +21,13 @@
import org.eclipse.wst.server.core.IModule;
import org.jboss.ide.eclipse.as.core.server.internal.DelegatingServerBehavior;
+/**
+ * @author Rob Stryker
+ */
public class ExpressBehaviour extends DelegatingServerBehavior {
+
private IAdaptable publishAdaptableInfo;
+
public IStatus publish(int kind, IProgressMonitor monitor) {
boolean shouldPublish = false;
if( publishAdaptableInfo != null ) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBehaviourDelegate.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -12,11 +12,13 @@
import org.jboss.ide.eclipse.as.core.server.internal.AbstractBehaviourDelegate;
+/**
+ * @author Rob Stryker
+ */
public class ExpressBehaviourDelegate extends AbstractBehaviourDelegate {
+
public static final String OPENSHIFT_ID = "openshift";
- public ExpressBehaviourDelegate() {
- }
-
+
@Override
public String getBehaviourTypeId() {
return OPENSHIFT_ID;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryBehaviourDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryBehaviourDelegate.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryBehaviourDelegate.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -16,12 +16,13 @@
import org.eclipse.core.runtime.Status;
import org.jboss.ide.eclipse.as.core.server.internal.AbstractBehaviourDelegate;
+/**
+ * @author Rob Stryker
+ */
public class ExpressBinaryBehaviourDelegate extends AbstractBehaviourDelegate {
public static final String OPENSHIFT_BINARY_ID = "openshiftBinary";
- public ExpressBinaryBehaviourDelegate() {
- // TODO Auto-generated constructor stub
- }
+
@Override
public String getBehaviourTypeId() {
return OPENSHIFT_BINARY_ID;
@@ -29,19 +30,14 @@
@Override
public void publishStart(IProgressMonitor monitor) throws CoreException {
- // TODO Auto-generated method stub
-
}
@Override
public void publishFinish(IProgressMonitor monitor) throws CoreException {
- // TODO Auto-generated method stub
-
}
@Override
public IStatus canChangeState(String launchMode) {
- // TODO Auto-generated method stub
return Status.OK_STATUS;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryPublishMethod.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressBinaryPublishMethod.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -22,11 +22,13 @@
import org.eclipse.wst.server.core.model.IModuleResourceDelta;
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
import org.jboss.ide.eclipse.archives.webtools.modules.LocalZippedPublisherUtil;
-import org.jboss.ide.eclipse.as.core.publishers.PublishUtil;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IDeployableServerBehaviour;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
+/**
+ * @author Rob Stryker
+ */
public class ExpressBinaryPublishMethod extends ExpressPublishMethod {
@Override
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressLaunchDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressLaunchDelegate.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressLaunchDelegate.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -25,18 +25,15 @@
import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils;
import org.jboss.ide.eclipse.as.core.util.LaunchCommandPreferences;
+/**
+ * @author Rob Stryker
+ */
public class ExpressLaunchDelegate implements IJBossLaunchDelegate {
- public ExpressLaunchDelegate() {
- // TODO Auto-generated constructor stub
- }
-
@Override
public void actualLaunch(LaunchConfigurationDelegate launchConfig,
ILaunchConfiguration configuration, String mode, ILaunch launch,
IProgressMonitor monitor) throws CoreException {
- // TODO Auto-generated method stub
-
}
@Override
@@ -65,16 +62,12 @@
@Override
public void postLaunch(ILaunchConfiguration configuration, String mode,
ILaunch launch, IProgressMonitor monitor) throws CoreException {
- // TODO Auto-generated method stub
-
}
@Override
public void setupLaunchConfiguration(
ILaunchConfigurationWorkingCopy workingCopy, IServer server)
throws CoreException {
- // TODO Auto-generated method stub
-
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -46,12 +46,11 @@
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.console.ConsoleUtils;
+/**
+ * @author Rob Stryker
+ */
public class ExpressPublishMethod implements IJBossServerPublishMethod {
- public ExpressPublishMethod() {
- // TODO Auto-generated constructor stub
- }
-
@Override
public void publishStart(IDeployableServerBehaviour behaviour,
IProgressMonitor monitor) throws CoreException {
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-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -28,7 +28,11 @@
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
+/**
+ * @author Rob Stryker
+ */
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);
Modified: 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 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerExtendedProperties.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -15,11 +15,15 @@
import com.openshift.client.IApplication;
+/**
+ * @author Rob Stryker
+ */
public class ExpressServerExtendedProperties extends ServerExtendedProperties {
public ExpressServerExtendedProperties(IAdaptable adaptable) {
super(adaptable);
}
+
public boolean hasWelcomePage() {
return true;
}
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-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServerUtils.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -38,8 +38,8 @@
import org.jboss.ide.eclipse.as.core.util.RuntimeUtils;
import org.jboss.ide.eclipse.as.core.util.ServerConverter;
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.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.osgi.service.prefs.BackingStoreException;
@@ -125,7 +125,7 @@
final String appName = getExpressApplicationName(server);
final String userName = getExpressUsername(server);
try {
- final UserDelegate ud = UserModel.getDefault().findUser(userName);
+ final Connection ud = ConnectionsModel.getDefault().getConnection(userName);
if (ud != null) {
return ud.getApplicationByName(appName); // May be long running
}
@@ -415,7 +415,7 @@
public static IApplication findApplicationForServer(IServerAttributes server) {
try {
String user = ExpressServerUtils.getExpressUsername(server);
- UserDelegate user2 = UserModel.getDefault().findUser(user);
+ Connection user2 = ConnectionsModel.getDefault().getConnection(user);
String appName = ExpressServerUtils.getExpressApplicationName(server);
IApplication app = user2 == null ? null : user2.getApplicationByName(appName);
return app;
@@ -426,7 +426,7 @@
}
public static void updateOpenshiftProjectSettings(IProject project, IApplication app,
- UserDelegate user, String remoteName, String deployFolder) {
+ Connection user, String remoteName, String deployFolder) {
String qualifier = OpenShiftUIActivator.getDefault().getBundle().getSymbolicName();
IScopeContext context = new ProjectScope(project);
IEclipsePreferences node = context.getNode(qualifier);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/OpenShiftRuntime.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/OpenShiftRuntime.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/OpenShiftRuntime.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -12,8 +12,8 @@
import org.eclipse.wst.server.core.model.RuntimeDelegate;
+/**
+ * @author Rob Stryker
+ */
public class OpenShiftRuntime extends RuntimeDelegate {
-
- public OpenShiftRuntime() {
- }
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/OpenshiftDelegatingStartLaunchConfiguration.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/OpenshiftDelegatingStartLaunchConfiguration.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/OpenshiftDelegatingStartLaunchConfiguration.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -13,6 +13,9 @@
import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
import org.jboss.ide.eclipse.as.core.server.internal.launch.DelegatingStartLaunchConfiguration;
+/**
+ * @author Rob Stryker
+ */
public class OpenshiftDelegatingStartLaunchConfiguration extends
DelegatingStartLaunchConfiguration implements
ILaunchConfigurationDelegate {
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/Connection.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,481 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.core.connection;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.SocketTimeoutException;
+import java.net.URL;
+import java.util.List;
+
+import org.jboss.tools.openshift.express.internal.core.util.UrlUtils;
+import org.jboss.tools.openshift.express.internal.core.util.UrlUtils.UrlPortions;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+import org.jboss.tools.openshift.express.internal.ui.preferences.OpenShiftPreferences;
+import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
+import org.jboss.tools.openshift.express.internal.ui.utils.OpenShiftPasswordStorageKey;
+import org.jboss.tools.openshift.express.internal.ui.utils.SecurePasswordStore;
+import org.jboss.tools.openshift.express.internal.ui.utils.SecurePasswordStoreException;
+import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+
+import com.openshift.client.ApplicationScale;
+import com.openshift.client.IApplication;
+import com.openshift.client.ICartridge;
+import com.openshift.client.IDomain;
+import com.openshift.client.IEmbeddableCartridge;
+import com.openshift.client.IGearProfile;
+import com.openshift.client.IOpenShiftSSHKey;
+import com.openshift.client.ISSHPublicKey;
+import com.openshift.client.IUser;
+import com.openshift.client.OpenShiftConnectionFactory;
+import com.openshift.client.OpenShiftException;
+import com.openshift.client.OpenShiftUnknonwSSHKeyTypeException;
+import com.openshift.client.configuration.OpenShiftConfiguration;
+
+/**
+ * @author Rob Stryker
+ * @author Xavier Coulon
+ * @author Andre Dietisheim
+ */
+public class Connection {
+
+ private static final String USER_ID =
+ OpenShiftUIActivator.PLUGIN_ID + " " + OpenShiftUIActivator.getDefault().getBundle().getVersion();
+
+ private String username;
+ private String password;
+ private String host;
+ private IUser user;
+ private boolean isDomainLoaded;
+ private boolean rememberPassword;
+ private boolean alreadyPromptedForPassword;
+ private boolean passwordLoaded;
+ private OpenShiftConfiguration openShiftConfiguration;
+ private ICredentialsPrompter prompter;
+
+ public Connection() {
+ this(null, null, null, false);
+ }
+
+ public Connection(String url, ICredentialsPrompter prompter) throws MalformedURLException, UnsupportedEncodingException {
+ UrlPortions portions = UrlUtils.toPortions(new URL(url));
+ this.username = portions.getUsername();
+ this.password = portions.getPassword();
+ setHost(portions.getHost());
+ this.prompter = prompter;
+ }
+
+ public Connection(Connection connection) {
+ this(connection.getUsername(), connection.getPassword(), connection.getHost(),
+ connection.isRememberPassword());
+ setUser(connection.getUser());
+ }
+
+ private Connection(String username, String password, String host, boolean rememberPassword) {
+ this.username = getUsername(username);
+ this.password = password;
+ setHost(host);
+ this.rememberPassword = rememberPassword;
+ }
+
+ private String getUsername(String username) {
+ if (!StringUtils.isEmpty(username)) {
+ return username;
+ }
+ username = OpenShiftPreferences.INSTANCE.getLastUsername();
+ if (StringUtils.isEmpty(username)) {
+ username = getDefaultUsername();
+ }
+ return username;
+ }
+
+ private String getDefaultUsername() {
+ try {
+ return getOpenShiftConfiguration().getRhlogin();
+ } catch (Exception e) {
+ Logger.error("Could not load default user name from OpenShift configuration.", e);
+ }
+ return null;
+ }
+
+ private void setUser(IUser user) {
+ if (user == null) {
+ return;
+ }
+ this.user = user;
+ }
+
+ private IUser getUser() {
+ return user;
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public String setUsername(String username) {
+ this.username = username;
+ clearUser();
+ // TODO: replace default name by userinput
+ return username;
+ }
+
+ public String getPassword() {
+ loadPassword();
+ return password;
+ }
+
+ public String setPassword(String password) {
+ this.password = password;
+ setRememberPassword(!StringUtils.isEmpty(password));
+ this.passwordLoaded = true;
+ clearUser();
+ return password;
+ }
+
+ /**
+ * Returns the host this connection is bound to.
+ *
+ * @return
+ */
+ public String getHost() {
+ if (StringUtils.isEmpty(host)) {
+ return getDefaultHost();
+ }
+ if (isDefaultHost()) {
+ return getDefaultHost() + UrlUtils.cutScheme(host);
+ }
+
+ return host;
+ }
+
+ public String setHost(String host) {
+ if (isDefaultHost(host)) {
+ this.host = null;
+ } else {
+ this.host = host;
+ }
+ clearUser();
+ return host;
+ }
+
+
+ public boolean isDefaultHost() {
+ return isDefaultHost(host);
+ }
+
+ private boolean isDefaultHost(String host) {
+ try {
+ return StringUtils.isEmpty(host)
+ || new URL(UrlUtils.ensureStartsWithSchemeOrHttps(host)).getHost().isEmpty();
+ } catch (MalformedURLException e) {
+ return true;
+ }
+ }
+
+ private String getDefaultHost() {
+ try {
+ // TODO: override by default server set in preferences
+ return getOpenShiftConfiguration().getLibraServer();
+ } catch (Exception e) {
+ Logger.error("Could not load default server from OpenShift configuration.", e);
+ }
+ return null;
+ }
+
+ public boolean isRememberPassword() {
+ return rememberPassword;
+ }
+
+ public final boolean setRememberPassword(boolean rememberPassword) {
+ return this.rememberPassword = rememberPassword;
+ }
+
+ public boolean canPromptForPassword() {
+ return this.alreadyPromptedForPassword == false;
+ }
+
+ /**
+ * Prompts user for password if it was not given or retrieved from secure
+ * storage before.
+ *
+ * @return true if user entered credentials, false otherwise.
+ */
+ private boolean authenticate() {
+ if (!hasUser()) {
+ loadPassword();
+ if (password != null) {
+ if (createUser()) {
+ return true;
+ }
+ }
+ return promptForCredentials();
+ }
+ return true;
+ }
+
+ /**
+ * Attempts to load the password from the secure storage, only at first time
+ * it is called.
+ */
+ private void loadPassword() {
+ if (StringUtils.isEmpty(password)
+ && !passwordLoaded) {
+ this.password = getPassword(getSecureStore(getHost(), getUsername()));
+ this.passwordLoaded = true;
+ this.rememberPassword = (password != null);
+ }
+ }
+
+ private boolean hasUser() {
+ return user != null;
+ }
+
+ private void clearUser() {
+ this.user = null;
+ }
+
+ private boolean createUser() throws OpenShiftException {
+ this.user = new OpenShiftConnectionFactory().getConnection(USER_ID, username, password, getHost()).getUser();
+ // force domain loading so that there is no 'lazy domain loading' cost
+ // after that.
+ user.getDefaultDomain();
+ setUser(user);
+ return user != null;
+ }
+
+ public void update(Connection connection) {
+ setUsername(connection.getUsername());
+ setPassword(connection.getPassword());
+ setRememberPassword(connection.isRememberPassword());
+ setHost(connection.getHost());
+ setUser(connection.getUser());
+ }
+
+ // TODO: extract UI related code from core package
+ private boolean promptForCredentials() {
+ if (prompter == null) {
+ return false;
+ }
+ try {
+ alreadyPromptedForPassword = true;
+ prompter.promptAndAuthenticate(this);
+ } catch (Exception e) {
+ Logger.error("Failed to retrieve User's password", e);
+ }
+ return hasUser();
+ }
+
+ public IApplication createApplication(final String applicationName, final ICartridge applicationType,
+ final ApplicationScale scale, final IGearProfile gearProfile)
+ throws OpenShiftException {
+ if (authenticate()) {
+ return user.getDefaultDomain().createApplication(applicationName, applicationType, scale, gearProfile);
+ }
+ return null;
+ }
+
+ /**
+ * Creates a new domain with the given id
+ *
+ * @param id
+ * the domain id
+ * @return the created domain
+ * @throws OpenShiftException
+ * @throws SocketTimeoutException
+ */
+ public IDomain createDomain(String id) throws OpenShiftException {
+ if (authenticate()) {
+ return user.createDomain(id);
+ }
+ return null;
+ }
+
+ public IApplication getApplicationByName(String name) throws OpenShiftException {
+ if (authenticate()
+ && user.hasDomain()) {
+ return user.getDefaultDomain().getApplicationByName(name);
+ }
+ return null;
+ }
+
+ public List<IApplication> getApplications() throws OpenShiftException {
+ if (authenticate()
+ && user.hasDomain()) {
+ return user.getDefaultDomain().getApplications();
+ }
+ return null;
+ }
+
+ public List<ICartridge> getStandaloneCartridgeNames() throws OpenShiftException {
+ if (authenticate()) {
+ return user.getConnection().getStandaloneCartridges();
+ }
+ return null;
+ }
+
+ public IDomain getDefaultDomain() throws OpenShiftException {
+ if (authenticate()) {
+ IDomain domain = user.getDefaultDomain();
+ isDomainLoaded = true;
+ return domain;
+ }
+ return null;
+ }
+
+ public boolean isDomainLoaded() throws OpenShiftException {
+ return isDomainLoaded;
+ }
+
+ public List<IEmbeddableCartridge> getEmbeddableCartridges() throws OpenShiftException {
+ if (authenticate()) {
+ return user.getConnection().getEmbeddableCartridges();
+ }
+ return null;
+ }
+
+ public boolean hasApplication(String name) throws OpenShiftException {
+ if (authenticate()) {
+ return user.getDefaultDomain().hasApplicationByName(name);
+ }
+ return false;
+ }
+
+ public boolean hasApplicationOfType(ICartridge type) throws OpenShiftException {
+ if (hasDomain()) {
+ return user.getDefaultDomain().hasApplicationByCartridge(type);
+ }
+ return false;
+ }
+
+ public boolean hasDomain() throws OpenShiftException {
+ if (connect()) {
+ return user.hasDomain();
+ }
+ return false;
+ }
+
+ public boolean connect() throws OpenShiftException {
+ if (isConnected()) {
+ return true;
+ }
+ if (authenticate()) {
+ save();
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public void refresh() throws OpenShiftException {
+ isDomainLoaded = false;
+ if (authenticate()) {
+ user.refresh();
+ }
+ }
+
+ public boolean isConnected() {
+ return hasUser();
+ }
+
+ public List<IOpenShiftSSHKey> getSSHKeys() {
+ if (authenticate()) {
+ return user.getSSHKeys();
+ }
+ return null;
+ }
+
+ public IOpenShiftSSHKey getSSHKeyByPublicKey(String publicKey) throws OpenShiftUnknonwSSHKeyTypeException,
+ OpenShiftException {
+ return user.getSSHKeyByPublicKey(publicKey);
+ }
+
+ public IOpenShiftSSHKey putSSHKey(String name, ISSHPublicKey key) throws OpenShiftException {
+ return user.putSSHKey(name, key);
+ }
+
+ public boolean hasSSHKeyName(String name) {
+ return user.hasSSHKeyName(name);
+ }
+
+ public boolean hasSSHPublicKey(String publicKey) {
+ return user.hasSSHPublicKey(publicKey);
+ }
+
+ private OpenShiftConfiguration getOpenShiftConfiguration() throws FileNotFoundException, OpenShiftException,
+ IOException {
+ if (openShiftConfiguration == null) {
+ this.openShiftConfiguration = new OpenShiftConfiguration();
+ }
+ return openShiftConfiguration;
+ }
+
+ public void save() {
+ String username = getUsername();
+ if (!StringUtils.isEmpty(username)) {
+ OpenShiftPreferences.INSTANCE.saveLastUsername(username);
+ saveOrClearPassword(username, getHost(), getPassword());
+ }
+ }
+
+ private void saveOrClearPassword(String username, String host, String password) {
+ SecurePasswordStore store = getSecureStore(host, username);
+ if (store != null
+ && !StringUtils.isEmpty(username)) {
+ try {
+ if (isRememberPassword()
+ && !StringUtils.isEmpty(password)) {
+ store.setPassword(password);
+ } else {
+ store.remove();
+ }
+ } catch (SecurePasswordStoreException e) {
+ Logger.error(e.getMessage(), e);
+ }
+ }
+ }
+
+ private String getPassword(SecurePasswordStore store) {
+ String password = null;
+ if (store != null
+ && !StringUtils.isEmpty(getUsername())) {
+ try {
+ password = store.getPassword();
+ } catch (SecurePasswordStoreException e) {
+ Logger.error(e.getMessage(), e);
+ }
+ }
+ return password;
+ }
+
+ /**
+ * Return a secure store or <code>null</code> if platform is not found
+ */
+ private SecurePasswordStore getSecureStore(final String platform, final String username) {
+ if (platform == null) {
+ return null;
+ }
+ final OpenShiftPasswordStorageKey key = new OpenShiftPasswordStorageKey(platform, username);
+ SecurePasswordStore store = new SecurePasswordStore(key);
+ return store;
+ }
+
+ /**
+ * @return an url-alike string that always starts with a scheme but
+ * eventually has no host where the default host shall be used.
+ * @throws UnsupportedEncodingException
+ */
+ public String toURLString() throws UnsupportedEncodingException {
+ return UrlUtils.toUrlString(username, host);
+ }
+}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ConnectionsModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,168 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.core.connection;
+
+import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map.Entry;
+
+import org.eclipse.osgi.util.NLS;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+import org.jboss.tools.openshift.express.internal.ui.preferences.OpenShiftPreferences;
+import org.jboss.tools.openshift.express.internal.ui.wizard.connection.CredentialsPrompter;
+
+/**
+ * @author Rob Stryker
+ */
+public class ConnectionsModel {
+
+ /** event that a connection was added */
+ private static final int ADDED = 0;
+ /** event that a connection was removed */
+ private static final int REMOVED = 1;
+ /** event that a connection was changed */
+ private static final int CHANGED = 2;
+
+ private static ConnectionsModel model;
+
+ public static ConnectionsModel getDefault() {
+ if (model == null)
+ model = new ConnectionsModel();
+ return model;
+ }
+
+ /** The most recent user connected on OpenShift. */
+ private Connection recentConnection = null;
+ private HashMap<String, Connection> allConnections = new HashMap<String, Connection>();
+ private List<IConnectionsModelListener> listeners = new ArrayList<IConnectionsModelListener>();
+
+ private ConnectionsModel() {
+ load();
+ }
+
+ public void addListener(IConnectionsModelListener listener) {
+ listeners.add(listener);
+ }
+
+ public void removeListener(IConnectionsModelListener listener) {
+ listeners.remove(listener);
+ }
+
+ public void addConnection(Connection connection) {
+ try {
+ allConnections.put(connection.toURLString(), connection);
+ this.recentConnection = connection;
+ fireModelChange(connection, ADDED);
+ } catch (UnsupportedEncodingException e) {
+ OpenShiftUIActivator.log(
+ NLS.bind("Could not add connection {0}/{1}", connection.getUsername(), connection.getHost()),
+ e);
+ }
+ }
+
+ public void fireConnectionChanged(Connection connection) {
+ fireModelChange(connection, CHANGED);
+ }
+
+ public void removeConnection(Connection connection) {
+ allConnections.remove(connection.getUsername());
+ if (this.recentConnection == connection)
+ this.recentConnection = null;
+ fireModelChange(connection, REMOVED);
+ }
+
+ private void fireModelChange(Connection connection, int type) {
+ Iterator<IConnectionsModelListener> i = listeners.iterator();
+ while (i.hasNext()) {
+ IConnectionsModelListener l = i.next();
+ switch (type) {
+ case ADDED:
+ l.connectionAdded(connection);
+ break;
+ case REMOVED:
+ l.connectionRemoved(connection);
+ break;
+ case CHANGED:
+ l.connectionChanged(connection);
+ break;
+
+ default:
+ break;
+ }
+ }
+ }
+
+ public Connection getRecentConnection() {
+ return recentConnection;
+ }
+
+ public void setRecentUser(Connection user) {
+ this.recentConnection = user;
+ }
+
+ public Connection getConnection(String name) {
+ if (name == null) {
+ return null;
+ }
+ return allConnections.get(name);
+ }
+
+ public Connection[] getConnections() {
+ Collection<Connection> c = allConnections.values();
+ Connection[] rets = (Connection[]) c.toArray(new Connection[c.size()]);
+ return rets;
+ }
+
+ /**
+ * Load the user list from preferences and secure storage
+ */
+ public void load() {
+ String[] connections = OpenShiftPreferences.INSTANCE.getConnections();
+ for (int i = 0; i < connections.length; i++) {
+ Connection connection = null;
+ try {
+ connection = new Connection(connections[i], new CredentialsPrompter());
+ addConnection(connection);
+ } catch (MalformedURLException e) {
+ OpenShiftUIActivator.log(NLS.bind("Could not add connection for {0}.", connections[i]), e);
+ } catch (UnsupportedEncodingException e) {
+ OpenShiftUIActivator.log(NLS.bind("Could not add connection for {0}.", connections[i]), e);
+ }
+ }
+ }
+
+ /**
+ * Save the user list to preferences and secure storage
+ */
+ public void save() {
+ List<String> persistedConnections = new ArrayList<String>();
+ for (Entry<String, Connection> entry : allConnections.entrySet()) {
+ Connection connection = entry.getValue();
+ connection.save();
+ try {
+ persistedConnections.add(connection.toURLString());
+ } catch (UnsupportedEncodingException e) {
+ OpenShiftUIActivator.log(
+ NLS.bind("Could not store connection {0}/{1}", connection.getUsername(), connection.getHost()),
+ e);
+ }
+ }
+
+ OpenShiftPreferences.INSTANCE.saveConnections(
+ (String[]) persistedConnections.toArray(new String[persistedConnections.size()]));
+ }
+
+}
\ No newline at end of file
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/IConnectionsModelListener.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/IConnectionsModelListener.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/IConnectionsModelListener.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.core.connection;
+
+/**
+ * @author Rob Stryker
+ */
+public interface IConnectionsModelListener {
+ public void connectionAdded(Connection user);
+ public void connectionRemoved(Connection user);
+ public void connectionChanged(Connection user);
+}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ICredentialsPrompter.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ICredentialsPrompter.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/connection/ICredentialsPrompter.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.core.connection;
+
+/**
+ * @author Andre Dietisheim
+ */
+public interface ICredentialsPrompter {
+
+ public void promptAndAuthenticate(Connection user);
+
+}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationConfigurationTab.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationConfigurationTab.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationConfigurationTab.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -32,8 +32,8 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Text;
-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.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import com.openshift.client.IApplication;
@@ -160,7 +160,7 @@
return false;
}
try {
- for (UserDelegate user : UserModel.getDefault().getUsers()) {
+ for (Connection user : ConnectionsModel.getDefault().getConnections()) {
final IApplication application = user.getApplicationByName(applicationName);
if (application != null) {
return true;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationDebuggingLaunchConfigurationDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationDebuggingLaunchConfigurationDelegate.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/portforward/RemoteOpenShiftApplicationDebuggingLaunchConfigurationDelegate.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -18,8 +18,8 @@
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.jdt.internal.launching.JavaRemoteApplicationLaunchConfigurationDelegate;
import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-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.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import com.openshift.client.IApplication;
@@ -72,7 +72,7 @@
private IApplication lookupApplication(String applicationName) {
try {
- for (UserDelegate user : UserModel.getDefault().getUsers()) {
+ for (Connection user : ConnectionsModel.getDefault().getConnections()) {
final IApplication application = user.getApplicationByName(applicationName);
if (application != null) {
return application;
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.core.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class UrlUtils {
+
+ private static final String HTTPS = "https";
+ private static final String HTTP = "http";
+ private static final String SCHEME_SEPARATOR = "://";
+ public static final String SCHEME_HTTPS = HTTPS + SCHEME_SEPARATOR;
+ public static final String SCHEME_HTTP = HTTP + SCHEME_SEPARATOR;
+
+ private static final char CREDENTIALS_HOST_DELIMITER = '@';
+
+ private UrlUtils() {
+ // inhibit instantiation
+ }
+
+ public static UrlPortions toPortions(URL url) throws UnsupportedEncodingException {
+ return new UrlPortions(url);
+ }
+
+ public static class UrlPortions {
+
+ private String username;
+ private String password;
+ private String host;
+
+ private UrlPortions(URL url) throws UnsupportedEncodingException {
+ String[] userInfo = url.getUserInfo().split(":");
+ if (userInfo.length >= 1) {
+ this.username = URLDecoder.decode(userInfo[0], "UTF-8");
+ }
+ if (userInfo.length >= 2) {
+ this.password = userInfo[1];
+ }
+ this.host = url.getHost();
+ }
+
+ public String getUsername() {
+ return username;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public String getHost() {
+ return host;
+ }
+ }
+
+ public static String toUrlString(String username, String host) throws UnsupportedEncodingException {
+ host = cutScheme(host);
+ StringBuilder builder = new StringBuilder(URLEncoder.encode(username, "UTF-8"))
+ .append(CREDENTIALS_HOST_DELIMITER);
+ if (!isEmpty(host)) {
+ builder.append(host);
+ }
+ return ensureStartsWithSchemeOrHttps(builder.toString());
+ }
+
+ public static String ensureStartsWithSchemeOrHttps(String host) {
+ if (isEmpty(host)) {
+ return SCHEME_HTTPS;
+ }
+ if (host.indexOf(SCHEME_SEPARATOR) > -1) {
+ return host;
+ }
+ return SCHEME_HTTPS + host;
+ }
+
+ public static String cutScheme(String host) {
+ if (isEmpty(host)) {
+ return host;
+ }
+ int schemeDelimiterIndex = host.indexOf(SCHEME_SEPARATOR);
+ if (schemeDelimiterIndex > -1) {
+ return host.substring(schemeDelimiterIndex + SCHEME_SEPARATOR.length());
+ }
+ return host;
+ }
+
+ private static boolean isEmpty(String string) {
+ return string == null
+ || string.isEmpty();
+ }
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/util/UrlUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/OpenShiftUIActivator.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -7,7 +7,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.jboss.tools.openshift.express.internal.core.console.UserModel;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
import org.osgi.framework.BundleContext;
/**
@@ -47,7 +47,7 @@
* )
*/
public void stop(BundleContext context) throws Exception {
- UserModel.getDefault().save();
+ ConnectionsModel.getDefault().save();
plugin = null;
super.stop(context);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -13,7 +13,7 @@
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.swt.widgets.Shell;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.wizard.application.NewOpenShiftExpressApplicationWizard;
@@ -36,9 +36,9 @@
public void run() {
if (selection != null && selection instanceof ITreeSelection) {
Object sel = ((ITreeSelection) selection).getFirstElement();
- if (sel instanceof UserDelegate) {
- final UserDelegate user = (UserDelegate) sel;
- if(user.checkForPassword()) {
+ if (sel instanceof Connection) {
+ final Connection user = (Connection) sel;
+ if(user.connect()) {
final OpenShiftExpressApplicationWizard wizard = new NewOpenShiftExpressApplicationWizard(user);
final WizardDialog wizardDialog = new WizardDialog(new Shell(), wizard);
wizardDialog.open();
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-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateOrEditDomainAction.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -14,7 +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.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -36,11 +36,11 @@
@Override
public void run() {
final ITreeSelection treeSelection = (ITreeSelection) selection;
- if (selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof UserDelegate) {
- final UserDelegate user = (UserDelegate) treeSelection.getFirstElement();
+ if (selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof Connection) {
+ final Connection user = (Connection) treeSelection.getFirstElement();
boolean connected = user.isConnected();
if (!connected) {
- connected = user.checkForPassword();
+ connected = user.connect();
}
// do not show the dialog if the user was not connected or did not provide valid credentials.
if (connected) {
@@ -51,7 +51,7 @@
}
}
- private IWizard createDomainWizard(final UserDelegate user) {
+ private IWizard createDomainWizard(final Connection user) {
IWizard domainWizard;
try {
if (user.getDefaultDomain() == null || user.getDefaultDomain().getId() == null) {
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-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateServerAdapterAction.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -28,8 +28,8 @@
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.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
@@ -61,9 +61,9 @@
final IDomain domain = application.getDomain();
final IUser user = domain.getUser();
Assert.isNotNull(user, NLS.bind("application {0} does not reference any user", application.getName()));
- UserDelegate userDelegate = UserModel.getDefault().findUser(user.getRhlogin());
+ Connection connection = ConnectionsModel.getDefault().getConnection(user.getRhlogin());
NewServerWizard w = new NewServerWizard(ExpressServerUtils.OPENSHIFT_SERVER_TYPE);
- w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, userDelegate);
+ w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_USER, connection);
w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_DOMAIN, domain);
w.getTaskModel().putObject(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP, application);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), w);
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-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteConnectionAction.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -11,8 +11,8 @@
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.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
/**
@@ -27,10 +27,10 @@
@Override
public void run() {
if (selection instanceof ITreeSelection
- && ((ITreeSelection) selection).getFirstElement() instanceof UserDelegate) {
+ && ((ITreeSelection) selection).getFirstElement() instanceof Connection) {
final ITreeSelection treeSelection = (ITreeSelection) selection;
- final UserDelegate user = (UserDelegate) treeSelection.getFirstElement();
- UserModel.getDefault().removeUser(user);
+ final Connection user = (Connection) treeSelection.getFirstElement();
+ ConnectionsModel.getDefault().removeConnection(user);
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/DeleteDomainAction.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -22,7 +22,7 @@
import org.eclipse.ui.ISharedImages;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.ui.dialog.CheckboxMessageDialog;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
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;
@@ -42,9 +42,9 @@
public void validate() {
boolean enable = false;
if (selection instanceof ITreeSelection
- && ((IStructuredSelection) selection).getFirstElement() instanceof UserDelegate
+ && ((IStructuredSelection) selection).getFirstElement() instanceof Connection
&& ((ITreeSelection) selection).size() == 1) {
- UserDelegate user = (UserDelegate) ((IStructuredSelection) selection).getFirstElement();
+ Connection user = (Connection) ((IStructuredSelection) selection).getFirstElement();
if (user.isConnected()) {
try {
if (user.getDefaultDomain() != null) {
@@ -62,8 +62,8 @@
public void run() {
final ITreeSelection treeSelection = (ITreeSelection) selection;
if (selection instanceof ITreeSelection
- && treeSelection.getFirstElement() instanceof UserDelegate) {
- UserDelegate user = (UserDelegate) treeSelection.getFirstElement();
+ && treeSelection.getFirstElement() instanceof Connection) {
+ Connection user = (Connection) treeSelection.getFirstElement();
try {
final IDomain domain = user.getDefaultDomain();
if (domain == null) {
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-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/EditCartridgesAction.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -14,8 +14,8 @@
import org.eclipse.jface.viewers.ITreeSelection;
import org.eclipse.swt.widgets.Display;
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.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -40,7 +40,7 @@
if (selection != null && selection instanceof ITreeSelection && treeSelection.getFirstElement() instanceof IApplication) {
try {
final IApplication application = (IApplication) treeSelection.getFirstElement();
- final UserDelegate user = UserModel.getDefault().findUser(application.getDomain().getUser().getRhlogin());
+ final Connection user = ConnectionsModel.getDefault().getConnection(application.getDomain().getUser().getRhlogin());
EmbedCartridgeWizard wizard = new EmbedCartridgeWizard(application, user);
int result = WizardUtils.openWizardDialog(wizard, Display.getCurrent().getActiveShell());
if(result == Dialog.OK) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -16,7 +16,7 @@
import org.eclipse.jface.viewers.TreePath;
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.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.wizard.application.ImportOpenShiftExpressApplicationWizard;
@@ -40,7 +40,7 @@
if (selection instanceof ITreeSelection
&& treeSelection.getFirstElement() instanceof IApplication) {
final IApplication application = (IApplication) treeSelection.getFirstElement();
- final UserDelegate user = getUser(treeSelection.getPaths());
+ final Connection user = getUser(treeSelection.getPaths());
final IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(application.getName());
OpenShiftExpressApplicationWizard wizard = new ImportOpenShiftExpressApplicationWizard(user, project, application);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
@@ -50,13 +50,13 @@
}
}
- private UserDelegate getUser(TreePath[] paths) {
- UserDelegate user = null;
+ private Connection getUser(TreePath[] paths) {
+ Connection user = null;
if( paths != null
&& paths.length == 1 ) {
Object selection = paths[0].getParentPath().getLastSegment();
- if( selection instanceof UserDelegate )
- user = (UserDelegate) selection;
+ if( selection instanceof Connection )
+ user = (Connection) selection;
}
return user;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshElementAction.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -15,7 +15,7 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.viewers.ITreeSelection;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -40,7 +40,7 @@
@Override
public void run() {
if (selection != null && selection instanceof ITreeSelection
- && (((ITreeSelection) selection).getFirstElement() instanceof UserDelegate)
+ && (((ITreeSelection) selection).getFirstElement() instanceof Connection)
|| (((ITreeSelection) selection).getFirstElement() instanceof IOpenShiftResource)){
refresh( ((ITreeSelection) selection).getFirstElement());
}
@@ -53,8 +53,8 @@
protected IStatus run(IProgressMonitor monitor) {
try {
monitor.beginTask("Loading OpenShift information...", IProgressMonitor.UNKNOWN);
- if(element instanceof UserDelegate) {
- ((UserDelegate)element).refresh();
+ if(element instanceof Connection) {
+ ((Connection)element).refresh();
} else if (element instanceof IOpenShiftResource) {
((IOpenShiftResource)element).refresh();
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -61,14 +61,15 @@
import org.jboss.ide.eclipse.as.ui.editor.DeploymentTypeUIUtil;
import org.jboss.ide.eclipse.as.ui.editor.IDeploymentTypeUI.IServerModeUICallback;
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.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIMessages;
+import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
import org.jboss.tools.openshift.express.internal.ui.wizard.ConnectToOpenShiftWizardModel;
import org.jboss.tools.openshift.express.internal.ui.wizard.application.ImportOpenShiftExpressApplicationWizard;
import org.jboss.tools.openshift.express.internal.ui.wizard.application.OpenShiftExpressApplicationWizard;
-import org.jboss.tools.openshift.express.internal.ui.wizard.credentials.CredentialsWizardPageModel;
+import org.jboss.tools.openshift.express.internal.ui.wizard.connection.ConnectionWizardPageModel;
import com.openshift.client.IApplication;
import com.openshift.client.IDomain;
@@ -99,7 +100,7 @@
private boolean rememberPassword = true;
private String user, pass, app, remote, deployProject, deployFolder;
private IApplication fapplication;
- private UserDelegate fuser;
+ private Connection connection;
private IDomain fdomain;
private List<IApplication> appList;
private String[] appListNames;
@@ -137,9 +138,9 @@
}
this.user = nameFromExistingServer;
- this.fuser = UserModel.getDefault().findUser(this.user);
+ this.connection = ConnectionsModel.getDefault().getConnection(this.user);
this.app = ExpressServerUtils.getExpressApplicationName(server);
- this.pass = UserModel.getDefault().getPasswordFromSecureStorage(this.user);
+ this.pass = connection.getPassword();
this.deployProject = ExpressServerUtils.getExpressDeployProject(server);
this.deployFolder = ExpressServerUtils.getExpressDeployFolder(server);
this.remote = ExpressServerUtils.getExpressRemoteName(server);
@@ -147,7 +148,7 @@
private void initModelNewServerWizard() {
// We're in a new server wizard.
- UserDelegate tmpUser = (UserDelegate) callback.getAttribute(ExpressServerUtils.TASK_WIZARD_ATTR_USER);
+ Connection tmpUser = (Connection) callback.getAttribute(ExpressServerUtils.TASK_WIZARD_ATTR_USER);
IApplication app = (IApplication) callback.getAttribute(ExpressServerUtils.TASK_WIZARD_ATTR_SELECTED_APP);
if( tmpUser != null && app != null ) {
@@ -166,11 +167,11 @@
}
} else {
// we may or may not have a user, clearly no app
- this.fuser = tmpUser == null ? UserModel.getDefault().getRecentUser() : tmpUser;
- this.user = fuser == null ? null : fuser.getUsername();
+ this.connection = tmpUser == null ? ConnectionsModel.getDefault().getRecentConnection() : tmpUser;
+ this.user = connection == null ? null : connection.getUsername();
}
- this.pass = this.user == null ? null : UserModel.getDefault().getPasswordFromSecureStorage(this.user);
+ this.pass = this.user == null ? null : connection.getPassword();
this.deployFolder = ExpressServerUtils.getExpressDeployFolder(server);
this.deployFolder = this.deployFolder == null ? ExpressServerUtils.ATTRIBUTE_DEPLOY_FOLDER_DEFAULT : this.deployFolder;
this.remote = ExpressServerUtils.getExpressRemoteName(server);
@@ -307,8 +308,9 @@
nameModifyListener = new ModifyListener() {
public void modifyText(ModifyEvent e) {
user = userText.getText();
- String storedPass = UserModel.getDefault().getPasswordFromSecureStorage(user);
- if (storedPass != null && !storedPass.equals(""))
+ Connection connection = ConnectionsModel.getDefault().getConnection(user);
+ String storedPass = connection.getPassword();
+ if (!StringUtils.isEmpty(storedPass))
passText.setText(storedPass);
}
};
@@ -372,7 +374,7 @@
importLink.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
OpenShiftExpressApplicationWizard wizard =
- new ImportOpenShiftExpressApplicationWizard(fuser, null, fapplication);
+ new ImportOpenShiftExpressApplicationWizard(connection, null, fapplication);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard);
int oldServerCount = ServerCore.getServers().length;
dialog.create();
@@ -461,13 +463,12 @@
private void verifyPressed() {
this.fapplication = null;
- this.fuser = null;
+ this.connection = null;
this.appListNames = null;
verifyButton.setEnabled(false);
- final Runnable runnable = getVerifyingCredentialsJob();
Job j = new Job("Verifying Credentials and Application") {
protected IStatus run(IProgressMonitor monitor) {
- runnable.run();
+ getVerifyingCredentialsRunnable().run();
return Status.OK_STATUS;
}
};
@@ -479,7 +480,7 @@
private void postVerifyUpdateWidgets() {
importLink.setEnabled(false);
verifyButton.setEnabled(true);
- if (appNameCombo != null && fuser != null) {
+ if (appNameCombo != null && connection != null) {
appNameCombo.setItems(appListNames);
int index = Arrays.asList(appListNames).indexOf(app);
if (index != -1)
@@ -530,26 +531,21 @@
return error;
}
- private Runnable getVerifyingCredentialsJob() {
- final ConnectToOpenShiftWizardModel inner = new ConnectToOpenShiftWizardModel() {
- public UserDelegate setUser(UserDelegate user) {
- this.user = user;
- return user;
- }
- };
- final CredentialsWizardPageModel model = new CredentialsWizardPageModel(inner);
+ private Runnable getVerifyingCredentialsRunnable() {
+ final ConnectToOpenShiftWizardModel credentialsWizardModel = new ConnectToOpenShiftWizardModel();
+ final ConnectionWizardPageModel model = new ConnectionWizardPageModel(credentialsWizardModel);
model.setPassword(pass);
- model.setRhLogin(user);
+ model.setUsername(user);
model.setRememberPassword(rememberPassword);
return new Runnable() {
public void run() {
- final IStatus s = model.validateCredentials();
+ final IStatus s = model.connect();
if (!s.isOK()) {
credentialsFailed = true;
} else {
credentialsFailed = false;
try {
- updateModelForNewUser(inner.getUser());
+ updateModelForNewUser(credentialsWizardModel.getConnection());
} catch(NotFoundOpenShiftException nose) {
// Ignore this. It will be handled later
} catch(OpenShiftException ose) {
@@ -560,7 +556,7 @@
};
}
- private void updateModelForNewUser(UserDelegate user) throws OpenShiftException, SocketTimeoutException {
+ private void updateModelForNewUser(Connection user) throws OpenShiftException, SocketTimeoutException {
// Updating the model, some long-running
projectsPerApp.clear();
@@ -578,8 +574,8 @@
IApplication application = index == -1 ? null : appList.get(index);
this.appListNames = appNames == null ? new String[0] : appNames;
this.fapplication = application;
- this.fuser = user;
- this.user = fuser.getUsername();
+ this.connection = user;
+ this.user = connection.getUsername();
for( int i = 0; i < appList.size(); i++ ) {
projectsPerApp.put(appList.get(i), ExpressServerUtils.findProjectsForApplication(appList.get(i)));
@@ -594,12 +590,8 @@
public void finish(IProgressMonitor monitor) throws CoreException {
try {
- UserModel.getDefault().addUser(fuser);
- if( rememberPassword ) {
- UserModel.getDefault().setPasswordInSecureStorage(fuser.getUsername(), fuser.getPassword());
- } else {
- UserModel.getDefault().clearPasswordInSecureStorage(fuser.getUsername());
- }
+ ConnectionsModel.getDefault().addConnection(connection);
+ connection.save();
fillServerWithDetails();
updateProjectSettings();
} catch(OpenShiftException ose) {
@@ -623,7 +615,7 @@
ExpressServerUtils.SETTING_DEPLOY_FOLDER_NAME, null);
if( projRemote == null && projDepFolder == null ) {
ExpressServerUtils.updateOpenshiftProjectSettings(
- depProj, fapplication, fuser, remote, deployFolder);
+ depProj, fapplication, connection, remote, deployFolder);
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsSection.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -56,6 +56,9 @@
import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils;
import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIMessages;
+/**
+ * @author Rob Stryker
+ */
public class ExpressDetailsSection extends ServerEditorSection {
private IEditorInput input;
protected Text userText, remoteText;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressWizardFragment.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -24,13 +24,14 @@
import org.jboss.ide.eclipse.as.ui.editor.DeploymentTypeUIUtil.NewServerWizardBehaviourCallback;
import org.jboss.tools.common.ui.WizardUtils;
+/**
+ * @author Rob Stryker
+ */
public class ExpressWizardFragment extends WizardFragment implements ICompletable {
+
private ExpressDetailsComposite composite;
private NewServerWizardBehaviourCallback callback;
-
- public ExpressWizardFragment() {
- }
-
+
public boolean hasComposite() {
return true;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftLaunchTabGroup.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftLaunchTabGroup.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/OpenshiftLaunchTabGroup.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -24,20 +24,21 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Label;
-public class OpenshiftLaunchTabGroup extends
- AbstractLaunchConfigurationTabGroup {
+/**
+ * @author Rob Stryker
+ */
+public class OpenshiftLaunchTabGroup extends AbstractLaunchConfigurationTabGroup {
public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
setTabs(createTabs2(dialog, mode));
}
-
+
public ILaunchConfigurationTab[] createTabs2(ILaunchConfigurationDialog dialog, String mode) {
- return new ILaunchConfigurationTab[]{
+ return new ILaunchConfigurationTab[] {
new OpenshiftDefaultLaunchTab()
};
}
-
-
+
public class OpenshiftDefaultLaunchTab extends AbstractLaunchConfigurationTab {
public void createControl(Composite parent) {
@@ -54,19 +55,19 @@
@Override
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
// TODO Auto-generated method stub
-
+
}
@Override
public void initializeFrom(ILaunchConfiguration configuration) {
// TODO Auto-generated method stub
-
+
}
@Override
public void performApply(ILaunchConfigurationWorkingCopy configuration) {
// TODO Auto-generated method stub
-
+
}
@Override
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/command/ManageSSHKeysHandler.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/command/ManageSSHKeysHandler.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/command/ManageSSHKeysHandler.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -16,7 +16,7 @@
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.handlers.HandlerUtil;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.wizard.OkButtonWizardDialog;
import org.jboss.tools.openshift.express.internal.ui.wizard.ssh.ManageSSHKeysWizard;
@@ -33,8 +33,8 @@
ISelection selection = HandlerUtil.getCurrentSelection(event);
if (selection instanceof IStructuredSelection) {
Object selectedElement = ((IStructuredSelection) selection).getFirstElement();
- if (selectedElement instanceof UserDelegate) {
- UserDelegate user = (UserDelegate) selectedElement;
+ if (selectedElement instanceof Connection) {
+ Connection user = (Connection) selectedElement;
new OkButtonWizardDialog(HandlerUtil.getActiveShell(event), new ManageSSHKeysWizard(user)).open();
}
}
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleTypePropertyTester.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleTypePropertyTester.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleTypePropertyTester.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,35 +0,0 @@
-/**
- *
- */
-package org.jboss.tools.openshift.express.internal.ui.console;
-
-import static org.jboss.tools.openshift.express.internal.ui.console.ConsoleUtils.CONSOLE_TYPE_KEY;
-import static org.jboss.tools.openshift.express.internal.ui.console.ConsoleUtils.CONSOLE_TYPE_VALUE;
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.ui.console.MessageConsole;
-
-/**
- * Property tester used to verify that the given instance of
- * <code>org.eclipse.ui.console.MessageConsole</code> is an OpenShift Message
- * Console (that is, it should contain a specific attribute set a its creation).
- *
- * @author Xavier Coulon
- *
- */
-public class ConsoleTypePropertyTester extends PropertyTester {
-
- /**
- * Verifies that the given receiver, a <code>MessageConsole</code> contains
- * an attribute name <code>ConsoleUtils.CONSOLE_TYPE_KEY</code> with a value
- * set to <code>ConsoleUtils.CONSOLE_TYPE_VALUE</code>. Using the console
- * attributes avoids the need to create a subtype of
- * <code>MessageCode</code>.
- */
- @Override
- public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
- MessageConsole console = (MessageConsole) receiver;
- return (CONSOLE_TYPE_VALUE.equals(console.getAttribute(CONSOLE_TYPE_KEY)));
- }
-
-}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleTypePropertyTester.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleTypePropertyTester.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ConsoleTypePropertyTester.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * 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.console;
+
+import static org.jboss.tools.openshift.express.internal.ui.console.ConsoleUtils.CONSOLE_TYPE_KEY;
+import static org.jboss.tools.openshift.express.internal.ui.console.ConsoleUtils.CONSOLE_TYPE_VALUE;
+
+import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.ui.console.MessageConsole;
+
+/**
+ * Property tester used to verify that the given instance of
+ * <code>org.eclipse.ui.console.MessageConsole</code> is an OpenShift Message
+ * Console (that is, it should contain a specific attribute set a its creation).
+ *
+ * @author Xavier Coulon
+ *
+ */
+public class ConsoleTypePropertyTester extends PropertyTester {
+
+ /**
+ * Verifies that the given receiver, a <code>MessageConsole</code> contains
+ * an attribute name <code>ConsoleUtils.CONSOLE_TYPE_KEY</code> with a value
+ * set to <code>ConsoleUtils.CONSOLE_TYPE_VALUE</code>. Using the console
+ * attributes avoids the need to create a subtype of
+ * <code>MessageCode</code>.
+ */
+ @Override
+ public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
+ MessageConsole console = (MessageConsole) receiver;
+ return (CONSOLE_TYPE_VALUE.equals(console.getAttribute(CONSOLE_TYPE_KEY)));
+ }
+
+}
Deleted: 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-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ExpressConsoleView.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,59 +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.console;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-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;
-
-public class ExpressConsoleView extends CommonNavigator implements IUserModelListener {
- protected Object getInitialInput() {
- return UserModel.getDefault();
- }
-
- protected CommonViewer createCommonViewer(Composite aParent) {
- CommonViewer v = super.createCommonViewer(aParent);
- UserModel.getDefault().addListener(this);
- return v;
- }
-
- public void dispose() {
- UserModel.getDefault().removeListener(this);
- super.dispose();
- }
-
- public void refreshViewer() {
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- if (!DisposeUtils.isDisposed(getCommonViewer())) {
- getCommonViewer().refresh();
- }
- }
- });
- }
-
- public void userAdded(UserDelegate user) {
- refreshViewer();
- }
-
- public void userRemoved(UserDelegate user) {
- refreshViewer();
- }
-
- public void userChanged(UserDelegate user) {
- refreshViewer();
- }
-}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/JschToEclipseLogger.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/JschToEclipseLogger.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/JschToEclipseLogger.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.console;
import com.jcraft.jsch.Logger;
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/OpenShiftConsoleView.java (from rev 44283, 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/OpenShiftConsoleView.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/OpenShiftConsoleView.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * 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.console;
+
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.navigator.CommonNavigator;
+import org.eclipse.ui.navigator.CommonViewer;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
+import org.jboss.tools.openshift.express.internal.core.connection.IConnectionsModelListener;
+import org.jboss.tools.openshift.express.internal.ui.utils.DisposeUtils;
+
+/**
+ * @author Xavier Coulon
+ */
+public class OpenShiftConsoleView extends CommonNavigator implements IConnectionsModelListener {
+
+ protected Object getInitialInput() {
+ return ConnectionsModel.getDefault();
+ }
+
+ protected CommonViewer createCommonViewer(Composite aParent) {
+ CommonViewer v = super.createCommonViewer(aParent);
+ ConnectionsModel.getDefault().addListener(this);
+ return v;
+ }
+
+ public void dispose() {
+ ConnectionsModel.getDefault().removeListener(this);
+ super.dispose();
+ }
+
+ public void refreshViewer() {
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ if (!DisposeUtils.isDisposed(getCommonViewer())) {
+ getCommonViewer().refresh();
+ }
+ }
+ });
+ }
+
+ public void connectionAdded(Connection user) {
+ refreshViewer();
+ }
+
+ public void connectionRemoved(Connection user) {
+ refreshViewer();
+ }
+
+ public void connectionChanged(Connection user) {
+ refreshViewer();
+ }
+}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ServerTypePropertyTester.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ServerTypePropertyTester.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/ServerTypePropertyTester.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.console;
import org.eclipse.core.expressions.PropertyTester;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailConsolePageParticipant.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailConsolePageParticipant.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailConsolePageParticipant.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,6 +1,13 @@
-/**
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
*
- */
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.console;
import org.eclipse.ui.IActionBars;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/console/TailServerLogWorker.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.console;
import java.io.BufferedReader;
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/HostNameValidator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/HostNameValidator.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/HostNameValidator.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.ui.databinding;
+
+import java.util.regex.Pattern;
+
+import org.eclipse.core.databinding.validation.IValidator;
+import org.eclipse.core.databinding.validation.ValidationStatus;
+import org.eclipse.core.runtime.IStatus;
+import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class HostNameValidator implements IValidator {
+
+ private static final Pattern urlPattern =
+ Pattern.compile("(https?://){0,1}[^\\.:0-9]+(\\.[^\\.:0-9]+)*(:[0-9]+){0,1}");
+
+ @Override
+ public IStatus validate(Object value) {
+ String server = (String) value;
+ if (StringUtils.isEmpty(server)) {
+ return ValidationStatus.cancel("You have to provide a server to connect to.");
+ }
+ if (!urlPattern.matcher(server).matches()) {
+ return ValidationStatus.error("You have to provide a valid server to connect to.");
+ }
+ return ValidationStatus.ok();
+
+ }
+}
\ No newline at end of file
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/HostNameValidator.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/RequiredStringValidator.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/RequiredStringValidator.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/databinding/RequiredStringValidator.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -16,7 +16,15 @@
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
/**
+ * A validator that handles empty strings as invalid. Non-empty strings are
+ * valid.
+ * <p>
+ * Invalid states are reported via ValidationStatus.cancel("message") so that
+ * {@link RequiredControlDecorationUpdater} may decorate in custom way.
+ *
* @author Andre Dietisheim
+ *
+ * @see RequiredControlDecorationUpdater
*/
public class RequiredStringValidator implements IValidator {
@@ -32,9 +40,9 @@
if (StringUtils.isEmpty(name)) {
return ValidationStatus.cancel("You have to provide a " + fieldName);
}
- return validateString((String)value);
+ return validateString((String) value);
}
-
+
public IStatus validateString(String value) {
return ValidationStatus.ok();
}
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/AbstractLabelProvider.java (from rev 44206, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/LabelProvider.java)
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/AbstractLabelProvider.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/AbstractLabelProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * 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.explorer;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * @author Xavier Coulon
+ */
+public abstract class AbstractLabelProvider implements ILabelProvider {
+
+ @Override
+ public void addListener(ILabelProviderListener listener) {
+ }
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public boolean isLabelProperty(Object element, String property) {
+ return false;
+ }
+
+ @Override
+ public void removeListener(ILabelProviderListener listener) {
+ }
+
+ @Override
+ public Image getImage(Object element) {
+ return null;
+ }
+
+ @Override
+ public String getText(Object element) {
+ return null;
+ }
+
+}
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/ConnectToOpenShiftWizard.java (from rev 44206, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectToOpenShiftWizard.java)
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/ConnectToOpenShiftWizard.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/ConnectToOpenShiftWizard.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * 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.explorer;
+
+import org.eclipse.jface.wizard.Wizard;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
+import org.jboss.tools.openshift.express.internal.ui.wizard.ConnectToOpenShiftWizardModel;
+import org.jboss.tools.openshift.express.internal.ui.wizard.connection.ConnectionWizardPage;
+
+/**
+ * @author Xavier Coulon
+ */
+public class ConnectToOpenShiftWizard extends Wizard {
+
+ private final ConnectionWizardPage page;
+
+ /**
+ * Constructor to use when connecting with the default connection.
+ */
+ public ConnectToOpenShiftWizard() {
+ this(ConnectionsModel.getDefault().getRecentConnection());
+ }
+
+ /**
+ * Constructor to use when connection to use is known.
+ */
+ public ConnectToOpenShiftWizard(final Connection connection) {
+ this.page = new ConnectionWizardPage(this, new ConnectToOpenShiftWizardModel(connection));
+ setNeedsProgressMonitor(true);
+ }
+
+ @Override
+ public boolean performFinish() {
+ return page.connect();
+ }
+
+ @Override
+ public void addPages() {
+ addPage(page);
+ }
+}
\ No newline at end of file
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/OpenShiftExplorerContentCategory.java (from rev 44206, 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/explorer/OpenShiftExplorerContentCategory.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/OpenShiftExplorerContentCategory.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * 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.explorer;
+
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
+
+/**
+ * @author Xavier Coulon
+ */
+public class OpenShiftExplorerContentCategory {
+
+ private final Connection user;
+
+ public OpenShiftExplorerContentCategory(final Connection user) {
+ this.user = user;
+ }
+
+ /**
+ * @return the user
+ */
+ public Connection getUser() {
+ return user;
+ }
+
+
+}
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/OpenShiftExplorerContentProvider.java (from rev 44206, 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/explorer/OpenShiftExplorerContentProvider.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/OpenShiftExplorerContentProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,194 @@
+/*******************************************************************************
+ * 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.explorer;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Display;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
+
+import com.openshift.client.IApplication;
+import com.openshift.client.OpenShiftException;
+
+/**
+ * @author Xavier Coulon
+ *
+ */
+public class OpenShiftExplorerContentProvider implements ITreeContentProvider {
+
+ private StructuredViewer viewer;
+
+ @Override
+ public void dispose() {
+ // TODO Auto-generated method stub
+
+ }
+
+ @Override
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ this.viewer = (StructuredViewer) viewer;
+ }
+
+ public static class LoadingStub {
+ public LoadingStub() {
+ }
+ }
+
+ public static class NotConnectedUserStub {
+ public NotConnectedUserStub () {
+ }
+ }
+
+ // Keep track of what's loading and what's finished
+ private List<Object> loadedElements = new ArrayList<Object>();
+ private List<Object> loadingElements = new ArrayList<Object>();
+
+ private Map<Object, Exception> errors = new HashMap<Object, Exception>();
+
+ /**
+ * Called to obtain the root elements of the tree viewer, ie, the Users
+ */
+ @Override
+ public Object[] getElements(final Object parentElement) {
+ // A refresh on the whole model... clear our cache
+ loadedElements.clear();
+ loadingElements.clear();
+ errors.clear();
+ if (parentElement instanceof IWorkspaceRoot) {
+ return ConnectionsModel.getDefault().getConnections();
+ }
+ if (parentElement instanceof ConnectionsModel) {
+ Connection[] users = ((ConnectionsModel) parentElement).getConnections();
+ return users;
+ }
+ return new Object[0];
+ }
+
+ /**
+ * Called to obtain the children of any element in the tree viewer, ie, from a user or an application
+ */
+ @Override
+ public Object[] getChildren(Object parentElement) {
+ if (parentElement instanceof Connection) {
+ Connection user = (Connection) parentElement;
+ if(!user.isConnected() && !user.canPromptForPassword()) {
+ return new Object[]{new NotConnectedUserStub()};
+ }
+ return loadChildren(parentElement);
+ } else if(parentElement instanceof IApplication) {
+ return loadChildren(parentElement);
+ }
+ return getChildrenForElement(parentElement);
+ }
+
+ /**
+ * @param parentElement
+ * @return
+ */
+ private Object[] loadChildren(Object parentElement) {
+ if (!loadedElements.contains(parentElement)) {
+ if (!loadingElements.contains(parentElement)) {
+ // Load the data
+ launchLoadingJob(parentElement);
+ }
+ // return a stub object that says loading...
+ return new Object[] { new LoadingStub() };
+ }
+ Exception ose = errors.get(parentElement);
+ if( ose != null ) {
+ return new Object[]{ose};
+ }
+ return getChildrenForElement(parentElement);
+ }
+
+
+
+ private Object[] getChildrenForElement(Object parentElement) {
+ // .... the actual work is done here...
+ Object[] children = new Object[0];
+ try {
+ if (parentElement instanceof OpenShiftExplorerContentCategory) {
+ Connection user = ((OpenShiftExplorerContentCategory) parentElement).getUser();
+ children = new Object[] { user };
+ } else if (parentElement instanceof Connection) {
+ final Connection user = (Connection) parentElement;
+ if (user.hasDomain()) {
+ children = user.getApplications().toArray();
+ }
+ } else if (parentElement instanceof IApplication) {
+ children = ((IApplication) parentElement).getEmbeddedCartridges().toArray();
+ }
+ } catch(OpenShiftException e) {
+ errors.put(parentElement, e);
+ }
+
+ return children;
+ }
+
+ private void launchLoadingJob(final Object element) {
+ Job job = new Job("Loading OpenShift information...") {
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ monitor.beginTask("Loading OpenShift information...", IProgressMonitor.UNKNOWN);
+ monitor.worked(1);
+ // Get the actual children, with the delay
+ loadingElements.add(element);
+ getChildrenForElement(element); //Boolean.valueOf(System.getProperty("org.jboss.tools.openshift.express.ui.eagerloading", "true"))); // JBIDE-11680 false = fast, but blocks ui while loading cartridges, true = slow, but no blocking since cartridges is forced loaded.
+ loadedElements.add(element);
+ loadingElements.remove(element);
+ refreshViewerObject(element);
+ monitor.done();
+ return Status.OK_STATUS;
+ }
+ };
+ job.setPriority(Job.LONG);
+ job.schedule();
+ }
+
+ private void refreshViewerObject(final Object object) {
+ Display.getDefault().asyncExec(new Runnable() {
+ public void run() {
+ viewer.refresh(object);
+ }
+ });
+ }
+
+ @Override
+ public Object getParent(Object element) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public boolean hasChildren(Object element) {
+ if (element instanceof Connection) {
+ return true;
+ }
+ if (element instanceof IApplication) {
+ return true;
+ }
+ return false;
+ }
+
+}
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/OpenShiftExplorerLabelProvider.java (from rev 44206, 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/explorer/OpenShiftExplorerLabelProvider.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/OpenShiftExplorerLabelProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,128 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.ui.explorer;
+
+import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ILabelProviderListener;
+import org.eclipse.jface.viewers.StyledString;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftImages;
+import org.jboss.tools.openshift.express.internal.ui.explorer.OpenShiftExplorerContentProvider.LoadingStub;
+import org.jboss.tools.openshift.express.internal.ui.explorer.OpenShiftExplorerContentProvider.NotConnectedUserStub;
+import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
+
+import com.openshift.client.IApplication;
+import com.openshift.client.IEmbeddedCartridge;
+import com.openshift.client.OpenShiftException;
+
+/**
+ * @author Xavier Coulon
+ * @author Andre Dietisheim
+ */
+public class OpenShiftExplorerLabelProvider implements IStyledLabelProvider, ILabelProvider {
+
+ @Override
+ public void addListener(ILabelProviderListener listener) {
+ }
+
+ @Override
+ public void dispose() {
+ }
+
+ @Override
+ public boolean isLabelProperty(Object element, String property) {
+ return false;
+ }
+
+ @Override
+ public void removeListener(ILabelProviderListener listener) {
+ }
+
+ @Override
+ public Image getImage(Object element) {
+ Image image = null;
+ if (element instanceof Connection) {
+ image = OpenShiftImages.REPO_MIDDLE_IMG;
+ } else if (element instanceof IApplication) {
+ image = OpenShiftImages.QUERY_IMG;
+ } else if (element instanceof IEmbeddedCartridge) {
+ image = OpenShiftImages.TASK_REPO_IMG;
+ } else if (element instanceof LoadingStub) {
+ image = OpenShiftImages.SYSTEM_PROCESS_IMG;
+ } else if (element instanceof OpenShiftException) {
+ image = PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
+ }
+ return image;
+ }
+
+ @Override
+ public String getText(Object element) {
+ return getStyledText(element).getString();
+ }
+
+ @Override
+ public StyledString getStyledText(Object element) {
+ StyledString styledString = null;
+ if (element instanceof Connection) {
+ styledString = createStyledString((Connection) element);
+ }
+ else if (element instanceof IApplication) {
+ styledString = createStyledString((IApplication) element);
+ }
+ else if (element instanceof IEmbeddedCartridge) {
+ styledString = createStyledString((IEmbeddedCartridge) element);
+ }
+ else if (element instanceof LoadingStub) {
+ styledString = new StyledString(OpenShiftExpressUIMessages.LOADING_USER_APPLICATIONS_LABEL);
+ }
+ else if (element instanceof NotConnectedUserStub) {
+ styledString = new StyledString(OpenShiftExpressUIMessages.USER_NOT_CONNECTED_LABEL);
+ }
+ else if (element instanceof OpenShiftException) {
+ styledString = new StyledString(((OpenShiftException) element).getMessage());
+ }
+ return styledString;
+ }
+
+ private StyledString createStyledString(Connection connection) {
+// String name = connection.getName();
+ String name = connection.getUsername();
+ String server = connection.getHost();
+ String label = new StringBuilder(name)
+ .append(' ')
+ .append(server)
+ .toString();
+ StyledString styledString = new StyledString(label);
+ styledString.setStyle(name.length() + 1, server.length(), StyledString.QUALIFIER_STYLER);
+ return styledString;
+ }
+
+ private StyledString createStyledString(IApplication application) {
+ String appName = application.getName();
+ String appType = application.getCartridge().getName();
+ StringBuilder sb = new StringBuilder(appName).append(' ').append(appType);
+ StyledString styledString = new StyledString(sb.toString());
+ styledString.setStyle(appName.length() + 1, appType.length(), StyledString.QUALIFIER_STYLER);
+ return styledString;
+ }
+
+ private StyledString createStyledString(IEmbeddedCartridge cartridge) {
+ String label = cartridge.getName();
+ StyledString styledString = new StyledString(label);
+ styledString.setStyle(0, label.length(), StyledString.DECORATIONS_STYLER);
+ return new StyledString(label);
+ }
+
+}
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/OpenShiftExplorerView.java (from rev 44206, 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/explorer/OpenShiftExplorerView.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/OpenShiftExplorerView.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * 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.explorer;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.window.Window;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.StackLayout;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.ui.navigator.CommonViewer;
+import org.eclipse.ui.part.ViewPart;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
+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.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
+import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
+
+/**
+ * @author Xavier Coulon
+ *
+ */
+public class OpenShiftExplorerView extends ViewPart implements ITabbedPropertySheetPageContributor {
+
+ private static final String VIEWER_ID = "org.jboss.tools.openshift.express.ui.viewer.expressConsoleViewer";
+
+ private Composite loginContainer = null;
+ private CommonViewer commonViewer = null;
+ private final StackLayout layout = new StackLayout();
+ private Composite stackContainer = null;
+ private TabbedPropertySheetPage tabbedPropertySheetPage;
+
+ @Override
+ public void createPartControl(Composite parent) {
+ stackContainer = new Composite(parent, SWT.NONE);
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(stackContainer);
+ stackContainer.setLayout(layout);
+ loginContainer = new Composite(stackContainer, SWT.BORDER);
+ GridLayoutFactory.fillDefaults().margins(6, 6).applyTo(loginContainer);
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(loginContainer);
+ loginContainer.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+ Link loginLink = new Link(loginContainer, SWT.WRAP);
+ loginLink.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
+ loginLink.setText("Click <a>here</a> to connect to your OpenShift account.");
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(loginLink);
+ loginLink.addSelectionListener(onLoginLinkClicked());
+
+ commonViewer = new CommonViewer(VIEWER_ID, stackContainer, SWT.BORDER);
+ GridLayoutFactory.fillDefaults().applyTo(commonViewer.getTree());
+ GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(commonViewer.getTree());
+ commonViewer.setContentProvider(new OpenShiftExplorerContentProvider());
+ commonViewer.setLabelProvider(new OpenShiftExplorerLabelProvider());
+ getSite().setSelectionProvider(commonViewer);
+ layout.topControl = loginContainer;
+ }
+
+ private SelectionListener onLoginLinkClicked() {
+ return new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ final IWizard connectToOpenShiftWizard = new ConnectToOpenShiftWizard();
+ int returnCode = WizardUtils.openWizardDialog(connectToOpenShiftWizard, commonViewer.getTree().getShell());
+ if (returnCode == Window.OK) {
+ Logger.debug("OpenShift Auth succeeded.");
+ final Connection user = ConnectionsModel.getDefault().getRecentConnection();
+ getCommonViewer().setInput(new OpenShiftExplorerContentCategory(user));
+ switchToCommonViewer();
+ }
+ }
+ };
+ }
+
+ @Override
+ public void setFocus() {
+ layout.topControl.setFocus();
+ }
+
+
+ public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+ if (adapter == IPropertySheetPage.class) {
+ if (tabbedPropertySheetPage == null) {
+ tabbedPropertySheetPage = new TabbedPropertySheetPage(this);
+ }
+ return tabbedPropertySheetPage;
+ }
+ return super.getAdapter(adapter);
+ }
+
+ public void switchToCommonViewer() {
+ layout.topControl = this.commonViewer.getTree();
+ stackContainer.layout();
+ }
+
+ public CommonViewer getCommonViewer() {
+ return this.commonViewer;
+ }
+
+ @Override
+ public String getContributorId() {
+ return VIEWER_ID;
+ }
+
+}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionDelegate/OpenConnectionDialogActionDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionDelegate/OpenConnectionDialogActionDelegate.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionDelegate/OpenConnectionDialogActionDelegate.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,32 +1,49 @@
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionDelegate;
+/*******************************************************************************
+ * 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.explorer.actionDelegate;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.ISelectionService;
import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.navigator.CommonNavigator;
import org.jboss.tools.common.ui.WizardUtils;
-import org.jboss.tools.openshift.express.internal.core.console.UserModel;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
+import org.jboss.tools.openshift.express.internal.ui.explorer.ConnectToOpenShiftWizard;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
-import org.jboss.tools.openshift.express.internal.ui.viewer.ConnectToOpenShiftWizard;
+/**
+ * @author Xavier Coulon
+ */
public class OpenConnectionDialogActionDelegate implements IViewActionDelegate {
private CommonNavigator view;
+ private Connection selectedConnection;
@Override
public void run(IAction action) {
final Shell shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
- final IWizard connectToOpenShiftWizard = new ConnectToOpenShiftWizard();
+ final IWizard connectToOpenShiftWizard = new ConnectToOpenShiftWizard(selectedConnection);
int returnCode = WizardUtils.openWizardDialog(connectToOpenShiftWizard, shell);
if (returnCode == Window.OK) {
Logger.debug("OpenShift Auth succeeded.");
if (view != null) {
- view.getCommonViewer().setInput(UserModel.getDefault());
+ view.getCommonViewer().setInput(ConnectionsModel.getDefault());
}
}
@@ -34,9 +51,20 @@
@Override
public void selectionChanged(IAction action, ISelection selection) {
+ selectedConnection = getSelectedConnection(selection);
+ }
+ private Connection getSelectedConnection(ISelection selection) {
+ Connection selectedConnection = null;
+ if (selection instanceof IStructuredSelection) {
+ Object selectedItem = ((IStructuredSelection) selection).getFirstElement();
+ if (selectedItem instanceof Connection) {
+ selectedConnection = (Connection) selectedItem;
+ }
+ }
+ return selectedConnection;
}
-
+
@Override
public void init(IViewPart view) {
if (view instanceof CommonNavigator) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionDelegate/RefreshViewerActionDelegate.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionDelegate/RefreshViewerActionDelegate.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionDelegate/RefreshViewerActionDelegate.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,14 +1,27 @@
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionDelegate;
+/*******************************************************************************
+ * 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.explorer.actionDelegate;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ui.IViewActionDelegate;
import org.eclipse.ui.IViewPart;
-import org.jboss.tools.openshift.express.internal.ui.console.ExpressConsoleView;
+import org.jboss.tools.openshift.express.internal.ui.console.OpenShiftConsoleView;
+/**
+ * @author Xavier Coulon
+ */
public class RefreshViewerActionDelegate implements IViewActionDelegate {
- private ExpressConsoleView view;
+ private OpenShiftConsoleView view;
protected ISelection selection;
@@ -24,8 +37,8 @@
@Override
public void init(IViewPart view) {
- if (view instanceof ExpressConsoleView) {
- this.view = (ExpressConsoleView) view;
+ if (view instanceof OpenShiftConsoleView) {
+ this.view = (OpenShiftConsoleView) view;
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/AbstractOpenShiftExplorerViewerActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/AbstractOpenShiftExplorerViewerActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/AbstractOpenShiftExplorerViewerActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.eclipse.jface.action.IMenuManager;
import org.eclipse.ui.navigator.CommonActionProvider;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ApplicationPortForwardingActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ApplicationPortForwardingActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ApplicationPortForwardingActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,4 +1,4 @@
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.ApplicationPortForwardingAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/CreateApplicationActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateApplicationActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/CreateApplicationActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.CreateApplicationAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/CreateOrEditDomainActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateOrEditDomainActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/CreateOrEditDomainActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.CreateOrEditDomainAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/CreateServerAdapterActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/CreateServerAdapterActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/CreateServerAdapterActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.CreateServerAdapterAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/DeleteApplicationActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteApplicationActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/DeleteApplicationActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.DeleteApplicationAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/DeleteConnectionActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteConnectionActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/DeleteConnectionActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.DeleteConnectionAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/DeleteDomainActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/DeleteDomainActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/DeleteDomainActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.DeleteDomainAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/EditCartridgesActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/EditCartridgesActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/EditCartridgesActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.EditCartridgesAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ImportApplicationActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ImportApplicationActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ImportApplicationActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.ImportApplicationAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/OpenInWebBrowserActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/OpenInWebBrowserActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/OpenInWebBrowserActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.OpenInWebBrowserAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/RefreshElementActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/RefreshElementActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/RefreshElementActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.RefreshElementAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ShowDetailsActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowDetailsActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ShowDetailsActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.ShowDetailsAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ShowEnvironmentActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowEnvironmentActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ShowEnvironmentActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.ShowEnvironmentAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ShowPropertiesActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/ShowPropertiesActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/ShowPropertiesActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.ShowPropertiesAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/TailServerLogActionProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/actionProvider/TailServerLogActionProvider.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/actionProvider/TailServerLogActionProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.actionProvider;
+package org.jboss.tools.openshift.express.internal.ui.explorer.actionProvider;
import org.jboss.tools.openshift.express.internal.ui.action.TailServerLogAction;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/ApplicationPropertySource.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/ApplicationPropertySource.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/ApplicationPropertySource.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.property;
+package org.jboss.tools.openshift.express.internal.ui.explorer.property;
import java.text.SimpleDateFormat;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/EmbeddableCartridgePropertySource.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/EmbeddableCartridgePropertySource.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/EmbeddableCartridgePropertySource.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.property;
+package org.jboss.tools.openshift.express.internal.ui.explorer.property;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/PropertySourceAdapterFactory.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/PropertySourceAdapterFactory.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/PropertySourceAdapterFactory.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,11 +8,11 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.property;
+package org.jboss.tools.openshift.express.internal.ui.explorer.property;
import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.ui.views.properties.IPropertySource;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import com.openshift.client.IApplication;
import com.openshift.client.IEmbeddedCartridge;
@@ -26,8 +26,8 @@
@Override
public Object getAdapter(Object adaptableObject, @SuppressWarnings("rawtypes") Class adapterType) {
if(adapterType == IPropertySource.class) {
- if(adaptableObject instanceof UserDelegate) {
- return new UserPropertySource((UserDelegate)adaptableObject);
+ if(adaptableObject instanceof Connection) {
+ return new UserPropertySource((Connection)adaptableObject);
}
if(adaptableObject instanceof IApplication) {
return new ApplicationPropertySource((IApplication)adaptableObject);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/TypeMapper.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/TypeMapper.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/TypeMapper.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.property;
+package org.jboss.tools.openshift.express.internal.ui.explorer.property;
import org.eclipse.jface.viewers.TreeNode;
import org.eclipse.ui.views.properties.tabbed.AbstractTypeMapper;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/UserPropertySection.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySection.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/UserPropertySection.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.property;
+package org.jboss.tools.openshift.express.internal.ui.explorer.property;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.swt.SWT;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/UserPropertySource.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/property/UserPropertySource.java 2012-10-02 09:57:33 UTC (rev 44206)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/explorer/property/UserPropertySource.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -8,7 +8,7 @@
* Contributors:
* Red Hat, Inc. - initial API and implementation
******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.viewer.property;
+package org.jboss.tools.openshift.express.internal.ui.explorer.property;
import java.lang.reflect.InvocationTargetException;
@@ -20,7 +20,7 @@
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.PropertyDescriptor;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -33,9 +33,9 @@
private static final String PROPERTY_DOMAIN = "Domain";
private static final String PROPERTY_USERNAME = "Username";
- private final UserDelegate user;
+ private final Connection user;
- public UserPropertySource(UserDelegate user) {
+ public UserPropertySource(Connection user) {
this.user = user;
}
@@ -80,8 +80,10 @@
public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
monitor.beginTask("Checking Remote Details", 200);
try {
- if( !user.isConnected() && user.canPromptForPassword())
- user.checkForPassword();
+ if( !user.isConnected()
+ && user.canPromptForPassword()) {
+ user.connect();
+ }
monitor.worked(100);
if( user.isConnected())
user.getDefaultDomain();
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/CreateApplicationJob.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -20,7 +20,7 @@
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
@@ -37,7 +37,7 @@
*/
public class CreateApplicationJob extends AbstractDelegatingMonitorJob {
- private UserDelegate user;
+ private Connection user;
private String name;
private ICartridge cartridge;
private ApplicationScale scale;
@@ -45,7 +45,7 @@
private IApplication application;
public CreateApplicationJob(final String name, final ICartridge cartridge, final ApplicationScale scale,
- final IGearProfile gear, UserDelegate user) {
+ final IGearProfile gear, Connection user) {
super(NLS.bind(OpenShiftExpressUIMessages.CREATING_APPLICATION, name));
this.name = name;
this.cartridge = cartridge;
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/LoadKeysJob.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/LoadKeysJob.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/job/LoadKeysJob.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -16,7 +16,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import com.openshift.client.IOpenShiftSSHKey;
@@ -25,10 +25,10 @@
*/
public class LoadKeysJob extends Job {
- private UserDelegate user;
+ private Connection user;
private List<IOpenShiftSSHKey> keys;
- public LoadKeysJob(UserDelegate user) {
+ public LoadKeysJob(Connection user) {
super("Loading SSH keys... ");
this.user = user;
}
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/IOpenShiftPreferenceConstants.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/IOpenShiftPreferenceConstants.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/IOpenShiftPreferenceConstants.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.ui.preferences;
+
+/**
+ * @author Andre Dietisheim
+ */
+public interface IOpenShiftPreferenceConstants {
+
+ /** available connections */
+ public static final String CONNECTIONS = "org.jboss.tools.openshift.express.CONNECTION_NAMES";
+ /** the prefs key used in prior versions */
+ public static final String RHLOGIN_LIST_PREFS_KEY = "org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardModel_RHLOGIN_LIST";
+ /** last user name */
+ public static final String LAST_USERNAME = "org.jboss.tools.openshift.express.LAST_USERNAME";
+ /** server history */
+ public static final String SERVERS = "org.jboss.tools.openshift.express.SERVERS";
+ /** default server */
+ public static final String DEFAULT_SERVER = "org.jboss.tools.openshift.express.SERVER";
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/IOpenShiftPreferenceConstants.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/OpenShiftPreferences.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/OpenShiftPreferences.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/OpenShiftPreferences.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.ui.preferences;
+
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.jboss.tools.common.ui.preferencevalue.StringPreferenceValue;
+import org.jboss.tools.common.ui.preferencevalue.StringsPreferenceValue;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class OpenShiftPreferences implements IOpenShiftPreferenceConstants {
+
+ public static final OpenShiftPreferences INSTANCE = new OpenShiftPreferences();
+
+ private StringsPreferenceValue connectionsPreferenceValue;
+ private StringsPreferenceValue legacyConnections;
+ private StringPreferenceValue lastUsernamePreferenceValue;
+
+ private OpenShiftPreferences() {
+ this.connectionsPreferenceValue =
+ new StringsPreferenceValue('|', CONNECTIONS, OpenShiftUIActivator.PLUGIN_ID);
+ this.legacyConnections = new StringsPreferenceValue('|', RHLOGIN_LIST_PREFS_KEY, OpenShiftUIActivator.PLUGIN_ID);
+ this.lastUsernamePreferenceValue =
+ new StringPreferenceValue(LAST_USERNAME, OpenShiftUIActivator.PLUGIN_ID);
+ }
+
+ public IPreferenceStore getPreferencesStore() {
+ return OpenShiftUIActivator.getDefault().getPreferenceStore();
+ }
+
+ public String getDefaultServer() {
+ return getPreferencesStore().getString(DEFAULT_SERVER);
+ }
+
+ public String getLastUsername() {
+ return lastUsernamePreferenceValue.get();
+ }
+
+ public void saveLastUsername(String username) {
+ lastUsernamePreferenceValue.store(username);
+ }
+
+ public String[] getConnections() {
+ return connectionsPreferenceValue.get();
+ }
+
+ public void saveConnections(String[] connections) {
+ connectionsPreferenceValue.store(connections);
+ }
+
+ public String[] getLegacyConnections() {
+ return legacyConnections.get();
+ }
+
+ public void flush() {
+ // TODO: implement
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/OpenShiftPreferences.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/ServerPreferencePage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/ServerPreferencePage.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/ServerPreferencePage.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.ui.preferences;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class ServerPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+
+ public ServerPreferencePage() {
+ super(GRID);
+ }
+
+ @Override
+ protected Control createContents(Composite parent) {
+ Control control = super.createContents(parent);
+ createServerControls((Composite) control);
+ return control;
+ }
+
+ private void createServerControls(Composite parent) {
+ Group defaultServerGroup = new Group(parent, SWT.NONE);
+ defaultServerGroup.setText("Default Server");
+ GridDataFactory.fillDefaults().grab(true, true).hint(SWT.FILL, SWT.FILL).applyTo(defaultServerGroup);
+ GridLayoutFactory.fillDefaults()
+ .numColumns(2).applyTo(defaultServerGroup);
+ }
+
+ public void createFieldEditors() {
+ addField(new StringFieldEditor(
+ OpenShiftPreferences.DEFAULT_SERVER
+ , OpenShiftPreferences.INSTANCE.getDefaultServer()
+ , getFieldEditorParent()));
+ }
+
+ public void init(IWorkbench workbench) {
+ setPreferenceStore(OpenShiftPreferences.INSTANCE.getPreferencesStore());
+ setDescription("Server");
+ }
+
+ @Override
+ public boolean performOk() {
+ OpenShiftPreferences.INSTANCE.flush();
+ return super.performOk();
+ }
+}
\ No newline at end of file
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/preferences/ServerPreferencePage.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/CollectionUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/CollectionUtils.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/CollectionUtils.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.ui.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class CollectionUtils {
+
+ public static <E> List<E> toList(E[] elements) {
+ List<E> list = new ArrayList<E>(elements.length);
+ for (E element : elements) {
+ list.add(element);
+ }
+ return list;
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/CollectionUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ContentProposalUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ContentProposalUtils.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ContentProposalUtils.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,81 @@
+/*******************************************************************************
+ * 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.utils;
+
+import org.eclipse.jface.bindings.keys.KeyStroke;
+import org.eclipse.jface.fieldassist.ContentProposalAdapter;
+import org.eclipse.jface.fieldassist.ControlDecoration;
+import org.eclipse.jface.fieldassist.FieldDecorationRegistry;
+import org.eclipse.jface.fieldassist.SimpleContentProposalProvider;
+import org.eclipse.jface.fieldassist.TextContentAdapter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.FocusAdapter;
+import org.eclipse.swt.events.FocusEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.common.ui.preferencevalue.StringsPreferenceValue;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class ContentProposalUtils {
+
+ public static ContentProposalAdapter createPreferencesBacked(final Text text, String preferencesKey,
+ String pluginId) {
+ final ControlDecoration decoration = createContenAssistDecoration("History available", text);
+
+ final StringsPreferenceValue preferencesValues =
+ new StringsPreferenceValue(',', preferencesKey, pluginId);
+ SimpleContentProposalProvider proposalProvider = new SimpleContentProposalProvider(preferencesValues.get());
+ proposalProvider.setFiltering(true);
+ text.addFocusListener(new FocusAdapter() {
+
+ @Override
+ public void focusGained(FocusEvent e) {
+ decoration.show();
+ }
+
+ @Override
+ public void focusLost(FocusEvent e) {
+ decoration.hide();
+ String value = text.getText();
+ if (value != null && value.length() > 0) {
+ preferencesValues.add(text.getText());
+ preferencesValues.store();
+ }
+ }
+
+ });
+ KeyStroke keyStroke = KeyStroke.getInstance(SWT.CONTROL, ' ');
+ ContentProposalAdapter proposalAdapter =
+ new ContentProposalAdapter(text, new TextContentAdapter(), proposalProvider, keyStroke, null);
+ proposalAdapter.setProposalAcceptanceStyle(ContentProposalAdapter.PROPOSAL_REPLACE);
+ return proposalAdapter;
+ }
+
+ private static ControlDecoration createContenAssistDecoration(String tooltip, Control control) {
+ return createDecoration(tooltip, FieldDecorationRegistry.DEC_CONTENT_PROPOSAL, SWT.RIGHT | SWT.TOP,
+ control);
+ }
+
+ private static ControlDecoration createDecoration(String text, String fieldDecorationImageKey, int position,
+ Control control) {
+ ControlDecoration decoration = new ControlDecoration(control, position);
+ Image errorImage = FieldDecorationRegistry.getDefault()
+ .getFieldDecoration(fieldDecorationImageKey).getImage();
+ decoration.setImage(errorImage);
+ decoration.setDescriptionText(text);
+ decoration.setShowHover(true);
+ decoration.hide();
+ return decoration;
+ }
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/ContentProposalUtils.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/UIUtils.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/UIUtils.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/utils/UIUtils.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -27,8 +27,10 @@
import org.eclipse.swt.widgets.Event;
import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.menus.IMenuService;
@@ -151,5 +153,16 @@
public static interface IWidgetVisitor {
public void visit(Control control);
}
+
+ public static Shell getShell() {
+ Shell shell = null;
+ final IWorkbenchWindow window =
+ PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+ if (window != null) {
+ shell = window.getShell();
+ }
+ return shell;
+ }
+
}
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectToOpenShiftWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectToOpenShiftWizard.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/ConnectToOpenShiftWizard.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,57 +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.viewer;
-
-import org.eclipse.jface.wizard.Wizard;
-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.wizard.ConnectToOpenShiftWizardModel;
-import org.jboss.tools.openshift.express.internal.ui.wizard.credentials.CredentialsWizardPage;
-
-/**
- * @author Xavier Coulon
- */
-public class ConnectToOpenShiftWizard extends Wizard {
-
- private final CredentialsWizardPage page;
-
- /**
- * Constructor to use when connecting with the default user.
- */
- public ConnectToOpenShiftWizard() {
- this(UserModel.getDefault().getRecentUser());
- }
-
- /**
- * Constructor to use when user to connect is known.
- */
- public ConnectToOpenShiftWizard(final UserDelegate user) {
- this.page = new CredentialsWizardPage(this, new ConnectToOpenShiftWizardModel(user));
- setNeedsProgressMonitor(true);
- }
-
- @Override
- public boolean performFinish() {
- if(page.performAuthentication()) {
- return true;
- }
- return false;
- }
-
- @Override
- public void addPages() {
- addPage(page);
- }
-
- public UserDelegate getUser() {
- return page.getUser();
- }
-}
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/LabelProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/LabelProvider.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/LabelProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,58 +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.viewer;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author Xavier Coulon
- */
-public class LabelProvider implements ILabelProvider {
-
- @Override
- public void addListener(ILabelProviderListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public boolean isLabelProperty(Object element, String property) {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public void removeListener(ILabelProviderListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public Image getImage(Object element) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public String getText(Object element) {
- // TODO Auto-generated method stub
- return null;
- }
-
-}
Deleted: 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-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftConsoleExpressView.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,135 +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.viewer;
-
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.navigator.CommonViewer;
-import org.eclipse.ui.part.ViewPart;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-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;
-
-/**
- * @author Xavier Coulon
- *
- */
-public class OpenShiftConsoleExpressView extends ViewPart implements ITabbedPropertySheetPageContributor {
-
- private static final String VIEWER_ID = "org.jboss.tools.openshift.express.ui.viewer.expressConsoleViewer";
-
- private Composite loginContainer = null;
-
- private CommonViewer commonViewer = null;
-
- private final StackLayout layout = new StackLayout();
-
- private Composite stackContainer = null;
-
- private TabbedPropertySheetPage tabbedPropertySheetPage;
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.navigator.CommonNavigator#createPartControl(org.eclipse.swt.widgets.Composite)
- */
- @Override
- public void createPartControl(Composite parent) {
- stackContainer = new Composite(parent, SWT.NONE);
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(stackContainer);
- stackContainer.setLayout(layout);
- loginContainer = new Composite(stackContainer, SWT.BORDER);
- GridLayoutFactory.fillDefaults().margins(6, 6).applyTo(loginContainer);
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(loginContainer);
- loginContainer.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- Link loginLink = new Link(loginContainer, SWT.WRAP);
- loginLink.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
- loginLink.setText("Click <a>here</a> to connect to your OpenShift account.");
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(loginLink);
- loginLink.addSelectionListener(onLoginLinkClicked());
-
- commonViewer = new CommonViewer(VIEWER_ID, stackContainer, SWT.BORDER);
- GridLayoutFactory.fillDefaults().applyTo(commonViewer.getTree());
- GridDataFactory.fillDefaults().align(SWT.FILL, SWT.FILL).grab(true, true).applyTo(commonViewer.getTree());
- commonViewer.setContentProvider(new OpenShiftExpressConsoleContentProvider());
- commonViewer.setLabelProvider(new OpenShiftExpressConsoleLabelProvider());
- getSite().setSelectionProvider(commonViewer);
- layout.topControl = loginContainer;
- }
-
- private SelectionListener onLoginLinkClicked() {
- SelectionListener listener = new SelectionListener() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- final Display display = Display.getCurrent();
- final Shell shell = new Shell(display);
- final IWizard connectToOpenShiftWizard = new ConnectToOpenShiftWizard();
- int returnCode = WizardUtils.openWizardDialog(connectToOpenShiftWizard, shell);
- if (returnCode == Window.OK) {
- Logger.debug("OpenShift Auth succeeded.");
- final UserDelegate user = UserModel.getDefault().getRecentUser();
- getCommonViewer().setInput(new OpenShiftExpressConsoleContentCategory(user));
- switchToCommonViewer();
- }
- }
-
- @Override
- public void widgetDefaultSelected(SelectionEvent e) {
- }
- };
- return listener;
- }
-
- @Override
- public void setFocus() {
- layout.topControl.setFocus();
- }
-
-
- public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
- if (adapter == IPropertySheetPage.class) {
- if (tabbedPropertySheetPage == null) {
- tabbedPropertySheetPage = new TabbedPropertySheetPage(this);
- }
- return tabbedPropertySheetPage;
- }
- return super.getAdapter(adapter);
- }
-
- public void switchToCommonViewer() {
- layout.topControl = this.commonViewer.getTree();
- stackContainer.layout();
- }
-
- public CommonViewer getCommonViewer() {
- return this.commonViewer;
- }
-
- @Override
- public String getContributorId() {
- return VIEWER_ID;
- }
-
-}
Deleted: 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-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentCategory.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,34 +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.viewer;
-
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
-
-/**
- * @author Xavier Coulon
- */
-public class OpenShiftExpressConsoleContentCategory {
-
- private final UserDelegate user;
-
- public OpenShiftExpressConsoleContentCategory(final UserDelegate user) {
- this.user = user;
- }
-
- /**
- * @return the user
- */
- public UserDelegate getUser() {
- return user;
- }
-
-
-}
Deleted: 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-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,194 +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.viewer;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-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 com.openshift.client.IApplication;
-import com.openshift.client.OpenShiftException;
-
-/**
- * @author Xavier Coulon
- *
- */
-public class OpenShiftExpressConsoleContentProvider implements ITreeContentProvider {
-
- private StructuredViewer viewer;
-
- @Override
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- this.viewer = (StructuredViewer) viewer;
- }
-
- public static class LoadingStub {
- public LoadingStub() {
- }
- }
-
- public static class NotConnectedUserStub {
- public NotConnectedUserStub () {
- }
- }
-
- // Keep track of what's loading and what's finished
- private List<Object> loadedElements = new ArrayList<Object>();
- private List<Object> loadingElements = new ArrayList<Object>();
-
- private Map<Object, Exception> errors = new HashMap<Object, Exception>();
-
- /**
- * Called to obtain the root elements of the tree viewer, ie, the Users
- */
- @Override
- public Object[] getElements(final Object parentElement) {
- // A refresh on the whole model... clear our cache
- loadedElements.clear();
- loadingElements.clear();
- errors.clear();
- if (parentElement instanceof IWorkspaceRoot) {
- return UserModel.getDefault().getUsers();
- }
- if (parentElement instanceof UserModel) {
- UserDelegate[] users = ((UserModel) parentElement).getUsers();
- return users;
- }
- return new Object[0];
- }
-
- /**
- * Called to obtain the children of any element in the tree viewer, ie, from a user or an application
- */
- @Override
- public Object[] getChildren(Object parentElement) {
- if (parentElement instanceof UserDelegate) {
- UserDelegate user = (UserDelegate) parentElement;
- if(!user.isConnected() && !user.canPromptForPassword()) {
- return new Object[]{new NotConnectedUserStub()};
- }
- return loadChildren(parentElement);
- } else if(parentElement instanceof IApplication) {
- return loadChildren(parentElement);
- }
- return getChildrenForElement(parentElement);
- }
-
- /**
- * @param parentElement
- * @return
- */
- private Object[] loadChildren(Object parentElement) {
- if (!loadedElements.contains(parentElement)) {
- if (!loadingElements.contains(parentElement)) {
- // Load the data
- launchLoadingJob(parentElement);
- }
- // return a stub object that says loading...
- return new Object[] { new LoadingStub() };
- }
- Exception ose = errors.get(parentElement);
- if( ose != null ) {
- return new Object[]{ose};
- }
- return getChildrenForElement(parentElement);
- }
-
-
-
- private Object[] getChildrenForElement(Object parentElement) {
- // .... the actual work is done here...
- Object[] children = new Object[0];
- try {
- if (parentElement instanceof OpenShiftExpressConsoleContentCategory) {
- UserDelegate user = ((OpenShiftExpressConsoleContentCategory) parentElement).getUser();
- children = new Object[] { user };
- } else if (parentElement instanceof UserDelegate) {
- final UserDelegate user = (UserDelegate) parentElement;
- if (user.hasDomain()) {
- children = user.getApplications().toArray();
- }
- } else if (parentElement instanceof IApplication) {
- children = ((IApplication) parentElement).getEmbeddedCartridges().toArray();
- }
- } catch(OpenShiftException e) {
- errors.put(parentElement, e);
- }
-
- return children;
- }
-
- private void launchLoadingJob(final Object element) {
- Job job = new Job("Loading OpenShift information...") {
-
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- monitor.beginTask("Loading OpenShift information...", IProgressMonitor.UNKNOWN);
- monitor.worked(1);
- // Get the actual children, with the delay
- loadingElements.add(element);
- getChildrenForElement(element); //Boolean.valueOf(System.getProperty("org.jboss.tools.openshift.express.ui.eagerloading", "true"))); // JBIDE-11680 false = fast, but blocks ui while loading cartridges, true = slow, but no blocking since cartridges is forced loaded.
- loadedElements.add(element);
- loadingElements.remove(element);
- refreshViewerObject(element);
- monitor.done();
- return Status.OK_STATUS;
- }
- };
- job.setPriority(Job.LONG);
- job.schedule();
- }
-
- private void refreshViewerObject(final Object object) {
- Display.getDefault().asyncExec(new Runnable() {
- public void run() {
- viewer.refresh(object);
- }
- });
- }
-
- @Override
- public Object getParent(Object element) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public boolean hasChildren(Object element) {
- if (element instanceof UserDelegate) {
- return true;
- }
- if (element instanceof IApplication) {
- return true;
- }
- return false;
- }
-
-}
Deleted: 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-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleLabelProvider.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,123 +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.viewer;
-
-import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.StyledString;
-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.OpenShiftImages;
-import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
-import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentProvider.LoadingStub;
-import org.jboss.tools.openshift.express.internal.ui.viewer.OpenShiftExpressConsoleContentProvider.NotConnectedUserStub;
-
-import com.openshift.client.IApplication;
-import com.openshift.client.IEmbeddedCartridge;
-import com.openshift.client.OpenShiftException;
-
-/**
- * @author Xavier Coulon
- */
-public class OpenShiftExpressConsoleLabelProvider implements IStyledLabelProvider, ILabelProvider {
-
- @Override
- public void addListener(ILabelProviderListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public boolean isLabelProperty(Object element, String property) {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public void removeListener(ILabelProviderListener listener) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public Image getImage(Object element) {
- if (element instanceof UserDelegate) {
- return OpenShiftImages.REPO_MIDDLE_IMG;
- }
- if (element instanceof IApplication) {
- return OpenShiftImages.QUERY_IMG;
- }
- if (element instanceof IEmbeddedCartridge) {
- return OpenShiftImages.TASK_REPO_IMG;
- }
- if (element instanceof LoadingStub) {
- return OpenShiftImages.SYSTEM_PROCESS_IMG;
- }
- if (element instanceof OpenShiftException ) {
- return PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
- }
- return null;
- }
-
- @Override
- public String getText(Object element) {
- return getStyledText(element).getString();
- }
-
- @Override
- public StyledString getStyledText(Object element) {
- if (element instanceof UserDelegate) {
- String message = ((UserDelegate) element).getUsername();
- StyledString styledString = new StyledString(message);
- styledString.setStyle(0, message.length(), StyledString.DECORATIONS_STYLER);
- return new StyledString(message);
- }
- if (element instanceof IApplication) {
- IApplication app = (IApplication) element;
- String appName = app.getName();
- String appType = app.getCartridge().getName();
- StringBuilder sb = new StringBuilder();
- sb.append(appName);
- sb.append(" ");
- sb.append(appType);
- StyledString styledString = new StyledString(sb.toString());
- styledString.setStyle(appName.length() + 1, appType.length(), StyledString.QUALIFIER_STYLER);
- return styledString;
- }
- if (element instanceof IEmbeddedCartridge) {
- String message = ((IEmbeddedCartridge) element).getName();
- StyledString styledString = new StyledString(message);
- styledString.setStyle(0, message.length(), StyledString.DECORATIONS_STYLER);
- return new StyledString(message);
- }
-
- if (element instanceof LoadingStub) {
- return new StyledString(OpenShiftExpressUIMessages.LOADING_USER_APPLICATIONS_LABEL);
- }
- if (element instanceof NotConnectedUserStub) {
- return new StyledString(OpenShiftExpressUIMessages.USER_NOT_CONNECTED_LABEL);
- }
- if (element instanceof OpenShiftException ) {
- return new StyledString( ((OpenShiftException)element).getMessage());
- }
- return null;
- }
-
-}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ConnectToOpenShiftWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ConnectToOpenShiftWizardModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ConnectToOpenShiftWizardModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -10,46 +10,41 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard;
-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.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
/**
* @author Andre Dietisheim
*/
-public class ConnectToOpenShiftWizardModel implements IUserAwareModel {
+public class ConnectToOpenShiftWizardModel implements IConnectionAwareModel {
- protected UserDelegate user = null;
-
- /**
- * Default constructor.
- */
+ protected Connection user;
+
public ConnectToOpenShiftWizardModel() {
- super();
}
-
+
/**
* Constructor
* @param user the user to use to connect to OpenShift.
*/
- public ConnectToOpenShiftWizardModel(final UserDelegate user) {
+ public ConnectToOpenShiftWizardModel(final Connection user) {
this.user = user;
}
@Override
- public UserDelegate getUser() {
- return user == null ? UserModel.getDefault().getRecentUser() : user;
+ public Connection getConnection() {
+ return user == null ? ConnectionsModel.getDefault().getRecentConnection() : user;
}
@Override
- public UserDelegate setUser(UserDelegate user) {
- UserModel.getDefault().addUser(user);
+ public Connection setConnection(Connection user) {
this.user = user;
return user;
}
@Override
- public boolean hasUser() {
- return getUser() != null;
+ public boolean hasConnection() {
+ return getConnection() != null;
}
}
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IConnectionAwareModel.java (from rev 44283, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IUserAwareModel.java)
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IConnectionAwareModel.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IConnectionAwareModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * 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.wizard;
+
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
+
+/**
+ * @author Andre Dietisheim
+ */
+public interface IConnectionAwareModel {
+
+ public Connection getConnection();
+
+ public boolean hasConnection();
+
+ public Connection setConnection(Connection connection);
+
+}
\ No newline at end of file
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IConnectionAwareModel.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IUserAwareModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IUserAwareModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IUserAwareModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,26 +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.wizard;
-
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
-
-/**
- * @author Andre Dietisheim
- */
-public interface IUserAwareModel {
-
- public UserDelegate getUser();
-
- public boolean hasUser();
-
- public UserDelegate setUser(UserDelegate 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/wizard/application/ApplicationConfigurationWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationConfigurationWizardPage.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationConfigurationWizardPage.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -75,7 +75,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.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.databinding.RequiredControlDecorationUpdater;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -688,7 +688,7 @@
*/
private boolean ensureHasDomain() {
try {
- final UserDelegate user = this.pageModel.getUser();
+ final Connection 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/application/ApplicationConfigurationWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationConfigurationWizardPageModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationConfigurationWizardPageModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -19,7 +19,7 @@
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.openshift.express.internal.core.CartridgeNameComparator;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import org.jboss.tools.openshift.express.internal.ui.utils.OpenShiftUserPreferencesProvider;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
@@ -79,12 +79,12 @@
return wizardModel;
}
- public UserDelegate getUser() {
- return wizardModel.getUser();
+ public Connection getUser() {
+ return wizardModel.getConnection();
}
public List<IApplication> getApplications() throws OpenShiftException, SocketTimeoutException {
- UserDelegate user = getUser();
+ Connection user = getUser();
if (user == null || !user.isConnected() || !user.hasDomain()) {
return Collections.emptyList();
}
@@ -158,7 +158,7 @@
}
public void loadExistingApplications() throws OpenShiftException, SocketTimeoutException {
- UserDelegate user = getUser();
+ Connection user = getUser();
if (user != null) {
setExistingApplications(user.getApplications());
setExistingApplicationsLoaded(true);
@@ -424,7 +424,7 @@
@Override
public IDomain getDomain() throws SocketTimeoutException, OpenShiftException {
- return wizardModel.getUser().getDefaultDomain();
+ return wizardModel.getConnection().getDefaultDomain();
}
public void reset() throws OpenShiftException {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationSelectionDialogModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationSelectionDialogModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationSelectionDialogModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -14,7 +14,7 @@
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.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
import com.openshift.client.IApplication;
@@ -48,7 +48,7 @@
public List<IApplication> getApplications() {
try {
- UserDelegate user = getUser();
+ Connection user = getUser();
if (user == null) {
return Collections.emptyList();
}
@@ -68,9 +68,9 @@
this.selectedApplication = application);
}
- public UserDelegate getUser() {
+ public Connection getUser() {
// return OpenShiftUIActivator.getDefault().getUser();
- return wizardModel.getUser();
+ return wizardModel.getConnection();
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationWizardModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ApplicationWizardModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -11,7 +11,7 @@
package org.jboss.tools.openshift.express.internal.ui.wizard.application;
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.core.connection.Connection;
import com.openshift.client.IApplication;
@@ -21,9 +21,9 @@
public class ApplicationWizardModel extends ObservableUIPojo {
private IApplication application;
- private UserDelegate user;
+ private Connection user;
- public ApplicationWizardModel(IApplication application, UserDelegate user) {
+ public ApplicationWizardModel(IApplication application, Connection user) {
this.application = application;
this.user = user;
}
@@ -32,7 +32,7 @@
return application;
}
- public UserDelegate getUser() {
+ public Connection getUser() {
return user;
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/GitCloningSettingsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/GitCloningSettingsWizardPage.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/GitCloningSettingsWizardPage.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -197,7 +197,7 @@
GridDataFactory.fillDefaults()
.align(SWT.FILL, SWT.CENTER).grab(true, false).indent(10, 0).applyTo(sshLink);
sshLink.addSelectionListener(onSshPrefs("SSH2 Preferences"));
- sshLink.addSelectionListener(onManageSSHKeys("SSH Keys wizard"));
+ sshLink.addSelectionListener(onManageSSHKeys("SSH Keys wizard", dbc));
// we need a binding to have validation setting wizard validation status
Label dummyLabel = new Label(parent, SWT.None);
@@ -224,7 +224,7 @@
}
})
.in(dbc);
- refreshHasRemoteKeys();
+ refreshHasRemoteKeys(dbc);
return cloneGroup;
}
@@ -264,15 +264,15 @@
};
}
- private SelectionAdapter onManageSSHKeys(String text) {
+ private SelectionAdapter onManageSSHKeys(String text, final DataBindingContext dbc) {
return new LinkSelectionAdapter(text) {
@Override
public void doWidgetSelected(SelectionEvent e) {
WizardDialog manageSSHKeysWizard =
- new OkButtonWizardDialog(getShell(), new ManageSSHKeysWizard(wizardModel.getUser()));
+ new OkButtonWizardDialog(getShell(), new ManageSSHKeysWizard(wizardModel.getConnection()));
if (manageSSHKeysWizard.open() == Dialog.OK) {
- refreshHasRemoteKeys();
+ refreshHasRemoteKeys(dbc);
}
}
};
@@ -282,13 +282,13 @@
enableWidgets(pageModel.isNewProject());
repoPathValidator.forceRevalidate();
setSSHLinkText();
- refreshHasRemoteKeys();
+ refreshHasRemoteKeys(dbc);
}
private void setSSHLinkText() {
- if (wizardModel.hasUser()) {
+ if (wizardModel.hasConnection()) {
sshLink.setText("Make sure that you have SSH keys added to your OpenShift account "
- + wizardModel.getUser().getUsername()
+ + wizardModel.getConnection().getUsername()
+ " via <a>SSH Keys wizard</a> and that the private keys are listed in <a>SSH2 Preferences</a>");
} else {
sshLink.setText("Make sure that you have SSH keys added to your OpenShift account"
@@ -297,12 +297,12 @@
sshLink.getParent().layout(true, true);
}
- private void refreshHasRemoteKeys() {
+ private void refreshHasRemoteKeys(DataBindingContext dbc) {
try {
- if (!wizardModel.hasUser()) {
+ if (!wizardModel.hasConnection()) {
return;
}
- final LoadKeysJob loadKeysJob = new LoadKeysJob(wizardModel.getUser());
+ final LoadKeysJob loadKeysJob = new LoadKeysJob(wizardModel.getConnection());
new JobChainBuilder(loadKeysJob).andRunWhenDone(new UIJob("") {
@Override
@@ -311,7 +311,7 @@
return Status.OK_STATUS;
}
});
- WizardUtils.runInWizard(loadKeysJob, getContainer());
+ WizardUtils.runInWizard(loadKeysJob, getContainer(), dbc);
} catch (Exception e) {
StatusManager.getManager().handle(
OpenShiftUIActivator.createErrorStatus("Could not load ssh keys.", e), StatusManager.LOG);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/IOpenShiftExpressWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/IOpenShiftExpressWizardModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/IOpenShiftExpressWizardModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -25,7 +25,7 @@
import org.eclipse.wst.server.core.IServerType;
import org.jboss.tools.common.databinding.IObservablePojo;
import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils;
-import org.jboss.tools.openshift.express.internal.ui.wizard.IUserAwareModel;
+import org.jboss.tools.openshift.express.internal.ui.wizard.IConnectionAwareModel;
import com.openshift.client.ApplicationScale;
import com.openshift.client.IApplication;
@@ -37,10 +37,10 @@
/**
* @author André Dietisheim
*/
-public interface IOpenShiftExpressWizardModel extends IUserAwareModel, IObservablePojo {
+public interface IOpenShiftExpressWizardModel extends IConnectionAwareModel, IObservablePojo {
public static final String NEW_PROJECT = "enableProject";
- public static final String USER = "user";
+ public static final String CONNECTION = "user";
public static final String APPLICATION = "application";
public static final String APPLICATION_NAME = "applicationName";
public static final String APPLICATION_CARTRIDGE = "applicationCartridge";
@@ -199,14 +199,14 @@
public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges();
- IGearProfile getApplicationGearProfile();
+ public IGearProfile getApplicationGearProfile();
- IGearProfile setApplicationGearProfile(IGearProfile gearProfile);
+ public IGearProfile setApplicationGearProfile(IGearProfile gearProfile);
- ApplicationScale getApplicationScale();
+ public ApplicationScale getApplicationScale();
- ApplicationScale setApplicationScale(final ApplicationScale scale);
+ public ApplicationScale setApplicationScale(final ApplicationScale scale);
- IProject getProject();
+ public IProject getProject();
}
\ No newline at end of file
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ImportOpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ImportOpenShiftExpressApplicationWizard.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ImportOpenShiftExpressApplicationWizard.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -4,7 +4,7 @@
package org.jboss.tools.openshift.express.internal.ui.wizard.application;
import org.eclipse.core.resources.IProject;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import com.openshift.client.IApplication;
@@ -27,7 +27,7 @@
* @param project
* @param application
*/
- public ImportOpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application) {
+ public ImportOpenShiftExpressApplicationWizard(Connection user, IProject project, IApplication application) {
super(user, project, application, true, "Import OpenShift Application");
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/NewOpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/NewOpenShiftExpressApplicationWizard.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/NewOpenShiftExpressApplicationWizard.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.openshift.express.internal.ui.wizard.application;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
/**
* @author Xavier Coulon
@@ -25,7 +25,7 @@
super(false, "New OpenShift Application");
}
- public NewOpenShiftExpressApplicationWizard(UserDelegate user) {
+ public NewOpenShiftExpressApplicationWizard(Connection user) {
super(user, null, null, false, "New OpenShift Application");
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/OpenShiftExpressApplicationWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/OpenShiftExpressApplicationWizard.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/OpenShiftExpressApplicationWizard.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -38,7 +38,7 @@
import org.jboss.tools.common.ui.DelegatingProgressMonitor;
import org.jboss.tools.common.ui.JobUtils;
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.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.ImportFailedException;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException;
@@ -47,7 +47,7 @@
import org.jboss.tools.openshift.express.internal.ui.job.EmbedCartridgesJob;
import org.jboss.tools.openshift.express.internal.ui.job.WaitForApplicationJob;
import org.jboss.tools.openshift.express.internal.ui.wizard.CreationLogDialog;
-import org.jboss.tools.openshift.express.internal.ui.wizard.credentials.CredentialsWizardPage;
+import org.jboss.tools.openshift.express.internal.ui.wizard.connection.ConnectionWizardPage;
import com.openshift.client.IApplication;
import com.openshift.client.IEmbeddableCartridge;
@@ -73,7 +73,7 @@
this(null, null, null, useExistingApplication, wizardTitle);
}
- OpenShiftExpressApplicationWizard(UserDelegate user, IProject project, IApplication application,
+ OpenShiftExpressApplicationWizard(Connection user, IProject project, IApplication application,
boolean useExistingApplication, String wizardTitle) {
setWindowTitle(wizardTitle);
setNeedsProgressMonitor(true);
@@ -112,19 +112,19 @@
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
Object o = selection.getFirstElement();
- if (o instanceof UserDelegate) {
- setUser((UserDelegate) o);
+ if (o instanceof Connection) {
+ setUser((Connection) o);
}
}
- protected void setUser(UserDelegate user) {
- getWizardModel().setUser(user);
+ protected void setUser(Connection user) {
+ getWizardModel().setConnection(user);
}
@Override
public void addPages() {
if (!skipCredentialsPage) {
- addPage(new CredentialsWizardPage(this, getWizardModel()));
+ addPage(new ConnectionWizardPage(this, getWizardModel()));
}
addPage(new ApplicationConfigurationWizardPage(this, getWizardModel()));
addPage(new ProjectAndServerAdapterSettingsWizardPage(this, getWizardModel()));
@@ -219,7 +219,7 @@
, wizardModel.getApplicationCartridge()
, wizardModel.getApplicationScale()
, wizardModel.getApplicationGearProfile()
- , wizardModel.getUser());
+ , wizardModel.getConnection());
IStatus status = WizardUtils.runInWizard(
job, job.getDelegatingProgressMonitor(), getContainer(), APP_CREATE_TIMEOUT);
wizardModel.setApplication(job.getApplication());
@@ -264,7 +264,7 @@
private void safeRefreshUser() {
try {
- wizardModel.getUser().refresh();
+ wizardModel.getConnection().refresh();
} catch (OpenShiftException e) {
OpenShiftUIActivator.log(e);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/OpenShiftExpressApplicationWizardModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/OpenShiftExpressApplicationWizardModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -20,8 +20,8 @@
import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
import org.jboss.tools.openshift.egit.core.EGitUtils;
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.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
import org.jboss.tools.openshift.express.internal.ui.wizard.application.importoperation.ConfigureGitSharedProject;
import org.jboss.tools.openshift.express.internal.ui.wizard.application.importoperation.ConfigureUnsharedProject;
import org.jboss.tools.openshift.express.internal.ui.wizard.application.importoperation.ImportNewProject;
@@ -42,17 +42,17 @@
private static final String DEFAULT_PROJECT = "default_project";
private static final String DEFAULT_USE_EXISTING_APPLICATION = "default_useExistingApplication";
- public OpenShiftExpressApplicationWizardModel(UserDelegate user) {
+ public OpenShiftExpressApplicationWizardModel(Connection user) {
this(user, null, null, false);
}
- public OpenShiftExpressApplicationWizardModel(UserDelegate user, IProject project, IApplication application,
+ public OpenShiftExpressApplicationWizardModel(Connection user, IProject project, IApplication application,
boolean useExistingApplication) {
// default value(s)
setDefaultProject(project);
setDefaultApplication(application);
setDefaultUseExistingApplication(useExistingApplication);
- setUser(user);
+ setConnection(user);
}
/**
@@ -76,7 +76,7 @@
, getApplication()
, getRemoteName()
, getRepositoryFile()
- , getUser())
+ , getConnection())
.execute(monitor);
createServerAdapter(monitor, importedProject);
}
@@ -114,7 +114,7 @@
getProjectName()
, getApplication()
, getRemoteName()
- , getUser())
+ , getConnection())
.execute(monitor);
createServerAdapter(monitor, importedProject);
}
@@ -154,7 +154,7 @@
getProjectName()
, getApplication()
, getRemoteName()
- , getUser())
+ , getConnection())
.execute(monitor);
createServerAdapter(monitor, project);
}
@@ -456,20 +456,20 @@
}
@Override
- public UserDelegate getUser() {
- return (UserDelegate) getProperty(USER);
+ public boolean hasConnection() {
+ return getConnection() != null;
}
@Override
- public boolean hasUser() {
- return getUser() != null;
+ public Connection setConnection(Connection connection) {
+ setProperty(CONNECTION, connection);
+ resetWizardModel();
+ return connection;
}
-
+
@Override
- public UserDelegate setUser(UserDelegate user) {
- setProperty(USER, user);
- resetWizardModel();
- return user;
+ public Connection getConnection() {
+ return (Connection) getProperty(CONNECTION);
}
public void resetWizardModel() {
@@ -484,7 +484,7 @@
}
public void fireUserChanged() {
- UserModel.getDefault().fireUserChanged(getUser());
+ ConnectionsModel.getDefault().fireConnectionChanged(getConnection());
}
}
\ No newline at end of file
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ServerAdapterFactory.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ServerAdapterFactory.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/ServerAdapterFactory.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -33,7 +33,7 @@
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.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import com.openshift.client.IApplication;
@@ -50,11 +50,11 @@
public void create(IProject project, IOpenShiftExpressWizardModel wizardModel, IProgressMonitor monitor) throws OpenShiftException {
createServerAdapter(project, wizardModel.getServerType(), wizardModel.getRuntime(),
- wizardModel.getApplication(), wizardModel.getUser(), wizardModel.getRemoteName(), monitor);
+ wizardModel.getApplication(), wizardModel.getConnection(), wizardModel.getRemoteName(), monitor);
}
public void create(IProject project, IServerType serverType, IRuntime runtime,
- IApplication application, UserDelegate user, IProgressMonitor monitor) throws OpenShiftException {
+ IApplication application, Connection user, IProgressMonitor monitor) throws OpenShiftException {
createServerAdapter(project, serverType, runtime, application, user, null, monitor);
}
@@ -66,7 +66,7 @@
* @throws OpenShiftException
*/
protected void createServerAdapter(IProject project, IServerType serverType, IRuntime runtime,
- IApplication application, UserDelegate user,
+ IApplication application, Connection user,
String remoteName, IProgressMonitor monitor) throws OpenShiftException {
String name = project.getName();
monitor.subTask(NLS.bind("Creating server adapter for project {0}", name));
@@ -75,7 +75,7 @@
}
protected void createServerAdapter(List<IProject> importedProjects, IServerType serverType,
- IRuntime runtime, IApplication application, UserDelegate user,
+ IRuntime runtime, IApplication application, Connection user,
String deployProject, String remoteName, IProgressMonitor monitor) {
try {
IServer server = doCreateServerAdapter(serverType, runtime, application, user, deployProject, remoteName);
@@ -94,7 +94,7 @@
}
private IServer doCreateServerAdapter(IServerType serverType, IRuntime rt,
- IApplication application, UserDelegate user, String deployProject, String remoteName) throws CoreException,
+ IApplication application, Connection user, String deployProject, String remoteName) throws CoreException,
OpenShiftException, SocketTimeoutException {
Assert.isLegal(serverType != null);
Assert.isLegal(application != null);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/AbstractImportApplicationOperation.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/AbstractImportApplicationOperation.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/AbstractImportApplicationOperation.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -34,7 +34,7 @@
import org.jboss.tools.openshift.egit.core.GitIgnore;
import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils;
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.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import com.openshift.client.IApplication;
@@ -49,10 +49,10 @@
private IApplication application;
private String remoteName;
protected List<IResource> modifiedResources;
- private UserDelegate user;
+ private Connection user;
public AbstractImportApplicationOperation(String projectName, IApplication application, String remoteName,
- UserDelegate user) {
+ Connection user) {
this.projectName = projectName;
this.application = application;
this.remoteName = remoteName;
@@ -153,7 +153,7 @@
return remoteName;
}
- protected UserDelegate getUser() {
+ protected Connection getUser() {
return user;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/ConfigureGitSharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/ConfigureGitSharedProject.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/ConfigureGitSharedProject.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -31,7 +31,7 @@
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.core.connection.Connection;
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;
@@ -49,7 +49,7 @@
public class ConfigureGitSharedProject extends AbstractImportApplicationOperation {
public ConfigureGitSharedProject(String projectName, IApplication application, String remoteName,
- UserDelegate user) {
+ Connection user) {
super(projectName, application, remoteName, user);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/ConfigureUnsharedProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/ConfigureUnsharedProject.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/ConfigureUnsharedProject.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -22,7 +22,7 @@
import org.eclipse.osgi.util.NLS;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
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.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.ResourceUtils;
@@ -38,7 +38,7 @@
public class ConfigureUnsharedProject extends AbstractImportApplicationOperation {
public ConfigureUnsharedProject(String projectName, IApplication application, String remoteName,
- UserDelegate user) {
+ Connection user) {
super(projectName, application, remoteName, user);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/ImportNewProject.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/ImportNewProject.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/application/importoperation/ImportNewProject.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -25,7 +25,7 @@
import org.eclipse.jgit.transport.URIish;
import org.eclipse.osgi.util.NLS;
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.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.ImportFailedException;
import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException;
import org.jboss.tools.openshift.express.internal.ui.wizard.application.importoperation.project.GeneralProjectImportOperation;
@@ -42,7 +42,7 @@
private File cloneDestination;
public ImportNewProject(String projectName, IApplication application, String remoteName,
- File cloneDestination, UserDelegate user) {
+ File cloneDestination, Connection user) {
super(projectName, application, remoteName, user);
this.cloneDestination = cloneDestination;
}
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPage.java (from rev 44283, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/credentials/CredentialsWizardPage.java)
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPage.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPage.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,304 @@
+/*******************************************************************************
+ * 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.wizard.connection;
+
+import java.lang.reflect.InvocationTargetException;
+
+import org.eclipse.core.databinding.Binding;
+import org.eclipse.core.databinding.DataBindingContext;
+import org.eclipse.core.databinding.beans.BeanProperties;
+import org.eclipse.core.databinding.observable.value.IObservableValue;
+import org.eclipse.core.databinding.validation.MultiValidator;
+import org.eclipse.core.databinding.validation.ValidationStatus;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport;
+import org.eclipse.jface.databinding.swt.WidgetProperties;
+import org.eclipse.jface.databinding.viewers.ViewerProperties;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.dialogs.PageChangingEvent;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.jface.viewers.ArrayContentProvider;
+import org.eclipse.jface.viewers.ComboViewer;
+import org.eclipse.jface.wizard.IWizard;
+import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Link;
+import org.eclipse.swt.widgets.Text;
+import org.jboss.tools.common.ui.BrowserUtil;
+import org.jboss.tools.common.ui.DelegatingProgressMonitor;
+import org.jboss.tools.common.ui.JobUtils;
+import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.common.ui.databinding.InvertingBooleanConverter;
+import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport;
+import org.jboss.tools.common.ui.databinding.ValueBindingBuilder;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+import org.jboss.tools.openshift.express.internal.ui.OpenshiftUIMessages;
+import org.jboss.tools.openshift.express.internal.ui.databinding.HostNameValidator;
+import org.jboss.tools.openshift.express.internal.ui.databinding.RequiredControlDecorationUpdater;
+import org.jboss.tools.openshift.express.internal.ui.databinding.RequiredStringValidator;
+import org.jboss.tools.openshift.express.internal.ui.explorer.AbstractLabelProvider;
+import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
+import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
+import org.jboss.tools.openshift.express.internal.ui.utils.UIUpdatingJob;
+import org.jboss.tools.openshift.express.internal.ui.wizard.AbstractOpenShiftWizardPage;
+import org.jboss.tools.openshift.express.internal.ui.wizard.IConnectionAwareModel;
+
+/**
+ * @author Andre Dietisheim
+ * @author Xavier Coulon
+ */
+public class ConnectionWizardPage extends AbstractOpenShiftWizardPage {
+
+ protected static final String OPENSHIFT_EXPRESS_SIGNUP_URL = "https://openshift.redhat.com/app/user/new/express"; //$NON-NLS-1$
+
+ private final ConnectionWizardPageModel pageModel;
+
+ private Text rhLoginText = null;
+ private Text passwordText = null;
+
+ public ConnectionWizardPage(IWizard wizard, IConnectionAwareModel wizardModel) {
+ super("Sign in to OpenShift", "Please provide your OpenShift credentials.", "Server Connection",
+ wizard);
+ this.pageModel = new ConnectionWizardPageModel(wizardModel);
+ }
+
+ protected void doCreateControls(Composite container, DataBindingContext dbc) {
+ GridLayoutFactory.fillDefaults().numColumns(2).margins(10, 10).applyTo(container);
+
+ Link signupLink = new Link(container, SWT.WRAP);
+ signupLink.setText("If you do not have an account on OpenShift, please sign up <a>here</a>.");
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).span(2, 1).applyTo(signupLink);
+ signupLink.addSelectionListener(onSignupLinkClicked());
+
+ Label fillerLabel = new Label(container, SWT.NONE);
+ GridDataFactory.fillDefaults()
+ .span(2, 1).hint(SWT.DEFAULT, 6).applyTo(fillerLabel);
+
+ // use default server
+ Button defaultServerCheckbox = new Button(container, SWT.CHECK);
+ defaultServerCheckbox.setText("Use default server");
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.CENTER).span(2, 1).applyTo(defaultServerCheckbox);
+ ValueBindingBuilder
+ .bind(WidgetProperties.selection().observe(defaultServerCheckbox))
+ .to(BeanProperties.value(ConnectionWizardPageModel.PROPERTY_USE_DEFAULTSERVER).observe(pageModel))
+ .in(dbc);
+
+ // server
+ Label serverLabel = new Label(container, SWT.NONE);
+ serverLabel.setText("&Server:");
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).applyTo(serverLabel);
+ Combo serversCombo = new Combo(container, SWT.BORDER);
+ Binding serverBinding = ValueBindingBuilder
+ .bind(WidgetProperties.text().observe(serversCombo))
+ .validatingAfterGet(new HostNameValidator())
+ .to(BeanProperties.value(ConnectionWizardPageModel.PROPERTY_SERVER).observe(pageModel))
+ .in(dbc);
+ ControlDecorationSupport
+ .create(serverBinding, SWT.LEFT | SWT.TOP, null, new RequiredControlDecorationUpdater());
+ ComboViewer serversComboViewer = new ComboViewer(serversCombo);
+ serversComboViewer.setLabelProvider(new ServerLabelProvider());
+ serversComboViewer.setContentProvider(ArrayContentProvider.getInstance());
+ serversComboViewer.setInput(pageModel.getServers());
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(serversCombo);
+ ValueBindingBuilder
+ .bind(ViewerProperties.singlePostSelection().observe(serversComboViewer))
+ .to(BeanProperties.value(ConnectionWizardPageModel.PROPERTY_SERVER).observe(pageModel))
+ .in(dbc);
+ ValueBindingBuilder
+ .bind(WidgetProperties.enabled().observe(serversCombo))
+ .notUpdatingParticipant()
+ .to(BeanProperties.value(ConnectionWizardPageModel.PROPERTY_USE_DEFAULTSERVER).observe(pageModel))
+ .converting(new InvertingBooleanConverter())
+ .in(dbc);
+
+ // username
+ Label rhLoginLabel = new Label(container, SWT.NONE);
+ rhLoginLabel.setText("&Username:");
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).applyTo(rhLoginLabel);
+ rhLoginText = new Text(container, SWT.BORDER);
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.CENTER).grab(true, false).span(1, 1).applyTo(rhLoginText);
+ Binding usernameBinding = ValueBindingBuilder
+ .bind(WidgetProperties.text(SWT.Modify).observe(rhLoginText))
+ .validatingAfterGet(new RequiredStringValidator("username"))
+ .to(BeanProperties.value(ConnectionWizardPageModel.PROPERTY_USERNAME).observe(pageModel))
+ .in(dbc);
+ ControlDecorationSupport
+ .create(usernameBinding, SWT.LEFT | SWT.TOP, null, new RequiredControlDecorationUpdater());
+
+ // password
+ Label passwordLabel = new Label(container, SWT.NONE);
+ passwordLabel.setText("&Password:");
+ GridDataFactory.fillDefaults()
+ .align(SWT.LEFT, SWT.CENTER).applyTo(passwordLabel);
+ passwordText = new Text(container, SWT.BORDER | SWT.PASSWORD);
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(passwordText);
+ Binding passwordBinding = ValueBindingBuilder
+ .bind(WidgetProperties.text(SWT.Modify).observe(passwordText))
+ .validatingAfterGet(new RequiredStringValidator("password"))
+ .to(BeanProperties.value(ConnectionWizardPageModel.PROPERTY_PASSWORD).observe(pageModel))
+ .in(dbc);
+ ControlDecorationSupport
+ .create(passwordBinding, SWT.LEFT | SWT.TOP, null, new RequiredControlDecorationUpdater());
+
+ Button rememberPasswordCheckBox = new Button(container, SWT.CHECK);
+ rememberPasswordCheckBox.setText(OpenshiftUIMessages.OpenshiftWizardSavePassword);
+ GridDataFactory.fillDefaults()
+ .align(SWT.FILL, SWT.CENTER).span(2, 1).grab(true, false).applyTo(rememberPasswordCheckBox);
+ ValueBindingBuilder
+ .bind(WidgetProperties.selection().observe(rememberPasswordCheckBox))
+ .to(BeanProperties.value(ConnectionWizardPageModel.PROPERTY_REMEMBER_PASSWORD).observe(pageModel))
+ .in(dbc);
+ // credentials status
+ IObservableValue credentialsStatusObservable =
+ BeanProperties.value(ConnectionWizardPageModel.PROPERTY_VALID, IStatus.class).observe(pageModel);
+ final CredentialsValidator credentialsValidator =
+ new CredentialsValidator(credentialsStatusObservable);
+ dbc.addValidationStatusProvider(credentialsValidator);
+ ControlDecorationSupport.create(credentialsValidator, SWT.LEFT | SWT.TOP);
+
+ }
+
+ protected SelectionAdapter onSignupLinkClicked() {
+ return new SelectionAdapter() {
+
+ @Override
+ public void widgetSelected(SelectionEvent e) {
+ BrowserUtil.checkedCreateInternalBrowser(OPENSHIFT_EXPRESS_SIGNUP_URL, OPENSHIFT_EXPRESS_SIGNUP_URL,
+ OpenShiftUIActivator.PLUGIN_ID, OpenShiftUIActivator.getDefault().getLog());
+ getContainer().getShell().close();
+ }
+ };
+ }
+
+ @Override
+ protected void onPageActivated(DataBindingContext dbc) {
+ super.onPageActivated(dbc);
+ if (StringUtils.isEmpty(pageModel.getUsername())
+ && rhLoginText != null) {
+ rhLoginText.setFocus();
+ } else if (passwordText != null) {
+ passwordText.setFocus();
+ }
+ }
+
+ @Override
+ protected void onPageWillGetDeactivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) {
+ if (direction == Direction.BACKWARDS) {
+ return;
+ }
+ event.doit = connect();
+ if (!event.doit) {
+ passwordText.setFocus();
+ passwordText.selectAll();
+ }
+ }
+
+ public boolean connect() {
+ try {
+ WizardUtils.runInWizard(new ConnectJob(), new DelegatingProgressMonitor(), getContainer(),
+ getDatabindingContext());
+ return JobUtils.isOk(pageModel.getValid());
+ } catch (InterruptedException e) {
+ Logger.error("Failed to authenticate on OpenShift", e);
+ return false;
+ } catch (InvocationTargetException e) {
+ Logger.error("Failed to authenticate on OpenShift", e);
+ return false;
+ }
+ }
+
+ class CredentialsValidator extends MultiValidator {
+
+ private final IObservableValue credentialsStatusObservable;
+
+ public CredentialsValidator(IObservableValue credentialsStatusObservable) {
+ this.credentialsStatusObservable = credentialsStatusObservable;
+ }
+
+ @Override
+ protected IStatus validate() {
+ final IStatus credentialsValidityStatus = (IStatus) credentialsStatusObservable.getValue();
+
+ if (credentialsValidityStatus != null) {
+ return pageModel.getValid();
+ }
+ return ValidationStatus.ok();
+ }
+ }
+
+ private class ServerLabelProvider extends AbstractLabelProvider {
+ @Override
+ public String getText(Object element) {
+ if (!(element instanceof String)) {
+ return null;
+ }
+ return (String) element;
+ }
+ }
+
+ @Override
+ protected void setupWizardPageSupport(DataBindingContext dbc) {
+ ParametrizableWizardPageSupport.create(IStatus.ERROR | IStatus.CANCEL, this, dbc);
+ }
+
+ private class ConnectJob extends UIUpdatingJob {
+
+ private IStatus connectionStatus;
+
+ private ConnectJob() {
+ super("Verifying user credentials...");
+ }
+
+ @Override
+ protected IStatus run(IProgressMonitor monitor) {
+ connectionStatus = pageModel.connect();
+ monitor.done();
+ return Status.OK_STATUS;
+ }
+
+ @Override
+ protected IStatus updateUI(IProgressMonitor monitor) {
+ if (!JobUtils.isOk(connectionStatus)) {
+ return Status.OK_STATUS;
+ }
+ boolean newConnection = false;
+ if (pageModel.shouldCreateNewConnection()) {
+ Connection connection = pageModel.getConnection();
+ if (MessageDialog.openQuestion(getShell(),
+ "Create new connection?",
+ NLS.bind("You changed your connection to {0} on server {1}.\n" +
+ "Do you want to create a new connection?",
+ connection.getUsername(), connection.getHost()))) {
+ newConnection = true;
+ }
+ }
+ pageModel.createOrUpdateConnection(newConnection);
+ return Status.OK_STATUS;
+ }
+ }
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPage.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java (from rev 44283, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/credentials/CredentialsWizardPageModel.java)
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,244 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.ui.wizard.connection;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+import org.eclipse.core.databinding.observable.Diffs;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.osgi.util.NLS;
+import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ConnectionsModel;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
+import org.jboss.tools.openshift.express.internal.ui.wizard.IConnectionAwareModel;
+
+import com.openshift.client.IUser;
+import com.openshift.client.NotFoundOpenShiftException;
+import com.openshift.client.OpenShiftException;
+import com.openshift.client.OpenShiftTimeoutException;
+import com.openshift.client.configuration.OpenShiftConfiguration;
+
+/**
+ * @author Andre Dietisheim
+ * @author Xavier Coulon
+ */
+public class ConnectionWizardPageModel extends ObservableUIPojo {
+
+ public static final String PROPERTY_USERNAME = "username";
+ public static final String PROPERTY_PASSWORD = "password";
+ public static final String PROPERTY_SERVER = "server";
+ public static final String PROPERTY_REMEMBER_PASSWORD = "rememberPassword";
+ public static final String PROPERTY_USE_DEFAULTSERVER = "useDefaultServer";
+ public static final String PROPERTY_VALID = "valid";
+
+ final private List<String> servers;
+ private boolean isDefaultServer = true;
+ private IConnectionAwareModel wizardModel;
+ private Connection connection;
+ private IStatus valid;
+
+ public ConnectionWizardPageModel(IConnectionAwareModel wizardModel) {
+ this.wizardModel = wizardModel;
+ this.connection = createConnection(wizardModel.getConnection());
+ this.servers = getServers(connection);
+ }
+
+ /**
+ * Returns a new Connection for a given connection. The new connection gets
+ * created with the username and password from the preferences (and secure
+ * storage) if <code>null</code>.
+ * <p>
+ * We always have to create a new connection since you can cancel the wizard
+ * and dont want changes to your existing connection then.
+ *
+ * @param connection
+ * @return
+ *
+ * @see Connection
+ * @see IUser
+ */
+ private Connection createConnection(Connection connection) {
+ Connection newUser = null;
+ if (connection != null) {
+ newUser = new Connection(connection);
+ } else {
+ newUser = new Connection();
+ }
+ return newUser;
+ }
+
+ public boolean isUseDefaultServer() {
+ return isDefaultServer;
+ }
+
+ public void setUseDefaultServer(boolean isDefaultServer) {
+ if (this.isDefaultServer != isDefaultServer) {
+ firePropertyChange(PROPERTY_USE_DEFAULTSERVER,
+ this.isDefaultServer, this.isDefaultServer = isDefaultServer);
+ if (isDefaultServer) {
+ setServer(connection.getHost());
+ }
+ resetValid();
+ }
+ }
+
+ private List<String> getServers(Connection user) {
+ List<String> servers = new ArrayList<String>();
+ HashSet<String> uniqueServers = new HashSet<String>();
+ uniqueServers.add(getDefaultServer());
+ servers.add(user.getHost());
+ return servers;
+ }
+
+ private String getDefaultServer() {
+ try {
+ return new OpenShiftConfiguration().getLibraServer();
+ } catch (Exception e) {
+ OpenShiftUIActivator.log(e);
+ return null;
+ }
+ }
+
+ public String getUsername() {
+ return connection.getUsername();
+ }
+
+ public void setUsername(String username) {
+ if (!Diffs.equals(connection.getUsername(), username)) {
+ firePropertyChange(PROPERTY_USERNAME, connection.getUsername(), connection.setUsername(username));
+ resetValid();
+ }
+ }
+
+ public String getPassword() {
+ return connection.getPassword();
+ }
+
+ public void setPassword(String password) {
+ if (!Diffs.equals(password, connection.getPassword())) {
+ firePropertyChange(PROPERTY_PASSWORD, connection.getPassword(), connection.setPassword(password));
+ resetValid();
+ }
+ }
+
+ public String getServer() {
+ return connection.getHost();
+ }
+
+ public void setServer(String server) {
+ if (server == null) { // workaround
+ return;
+ }
+ if (!Diffs.equals(connection.getHost(), server)) {
+ firePropertyChange(PROPERTY_SERVER, connection.getHost(), connection.setHost(server));
+ resetValid();
+ }
+ }
+
+ public List<String> getServers() {
+ return servers;
+ }
+
+ public boolean isRememberPassword() {
+ return connection.isRememberPassword();
+ }
+
+ public void setRememberPassword(boolean rememberPassword) {
+ firePropertyChange(PROPERTY_REMEMBER_PASSWORD,
+ connection.isRememberPassword(), connection.setRememberPassword(rememberPassword));
+ }
+
+ private void resetValid() {
+ setValid(null);
+ }
+
+ private void setValid(IStatus status) {
+ firePropertyChange(PROPERTY_VALID, this.valid, this.valid = status);
+ }
+
+ public IStatus getValid() {
+ return valid;
+ }
+
+ public IStatus connect() {
+ IStatus status = Status.OK_STATUS;
+ try {
+ if (!connection.isConnected()) {
+ try {
+ connection.connect();
+ } catch (OpenShiftTimeoutException e) {
+ status = OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "Could not reach server at {0}. Connection timeouted.", connection.getHost()));
+ } catch (OpenShiftException e) {
+ status = OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "The credentials for user {0} are not valid", connection.getUsername()));
+ }
+ }
+ } catch (NotFoundOpenShiftException e) {
+ // valid user without domain
+ } catch (Exception e) {
+ status = OpenShiftUIActivator.createErrorStatus(NLS.bind(
+ "Could not check user credentials: {0}.", e.getMessage()));
+ }
+ setValid(status);
+ return status;
+ }
+
+ /**
+ * Returns <code>true</code> if the connection that this wizards edits was
+ * changed in a way that would suggest creating a new connection (instead of
+ * updating it). The current implementation would suggests to create a new
+ * connection as soon as the username or the server was changed.
+ *
+ * @return true if you should create a new connection
+ */
+ public boolean shouldCreateNewConnection() {
+ Connection wizardModelConnection = wizardModel.getConnection();
+ return wizardModelConnection != null
+ && (
+ // username changed
+ !wizardModelConnection.getUsername().equals(connection.getUsername())
+ // server changed
+ || !wizardModelConnection.getHost().equals(connection.getHost()));
+ }
+
+ /**
+ * Updates the connection that this wizard operates on or creates a new one.
+ * Will create a new connection if the wizard had no connection to operate
+ * on or if there was one and it was told to create a new one by the given
+ * flag.
+ *
+ * @param create
+ * if true, creates a new connection if the wizard had a
+ * connection to edit. Updates the existing one otherwise.
+ */
+ public void createOrUpdateConnection(boolean create) {
+ Connection wizardModelConnection = wizardModel.getConnection();
+ if (wizardModelConnection == null
+ || create) {
+ wizardModel.setConnection(connection);
+ ConnectionsModel.getDefault().addConnection(connection);
+// connection.save();
+ } else {
+ wizardModelConnection.update(connection);
+ ConnectionsModel.getDefault().fireConnectionChanged(wizardModelConnection);
+// wizardModelConnection.save();
+ }
+ }
+
+ public Connection getConnection() {
+ return connection;
+ }
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/ConnectionWizardPageModel.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/CredentialsPrompter.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/CredentialsPrompter.java (rev 0)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/CredentialsPrompter.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * 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.tools.openshift.express.internal.ui.wizard.connection;
+
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.jboss.tools.common.ui.WizardUtils;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
+import org.jboss.tools.openshift.express.internal.core.connection.ICredentialsPrompter;
+import org.jboss.tools.openshift.express.internal.ui.explorer.ConnectToOpenShiftWizard;
+import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
+import org.jboss.tools.openshift.express.internal.ui.utils.UIUtils;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class CredentialsPrompter implements ICredentialsPrompter {
+
+ @Override
+ public void promptAndAuthenticate(final Connection user) {
+ Display.getDefault().syncExec(
+ new Runnable() {
+ public void run() {
+ Shell shell = UIUtils.getShell();
+ if (shell == null) {
+ Logger.error("Could not open Credentials wizard: no shell available");
+ return;
+ }
+
+ final ConnectToOpenShiftWizard connectToOpenShiftWizard =
+ new ConnectToOpenShiftWizard(user);
+ WizardUtils.openWizardDialog(connectToOpenShiftWizard, shell);
+ }
+ });
+ }
+
+}
Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/CredentialsPrompter.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/CredentialsWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/credentials/CredentialsWizardPage.java 2012-10-04 08:30:34 UTC (rev 44283)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/CredentialsWizardPage.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,252 +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.wizard.credentials;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.databinding.DataBindingContext;
-import org.eclipse.core.databinding.beans.BeanProperties;
-import org.eclipse.core.databinding.observable.list.IObservableList;
-import org.eclipse.core.databinding.observable.list.WritableList;
-import org.eclipse.core.databinding.observable.value.IObservableValue;
-import org.eclipse.core.databinding.validation.MultiValidator;
-import org.eclipse.core.databinding.validation.ValidationStatus;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.databinding.fieldassist.ControlDecorationSupport;
-import org.eclipse.jface.databinding.swt.ISWTObservableValue;
-import org.eclipse.jface.databinding.swt.WidgetProperties;
-import org.eclipse.jface.dialogs.PageChangingEvent;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Text;
-import org.jboss.tools.common.ui.BrowserUtil;
-import org.jboss.tools.common.ui.DelegatingProgressMonitor;
-import org.jboss.tools.common.ui.WizardUtils;
-import org.jboss.tools.common.ui.databinding.ParametrizableWizardPageSupport;
-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.OpenshiftUIMessages;
-import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
-import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
-import org.jboss.tools.openshift.express.internal.ui.wizard.AbstractOpenShiftWizardPage;
-import org.jboss.tools.openshift.express.internal.ui.wizard.IUserAwareModel;
-
-/**
- * @author Andre Dietisheim
- * @author Xavier Coulon
- */
-public class CredentialsWizardPage extends AbstractOpenShiftWizardPage {
-
- protected static final String OPENSHIFT_EXPRESS_SIGNUP_URL = "https://openshift.redhat.com/app/user/new/express"; //$NON-NLS-1$
-
- private final CredentialsWizardPageModel pageModel;
-
- private Text rhLoginText = null;
- private Text passwordText = null;
-
- public CredentialsWizardPage(IWizard wizard, IUserAwareModel wizardModel) {
- super("Sign in to OpenShift", "Please provide your OpenShift credentials.", "Server Connection",
- wizard);
- this.pageModel = new CredentialsWizardPageModel(wizardModel);
- }
-
- protected void doCreateControls(Composite container, DataBindingContext dbc) {
- GridLayoutFactory.fillDefaults().numColumns(2).margins(10, 10).applyTo(container);
-
- Link signupLink = new Link(container, SWT.WRAP);
- signupLink.setText("If you do not have an account on OpenShift, please sign up <a>here</a>.");
- GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).span(2, 1).applyTo(signupLink);
- signupLink.addSelectionListener(onSignupLinkClicked());
-
- Label fillerLabel = new Label(container, SWT.NONE);
- GridDataFactory.fillDefaults()
- .span(2, 1).hint(SWT.DEFAULT, 6).applyTo(fillerLabel);
-
- Label rhLoginLabel = new Label(container, SWT.NONE);
- rhLoginLabel.setText("&Username");
- GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).applyTo(rhLoginLabel);
- rhLoginText = new Text(container, SWT.BORDER);
- GridDataFactory.fillDefaults()
- .align(SWT.FILL, SWT.CENTER).grab(true, false).span(1, 1).applyTo(rhLoginText);
- final IObservableValue rhLoginObservable =
- BeanProperties.value(CredentialsWizardPageModel.PROPERTY_RHLOGIN).observe(pageModel);
- dbc.bindValue(WidgetProperties.text(SWT.Modify).observe(rhLoginText), rhLoginObservable);
-
- Label passwordLabel = new Label(container, SWT.NONE);
- passwordLabel.setText("&Password");
- GridDataFactory.fillDefaults()
- .align(SWT.LEFT, SWT.CENTER).applyTo(passwordLabel);
- passwordText = new Text(container, SWT.BORDER | SWT.PASSWORD);
- GridDataFactory.fillDefaults()
- .align(SWT.FILL, SWT.CENTER).grab(true, false).span(1, 1).applyTo(passwordText);
- final IObservableValue passwordModelObservable =
- BeanProperties.value(CredentialsWizardPageModel.PROPERTY_PASSWORD).observe(pageModel);
- final ISWTObservableValue passwordTextObservable = WidgetProperties.text(SWT.Modify).observe(passwordText);
- dbc.bindValue(passwordTextObservable, passwordModelObservable);
-
- IObservableValue credentialsStatusObservable =
- BeanProperties.value(CredentialsWizardPageModel.PROPERTY_CREDENTIALS_STATUS).observe(pageModel);
- dbc.addValidationStatusProvider(
- new CredentialsInputValidator(rhLoginObservable, passwordModelObservable));
- final CredentialsStatusValidator credentialsStatusValidator =
- new CredentialsStatusValidator(credentialsStatusObservable, passwordTextObservable);
- dbc.addValidationStatusProvider(credentialsStatusValidator);
- ControlDecorationSupport.create(credentialsStatusValidator, SWT.LEFT | SWT.TOP);
-
- new Label(container, SWT.NONE); // filler to align the checkbox under
- // the text fields
- Button rememberPasswordCheckBox = new Button(container, SWT.CHECK);
- rememberPasswordCheckBox.setText(OpenshiftUIMessages.OpenshiftWizardSavePassword);
- GridDataFactory.fillDefaults()
- .align(SWT.FILL, SWT.CENTER).grab(true, false).applyTo(rememberPasswordCheckBox);
- final IObservableValue rememberPasswordModelObservable =
- BeanProperties.value(CredentialsWizardPageModel.PROPERTY_REMEMBER_PASSWORD).observe(pageModel);
- final ISWTObservableValue rememberPasswordCheckBoxObservable =
- WidgetProperties.selection().observe(rememberPasswordCheckBox);
- dbc.bindValue(rememberPasswordCheckBoxObservable, rememberPasswordModelObservable);
- }
-
- protected SelectionAdapter onSignupLinkClicked() {
- return new SelectionAdapter() {
-
- @Override
- public void widgetSelected(SelectionEvent e) {
- BrowserUtil.checkedCreateInternalBrowser(OPENSHIFT_EXPRESS_SIGNUP_URL, OPENSHIFT_EXPRESS_SIGNUP_URL,
- OpenShiftUIActivator.PLUGIN_ID, OpenShiftUIActivator.getDefault().getLog());
- getContainer().getShell().close();
- }
- };
- }
-
- @Override
- protected void setupWizardPageSupport(DataBindingContext dbc) {
- ParametrizableWizardPageSupport.create(IStatus.ERROR | IStatus.CANCEL, this, dbc);
- }
-
- @Override
- protected void onPageActivated(DataBindingContext dbc) {
- super.onPageActivated(dbc);
- if (StringUtils.isEmpty(pageModel.getRhLogin())
- && rhLoginText != null) {
- rhLoginText.setFocus();
- } else if (passwordText != null) {
- passwordText.setFocus();
- }
- }
-
-
-
- @Override
- protected void onPageWillGetDeactivated(Direction direction, PageChangingEvent event, DataBindingContext dbc) {
- if (direction == Direction.BACKWARDS) {
- return;
- }
- boolean validCredemtials = performAuthentication();
- event.doit = validCredemtials;
- if (!event.doit) {
- passwordText.setFocus();
- passwordText.selectAll();
- }
- }
-
- public boolean performAuthentication() {
- try {
- WizardUtils.runInWizard(new Job("Verifying user credentials...") {
- @Override
- protected IStatus run(IProgressMonitor monitor) {
- pageModel.validateCredentials();
- monitor.done();
- return Status.OK_STATUS;
- }
- }, new DelegatingProgressMonitor(), getContainer(), getDatabindingContext());
- } catch (InterruptedException e) {
- Logger.error("Failed to authenticate on OpenShift", e);
- return false;
- } catch (InvocationTargetException e) {
- Logger.error("Failed to authenticate on OpenShift", e);
- return false;
- }
- return pageModel.areCredentialsValid();
- }
-
- class CredentialsInputValidator extends MultiValidator {
-
- private final IObservableValue rhLoginObservable;
-
- private final IObservableValue passwordObservable;
-
- public CredentialsInputValidator(IObservableValue rhLoginObservable,
- IObservableValue passwordObservable) {
- this.rhLoginObservable = rhLoginObservable;
- this.passwordObservable = passwordObservable;
- }
-
- @Override
- protected IStatus validate() {
- // set the wizard page status to OK as soon as a user types
- // something..
- final String rhLoginValue = (String) rhLoginObservable.getValue();
- final String passwordValue = (String) passwordObservable.getValue();
- if (!StringUtils.isEmpty(rhLoginValue)
- && !StringUtils.isEmpty(passwordValue)) {
- return ValidationStatus.ok();
- }
- return ValidationStatus.cancel("Please provide your OpenShift user credentials");
- }
- }
-
- class CredentialsStatusValidator extends MultiValidator {
-
- private final IObservableValue credentialsStatusObservable;
-
- private final IObservableValue passwordTextObservable;
-
- public CredentialsStatusValidator(IObservableValue credentialsStatusObservable,
- IObservableValue passwordTextObservable) {
- this.credentialsStatusObservable = credentialsStatusObservable;
- this.passwordTextObservable = passwordTextObservable;
- }
-
- @Override
- protected IStatus validate() {
- final IStatus credentialsValidityStatus = (IStatus) credentialsStatusObservable.getValue();
-
- if (credentialsValidityStatus != null) {
- return pageModel.getCredentialsStatus();
- }
- return ValidationStatus.ok();
- }
-
- @Override
- public IObservableList getTargets() {
- WritableList targets = new WritableList();
- targets.add(passwordTextObservable);
- return targets;
- }
- }
-
- public UserDelegate getUser() {
- return pageModel.getUser();
- }
-}
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/CredentialsWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/credentials/CredentialsWizardPageModel.java 2012-10-04 08:30:34 UTC (rev 44283)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/connection/CredentialsWizardPageModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -1,226 +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.wizard.credentials;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.jboss.tools.common.ui.databinding.ObservableUIPojo;
-import org.jboss.tools.common.ui.preferencevalue.StringPreferenceValue;
-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.utils.Logger;
-import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
-import org.jboss.tools.openshift.express.internal.ui.wizard.IUserAwareModel;
-
-import com.openshift.client.NotFoundOpenShiftException;
-import com.openshift.client.configuration.OpenShiftConfiguration;
-
-/**
- * @author Andre Dietisheim
- * @author Xavier Coulon
- */
-public class CredentialsWizardPageModel extends ObservableUIPojo {
-
- private static final String RHLOGIN_PREFS_KEY = "org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardModel_RHLOGIN";
-
- public static final String PROPERTY_SERVER_URL = "serverUrl";
- public static final String PROPERTY_RHLOGIN = "rhLogin";
- public static final String PROPERTY_PASSWORD = "password";
- public static final String PROPERTY_CREDENTIALS_STATUS = "credentialsStatus";
- public static final String PROPERTY_REMEMBER_PASSWORD = "rememberPassword";
-
- private String rhLogin;
- private String password;
- private boolean rememberPassword = false;
- private IStatus credentialsStatus;
- private StringPreferenceValue rhLoginPreferenceValue;
- private final String libraServer;
-
- private IUserAwareModel wizardModel;
-
- public CredentialsWizardPageModel(IUserAwareModel wizardModel) {
- this.wizardModel = wizardModel;
- this.rhLoginPreferenceValue = new StringPreferenceValue(RHLOGIN_PREFS_KEY, OpenShiftUIActivator.PLUGIN_ID);
- this.libraServer = initLibraServer();
- this.rhLogin = initRhLogin();
- this.password = initPassword();
- resetCredentialsStatus();
- }
-
- private String initLibraServer() {
- try {
- return new OpenShiftConfiguration().getLibraServer();
- } catch (Exception e) {
- Logger.error("Failed to load OpenShift configuration from client library", e);
- }
- return null;
- }
-
- protected String initRhLogin() {
- String rhLogin = null;
-
- UserDelegate user = wizardModel.getUser();
- if (user == null) {
- user = UserModel.getDefault().getRecentUser();
- }
- if (user != null) {
- rhLogin = user.getUsername();
- } else {
- rhLogin = rhLoginPreferenceValue.get();
- if (rhLogin == null
- || rhLogin.length() == 0) {
- rhLogin = getConfiguredUserName();
- }
- }
-
- return rhLogin;
- }
-
- protected String initPassword() {
- String password = null;
- if (!StringUtils.isEmpty(libraServer)
- && !StringUtils.isEmpty(rhLogin)) {
- password = UserModel.getDefault().getPasswordFromSecureStorage(rhLogin);
- setRememberPassword(!StringUtils.isEmpty(password));
- }
- return password;
- }
-
- private void storePassword(UserDelegate user) {
- UserModel.getDefault().setPasswordInSecureStorage(user.getUsername(), password);
- }
-
- private void erasePasswordStore() {
- UserModel.getDefault().clearPasswordInSecureStorage(rhLogin);
- }
-
- protected String getConfiguredUserName() {
- String configuredUsername = null;
- try {
- // retrieved from the local 'express.conf' configuration file
- configuredUsername = new OpenShiftConfiguration().getRhlogin();
- } catch (Exception e) {
- Logger.error("Cound not retrieve rhlogin from express configuration");
- }
- return configuredUsername;
- }
-
- public String getRhLogin() {
- return rhLogin;
- }
-
- public void setRhLogin(String rhLogin) {
- if (rhLogin != null && !rhLogin.equals(this.rhLogin)) {
- rhLoginPreferenceValue.store(rhLogin);
- firePropertyChange(PROPERTY_RHLOGIN, this.rhLogin, this.rhLogin = rhLogin);
- resetCredentialsStatus();
- }
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- if (password != null && !password.equals(this.password)) {
- firePropertyChange(PROPERTY_PASSWORD, this.password, this.password = password);
- resetCredentialsStatus();
- }
- }
-
- /**
- * @return the rememberPassword
- */
- public boolean isRememberPassword() {
- return rememberPassword;
- }
-
- /**
- * @param rememberPassword
- * the rememberPassword to set
- */
- public void setRememberPassword(boolean rememberPassword) {
- firePropertyChange(PROPERTY_REMEMBER_PASSWORD, this.rememberPassword, this.rememberPassword = rememberPassword);
- }
-
- private void resetCredentialsStatus() {
- setCredentialsStatus(null);
- }
-
- private void setCredentialsStatus(IStatus status) {
- firePropertyChange(PROPERTY_CREDENTIALS_STATUS, this.credentialsStatus, this.credentialsStatus = status);
- }
-
- public IStatus getCredentialsStatus() {
- return credentialsStatus;
- }
-
- public boolean areCredentialsValid() {
- IStatus validationStatus = getCredentialsStatus();
- return validationStatus != null && validationStatus.isOK();
- }
-
- public boolean areCredentialsValidated() {
- return credentialsStatus != null;
- }
-
- public IStatus validateCredentials() {
- IStatus status = getValidityStatus(getRhLogin(), getPassword());
- setCredentialsStatus(status);
- return status;
- }
-
- private IStatus getValidityStatus(String rhLogin, String password) {
- IStatus status = Status.OK_STATUS;
- UserDelegate user = null;
- try {
- // reuse previous user if it was properly logged in
- user = UserModel.getDefault().findUser(rhLogin);
- // check user credentials if not logged before or if input password changed
- if(user != null && user.isConnected() && user.getPassword().equals(password)) {
- user.setRememberPassword(rememberPassword);
- wizardModel.setUser(user);
- storeUser(user);
- } else {
- user = new UserDelegate(UserModel.getDefault().createUser(rhLogin, password), rememberPassword);
- if (user.isValid()) {
- storeUser(user);
- } else {
- status = OpenShiftUIActivator.createErrorStatus(NLS.bind(
- "The credentials for user {0} are not valid", user.getUsername()));
- }
- }
- } catch (NotFoundOpenShiftException e) {
- // valid user without domain
- storeUser(user);
- } catch (Exception e) {
- status = OpenShiftUIActivator.createErrorStatus(NLS.bind(
- "Could not check user credentials: {0}.", e.getMessage()));
- }
- return status;
- }
-
- private void storeUser(UserDelegate user) {
- wizardModel.setUser(user);
- if (rememberPassword) {
- storePassword(user);
- } else {
- erasePasswordStore();
- }
- }
-
- public UserDelegate getUser() {
- return wizardModel.getUser();
- }
-
-}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/EditDomainDialog.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/EditDomainDialog.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/EditDomainDialog.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -17,7 +17,7 @@
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.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -31,7 +31,7 @@
private EditDomainWizardPageModel model;
- public EditDomainDialog(UserDelegate user) {
+ public EditDomainDialog(Connection user) {
this.model = new EditDomainWizardPageModel(user);
setNeedsProgressMonitor(true);
setWindowTitle("Edit Domain");
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/EditDomainWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/EditDomainWizardPageModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/EditDomainWizardPageModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -13,7 +13,7 @@
import java.net.SocketTimeoutException;
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.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -30,9 +30,9 @@
private String domainId;
- private final UserDelegate user;
+ private final Connection user;
- public EditDomainWizardPageModel(UserDelegate user) {
+ public EditDomainWizardPageModel(Connection user) {
this.user = user;
try {
if (user.getDefaultDomain() != null) {
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/NewDomainDialog.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/NewDomainDialog.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/NewDomainDialog.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -17,7 +17,7 @@
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.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
@@ -30,7 +30,7 @@
private NewDomainWizardPageModel model;
- public NewDomainDialog(UserDelegate user) {
+ public NewDomainDialog(Connection user) {
this.model = new NewDomainWizardPageModel(user);
setNeedsProgressMonitor(true);
setWindowTitle("Create Domain");
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/NewDomainWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/NewDomainWizardPageModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/domain/NewDomainWizardPageModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -13,7 +13,7 @@
import java.io.IOException;
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.core.connection.Connection;
import com.openshift.client.IDomain;
import com.openshift.client.OpenShiftException;
@@ -28,9 +28,9 @@
private String domainId;
private IDomain domain;
- private UserDelegate user;
+ private Connection user;
- public NewDomainWizardPageModel(UserDelegate user) {
+ public NewDomainWizardPageModel(Connection user) {
this.user = user;
}
@@ -54,7 +54,7 @@
return domain;
}
- public UserDelegate getUser() {
+ public Connection getUser() {
return user;
}
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/EmbedCartridgeWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/EmbedCartridgeWizard.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/EmbedCartridgeWizard.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -11,7 +11,7 @@
package org.jboss.tools.openshift.express.internal.ui.wizard.embed;
import org.eclipse.jface.wizard.Wizard;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.wizard.application.ApplicationWizardModel;
import com.openshift.client.IApplication;
@@ -24,7 +24,7 @@
private ApplicationWizardModel wizardModel;
private EmbedCartridgeWizardPage embedCartridgeWizardPage;
- public EmbedCartridgeWizard(IApplication application, UserDelegate user) {
+ public EmbedCartridgeWizard(IApplication application, Connection user) {
this.wizardModel = new ApplicationWizardModel(application, user);
setNeedsProgressMonitor(true);
setWindowTitle("Edit Embedded Cartridges");
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/EmbedCartridgeWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/EmbedCartridgeWizardPageModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/EmbedCartridgeWizardPageModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -17,7 +17,7 @@
import java.util.Set;
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.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.wizard.application.ApplicationWizardModel;
import com.openshift.client.IApplication;
@@ -128,7 +128,7 @@
}
@Override
- public UserDelegate getUser() {
+ public Connection getUser() {
return wizardModel.getUser();
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/IEmbedCartridgesWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/IEmbedCartridgesWizardPageModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/embed/IEmbedCartridgesWizardPageModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -13,7 +13,7 @@
import java.net.SocketTimeoutException;
import java.util.Set;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import com.openshift.client.IDomain;
import com.openshift.client.IEmbeddableCartridge;
@@ -38,5 +38,5 @@
public IDomain getDomain() throws SocketTimeoutException, OpenShiftException;
- public UserDelegate getUser();
+ public Connection getUser();
}
\ No newline at end of file
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AbstractSSHKeyWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AbstractSSHKeyWizardPageModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AbstractSSHKeyWizardPageModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -11,7 +11,7 @@
package org.jboss.tools.openshift.express.internal.ui.wizard.ssh;
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.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.utils.SSHUtils;
import com.openshift.client.OpenShiftException;
@@ -22,9 +22,9 @@
public abstract class AbstractSSHKeyWizardPageModel extends ObservableUIPojo implements ISSHKeyWizardPageModel {
private String name;
- private UserDelegate user;
+ private Connection user;
- public AbstractSSHKeyWizardPageModel(UserDelegate user) {
+ public AbstractSSHKeyWizardPageModel(Connection user) {
this.user = user;
}
@@ -48,7 +48,7 @@
return user.hasSSHPublicKey(publicKeyContent);
}
- protected UserDelegate getUser() {
+ protected Connection getUser() {
return user;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizard.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizard.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -12,17 +12,17 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.wizard.Wizard;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
/**
* @author André Dietisheim
*/
public class AddSSHKeyWizard extends Wizard {
- private UserDelegate user;
+ private Connection user;
private AddSSHKeyWizardPage addSSHKeyWizardPage;
- public AddSSHKeyWizard(UserDelegate user) {
+ public AddSSHKeyWizard(Connection user) {
this.user = user;
setNeedsProgressMonitor(true);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPage.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPage.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -34,7 +34,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.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.databinding.RequiredControlDecorationUpdater;
import org.jboss.tools.openshift.express.internal.ui.utils.SSHUtils;
@@ -52,7 +52,7 @@
private AddSSHKeyWizardPageModel pageModel;
- public AddSSHKeyWizardPage(UserDelegate user, IWizard wizard) {
+ public AddSSHKeyWizardPage(Connection user, IWizard wizard) {
super("Add existing SSH Key", "Add an exiting SSH key to your OpenShift user " + user.getUsername(),
"AddSSHKeysPage", wizard);
this.pageModel = new AddSSHKeyWizardPageModel(user);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPageModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/AddSSHKeyWizardPageModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -14,7 +14,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import com.openshift.client.OpenShiftException;
import com.openshift.client.SSHPublicKey;
@@ -28,7 +28,7 @@
private String keyPath;
- public AddSSHKeyWizardPageModel(UserDelegate user) {
+ public AddSSHKeyWizardPageModel(Connection user) {
super(user);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ManageSSHKeysWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ManageSSHKeysWizard.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ManageSSHKeysWizard.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -11,16 +11,16 @@
package org.jboss.tools.openshift.express.internal.ui.wizard.ssh;
import org.eclipse.jface.wizard.Wizard;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
/**
* @author André Dietisheim
*/
public class ManageSSHKeysWizard extends Wizard {
- private UserDelegate user;
+ private Connection user;
- public ManageSSHKeysWizard(UserDelegate user) {
+ public ManageSSHKeysWizard(Connection user) {
this.user = user;
setNeedsProgressMonitor(true);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ManageSSHKeysWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ManageSSHKeysWizardPage.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ManageSSHKeysWizardPage.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -41,7 +41,7 @@
import org.eclipse.ui.statushandlers.StatusManager;
import org.jboss.tools.common.ui.WizardUtils;
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.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.job.LoadKeysJob;
import org.jboss.tools.openshift.express.internal.ui.utils.JobChainBuilder;
@@ -61,7 +61,7 @@
private ManageSSHKeysWizardPageModel pageModel;
private TableViewer viewer;
- public ManageSSHKeysWizardPage(UserDelegate user, IWizard wizard) {
+ public ManageSSHKeysWizardPage(Connection user, IWizard wizard) {
super("Manage SSH Keys",
"Manage the SSH keys that are available to your OpenShift user\n" + user.getUsername(),
"ManageSSHKeysPage", wizard);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ManageSSHKeysWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ManageSSHKeysWizardPageModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/ManageSSHKeysWizardPageModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -13,7 +13,7 @@
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.core.connection.Connection;
import com.openshift.client.IOpenShiftSSHKey;
@@ -24,10 +24,10 @@
public static final String PROPERTY_SELECTED_KEY = "selectedSSHKey";
- private UserDelegate user;
+ private Connection user;
private IOpenShiftSSHKey selectedKey;
- public ManageSSHKeysWizardPageModel(UserDelegate user) {
+ public ManageSSHKeysWizardPageModel(Connection user) {
this.user = user;
}
@@ -58,7 +58,7 @@
user.refresh();
}
- public UserDelegate getUser() {
+ public Connection getUser() {
return user;
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizard.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizard.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizard.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -12,17 +12,17 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jface.wizard.Wizard;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
/**
* @author André Dietisheim
*/
public class NewSSHKeyWizard extends Wizard {
- private UserDelegate user;
+ private Connection user;
private NewSSHKeyWizardPage newSSHKeyWizardPage;
- public NewSSHKeyWizard(UserDelegate user) {
+ public NewSSHKeyWizard(Connection user) {
this.user = user;
setNeedsProgressMonitor(true);
}
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPage.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -35,7 +35,7 @@
import org.eclipse.swt.widgets.Text;
import org.jboss.tools.common.ui.WizardUtils;
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.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.databinding.FileNameValidator;
import org.jboss.tools.openshift.express.internal.ui.databinding.RequiredControlDecorationUpdater;
@@ -54,7 +54,7 @@
private NewSSHKeyWizardPageModel pageModel;
- public NewSSHKeyWizardPage(UserDelegate user, IWizard wizard) {
+ public NewSSHKeyWizardPage(Connection user, IWizard wizard) {
super("Add new SSH key", "Add a new SSH key to your OpenShift user " + user.getUsername(),
"NewSSHKeysPage", wizard);
this.pageModel = new NewSSHKeyWizardPageModel(user);
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPageModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPageModel.java 2012-10-10 08:33:15 UTC (rev 44400)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ssh/NewSSHKeyWizardPageModel.java 2012-10-10 09:40:51 UTC (rev 44401)
@@ -14,7 +14,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
-import org.jboss.tools.openshift.express.internal.core.console.UserDelegate;
+import org.jboss.tools.openshift.express.internal.core.connection.Connection;
import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.SSHUtils;
import org.jboss.tools.openshift.express.internal.ui.utils.StringUtils;
@@ -41,7 +41,7 @@
private String privateKeyPathphrase;
private String publicKeyName;
- public NewSSHKeyWizardPageModel(UserDelegate user) {
+ public NewSSHKeyWizardPageModel(Connection user) {
super(user);
}
12 years, 3 months
- 1
- 0