JBoss Tools SVN: r30481 - branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-04-11 13:32:18 -0400 (Mon, 11 Apr 2011)
New Revision: 30481
Modified:
branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
Log:
https://issues.jboss.org/browse/JBIDE-8710
Modified: branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
--- branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-04-11 16:44:10 UTC (rev 30480)
+++ branches/jbosstools-3.2.x/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-04-11 17:32:18 UTC (rev 30481)
@@ -162,7 +162,14 @@
IBean[] bs = injectionPoint.getCDIProject().getBeans();
String injectionPointTypeName = injectionPoint.getClassBean().getBeanClass().getFullyQualifiedName();
- String injectionPointPackage = injectionPointTypeName.substring(0,injectionPointTypeName.lastIndexOf(MarkerResolutionUtils.DOT));
+ String injectionPointPackage = null;
+
+ int dotLastIndex = injectionPointTypeName.lastIndexOf(MarkerResolutionUtils.DOT);
+
+ if(dotLastIndex < 0)
+ injectionPointPackage = "";
+ else
+ injectionPointPackage = injectionPointTypeName.substring(0, dotLastIndex);
ArrayList<IBean> beans = new ArrayList<IBean>();
for(IBean bean : bs){
@@ -174,7 +181,15 @@
CDIUIPlugin.getDefault().logError(ex);
}
String beanTypeName = bean.getBeanClass().getFullyQualifiedName();
- String beanPackage = beanTypeName.substring(0,beanTypeName.lastIndexOf(MarkerResolutionUtils.DOT));
+ String beanPackage = null;
+
+ dotLastIndex = beanTypeName.lastIndexOf(MarkerResolutionUtils.DOT);
+
+ if(dotLastIndex < 0)
+ beanPackage = "";
+ else
+ beanPackage = beanTypeName.substring(0,dotLastIndex);
+
if(isPublic || injectionPointPackage.equals(beanPackage))
beans.add(bean);
}
@@ -182,7 +197,6 @@
return beans;
}
-
private IInjectionPoint findInjectionPoint(IFile file, int start){
IJavaElement element = findJavaElement(file, start);
if(element == null)
13 years, 6 months
JBoss Tools SVN: r30480 - workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-11 12:44:10 -0400 (Mon, 11 Apr 2011)
New Revision: 30480
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
Log:
[JBIDE-8690] added test that checks if app was deployed
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-11 16:42:51 UTC (rev 30479)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-11 16:44:10 UTC (rev 30480)
@@ -13,6 +13,7 @@
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.fail;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.BufferedInputStream;
import java.io.File;
@@ -93,7 +94,6 @@
assertNotNull(deployable.getStatus());
}
- @Ignore
@Test
public void isDeployed() throws DeploymentException, URISyntaxException, IOException {
String warName = "minimalistic.war";
@@ -102,6 +102,7 @@
Deployable deployable = deployables.get(0);
deployable.getStatus(); // wait for deployment to have finished
String response = getServerResponse(new URL(MessageFormat.format("http://{0}:{1}/{2}", HOST, WEB_PORT, deployable.getName())));
+ assertTrue(response.indexOf("minimalistic") >= 0);
}
private File getWarFile(String name) throws URISyntaxException, IOException {
13 years, 6 months
JBoss Tools SVN: r30479 - workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-11 12:42:51 -0400 (Mon, 11 Apr 2011)
New Revision: 30479
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
Log:
[JBIDE-8690] added test that checks if app was deployed
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-11 16:37:33 UTC (rev 30478)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-11 16:42:51 UTC (rev 30479)
@@ -14,14 +14,18 @@
import static junit.framework.Assert.fail;
import static org.junit.Assert.assertNotNull;
+import java.io.BufferedInputStream;
import java.io.File;
import java.io.IOException;
+import java.io.StringWriter;
import java.net.ConnectException;
+import java.net.HttpURLConnection;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.UnknownHostException;
+import java.text.MessageFormat;
import java.util.List;
import org.eclipse.core.runtime.FileLocator;
@@ -40,12 +44,14 @@
public class DeploymentBuilderIntegrationTest {
private static final String WAR_FOLDER = "/wars/";
-
private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as7.deployment.tests";
+ private static final int WEBAPP_RESPONSE_TIMEOUT = 10 * 1024;
+
private static final String HOST = "localhost";
- private static final int PORT = 9999;
-
+ private static final int MGMT_PORT = 9999;
+ private static final int WEB_PORT = 8080;
+
@Before
public void setUp() throws UnknownHostException, IOException {
assertAs7IsRunning();
@@ -54,10 +60,10 @@
private void assertAs7IsRunning() throws UnknownHostException, IOException {
try {
Socket socket = new Socket();
- socket.connect(new InetSocketAddress(HOST, PORT));
+ socket.connect(new InetSocketAddress(HOST, MGMT_PORT));
socket.close();
} catch (ConnectException e) {
- fail("JBoss as7 seems not to run on " + HOST + ", test cannot access it's management API on port " + PORT);
+ fail("JBoss as7 seems not to run on " + HOST + ", test cannot access it's management API on port " + MGMT_PORT);
}
}
@@ -65,15 +71,16 @@
@Test
public void canDeploy() throws DeploymentException, URISyntaxException, IOException {
File file = getWarFile("minimalistic.war");
- new DeploymentBuilder(HOST, PORT).add(file).deploy();
+ new DeploymentBuilder(HOST, MGMT_PORT).add(file).deploy();
}
+
@Ignore
@Test
public void returnsDeployables() throws DeploymentException, URISyntaxException, IOException {
String warName = "minimalistic.war";
File file = getWarFile(warName );
- List<Deployable> deployables = new DeploymentBuilder(HOST, PORT).add(file).deploy();
+ List<Deployable> deployables = new DeploymentBuilder(HOST, MGMT_PORT).add(file).deploy();
assertEquals(1, deployables.size());
assertEquals(warName, deployables.get(0).getName());
}
@@ -81,14 +88,45 @@
@Test
public void canGetDeploymentStatus() throws DeploymentException, URISyntaxException, IOException {
File file = getWarFile("minimalistic.war");
- List<Deployable> deployables = new DeploymentBuilder(HOST, PORT).add(file).deploy();
+ List<Deployable> deployables = new DeploymentBuilder(HOST, MGMT_PORT).add(file).deploy();
Deployable deployable = deployables.get(0);
assertNotNull(deployable.getStatus());
}
+ @Ignore
+ @Test
+ public void isDeployed() throws DeploymentException, URISyntaxException, IOException {
+ String warName = "minimalistic.war";
+ File file = getWarFile(warName );
+ List<Deployable> deployables = new DeploymentBuilder(HOST, MGMT_PORT).add(file).deploy();
+ Deployable deployable = deployables.get(0);
+ deployable.getStatus(); // wait for deployment to have finished
+ String response = getServerResponse(new URL(MessageFormat.format("http://{0}:{1}/{2}", HOST, WEB_PORT, deployable.getName())));
+ }
+
private File getWarFile(String name) throws URISyntaxException, IOException {
Bundle bundle = Platform.getBundle(BUNDLE_ID);
URL entryUrl = bundle.getEntry(WAR_FOLDER + name);
return new File(FileLocator.resolve(entryUrl).toURI());
}
+
+ private String getServerResponse(URL url) throws IOException {
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setUseCaches(false);
+ connection.setDoInput(true);
+ connection.setAllowUserInteraction(false);
+ connection.setConnectTimeout(WEBAPP_RESPONSE_TIMEOUT);
+ connection.setInstanceFollowRedirects(true);
+ connection.setDoOutput(false);
+ BufferedInputStream in = new BufferedInputStream(connection.getInputStream());
+ return toString(in);
+ }
+
+ private String toString(BufferedInputStream in) throws IOException {
+ StringWriter writer = new StringWriter();
+ for(int data = -1; ((data = in.read()) != -1); ) {
+ writer.write(data);
+ }
+ return writer.toString();
+ }
}
13 years, 6 months
JBoss Tools SVN: r30478 - trunk/download.jboss.org/jbosstools/updates/stable/helios.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2011-04-11 12:37:33 -0400 (Mon, 11 Apr 2011)
New Revision: 30478
Modified:
trunk/download.jboss.org/jbosstools/updates/stable/helios/index.html
Log:
clone HTML from updates/JBossTools-3.2.0.GA/ into this folder, then fix CSS ref INSTEAD of redirecting #makeMaxHappy
Modified: trunk/download.jboss.org/jbosstools/updates/stable/helios/index.html
===================================================================
--- trunk/download.jboss.org/jbosstools/updates/stable/helios/index.html 2011-04-11 15:59:10 UTC (rev 30477)
+++ trunk/download.jboss.org/jbosstools/updates/stable/helios/index.html 2011-04-11 16:37:33 UTC (rev 30478)
@@ -1 +1,136 @@
-<meta http-equiv="refresh" content="0;url=http://download.jboss.org/jbosstools/updates/JBossTools-3.2.0.GA/">
+<html>
+<head>
+<title>JBoss Tools Stable Release Update Site: 3.2.0.GA 2011-02-16_18-30-44-H329</title>
+<style>
+@import url("../../web/site.css");
+</style>
+</head>
+<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
+<table marginheight="0" marginwidth="0" leftmargin="0" topmargin="0"
+ cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2"><img
+ src="https://www.jboss.org/dms/tools/images/tools-banner.png" /></td>
+ </tr>
+ <tr>
+ <td>  </td>
+ </tr>
+ <tr>
+ <td>  </td>
+ <td>
+ <h2 class="title">JBoss Tools Stable Release Update Site</h2>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span>Latest Build: 3.2.0.GA 2011-02-16_18-30-44-H329</span></td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">This is the <b>Stable Release</b>
+ Update Site for JBoss Tools. See <a class="link"
+ href="http://www.jboss.org/tools/download/update">Installation
+ Instructions</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 90px">
+ <td class="bodyText">
+ <p class="bodyText"><b class="bodyText" style="color: red;">NOTE:</b>
+<!-- see http://www.jboss.org/tools/download/dev#noteBirt for matching copy -->
+Some features (such as BIRT, Maven, or GWT) require additional third-party prerequisites not available from Eclipse.org or JBoss.org. These can be installed from the following update sites, which should be added automatically when you add the JBoss Tools update site to your Eclipse's list of Available Software Sites. To verify which sites are enabled, open <code><strong>Window > Preferences > Install/Update > Available Software Sites</strong></code>. To add sites, Click the <code><strong>Add...</strong></code> button, then right-click the link(s) below, copy the link(s), and paste them into Eclipse one by one as needed.
+ </p>
+
+ <ul>
+ <li><a href="http://download.eclipse.org//birt/update-site/2.6/">BIRT 2.6 Update Site</a></li>
+ <li><a href="http://m2eclipse.sonatype.org/sites/m2e/">m2eclipse 0.10 Release</a></li>
+ <li><a href="http://m2eclipse.sonatype.org/sites/m2e-extras/">m2eclipse 0.10 Extras</a></li>
+ <li><a href="http://subclipse.tigris.org/update_1.6.x"/>Subclipse 1.6 Update Site </a></li>
+ <li><a href="http://dl.google.com/eclipse/plugin/3.6/">Google Plugin for Eclipse 3.6 (Helios)</a></li>
+ </ul>
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">You can also download JBoss Tools as
+ individual zips for offline installation. See <a class="link"
+ href="http://www.jboss.org/tools/download">JBoss Tools
+ Downloads</a>.</p>
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">For more information, see <a
+ href="http://www.jboss.org/tools/download/installation">Installation
+ methods</a>.</p>
+ </td>
+ </tr>
+ <tr>
+ <td class="spacer"><br />
+ </td>
+ <td class="spacer"><br />
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td></td>
+ <td>
+ <table width="100%">
+ <tr class="header">
+ <td class="sub-header" width="100%"><span> Installation
+ Types</span></td>
+ </tr>
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <p class="bodyText">Depending on how close to the bleeding edge
+ you like to be, there are several types of releases available.</p>
+ <br />
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Stable Releases</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/stable.html">Stable
+ releases</a> are - as indicated by their name - stable.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="light-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Development Milestones</h4>
+
+ <p><a href="https://www.jboss.org/tools/download/dev.html">Development
+ builds</a>, released once per milestone and only a few times a year, are
+ fairly stable, but there may be some things which do not yet work.
+ If you would like to try one of these milestones, we'd greatly
+ appreciate the assistance in testing and <a
+ href="https://jira.jboss.org/jira/browse/JBIDE">reporting of
+ issues in our issue tracker</a>.</p><br/>
+
+ </td>
+ </tr>
+
+ <tr class="dark-row" style="height: 30px">
+ <td class="bodyText">
+ <h4>Nightly Builds</h4>
+
+ <p>The <a
+ href="https://www.jboss.org/tools/download/nightly.html">bleeding
+ edge</a> contains the latest and greatest new features, but nothing is
+ stable or guaranteed - yet. If you're using a Milestone and need a
+ fix, you can update to the latest Nightly, or wait for the next
+ Milestone.</p><br/>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+</table>
+</html>
13 years, 6 months
JBoss Tools SVN: r30477 - workspace/adietish/org.jboss.ide.eclipse.as7.deployment.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-11 11:59:10 -0400 (Mon, 11 Apr 2011)
New Revision: 30477
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties
Log:
updated build properties
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties 2011-04-11 15:55:25 UTC (rev 30476)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties 2011-04-11 15:59:10 UTC (rev 30477)
@@ -5,8 +5,20 @@
jboss-as-controller-client-7.0.0.Beta2.jar,\
jboss-as-logging-7.0.0.Beta2.jar,\
jboss-as-protocol-7.0.0.Beta2.jar,\
- jboss-as-threads-7.0.0.Beta2.jar,\
jboss-dmr-1.0.0.Beta5.jar,\
jboss-marshalling-1.3.0.CR8.jar,\
shrinkwrap-api-1.0.0-alpha-11.jar,\
jboss-threads-2.0.0.CR8.jar
+src.includes = jboss-as-controller-client-7.0.0.Beta2-sources.jar,\
+ jboss-as-controller-client-7.0.0.Beta2.jar,\
+ jboss-as-logging-7.0.0.Beta2-sources.jar,\
+ jboss-as-logging-7.0.0.Beta2.jar,\
+ jboss-as-protocol-7.0.0.Beta2-sources.jar,\
+ jboss-as-protocol-7.0.0.Beta2.jar,\
+ jboss-dmr-1.0.0.Beta5-sources.jar,\
+ jboss-dmr-1.0.0.Beta5.jar,\
+ jboss-marshalling-1.3.0.CR8-sources.jar,\
+ jboss-marshalling-1.3.0.CR8.jar,\
+ jboss-threads-2.0.0.CR8-sources.jar,\
+ jboss-threads-2.0.0.CR8.jar,\
+ shrinkwrap-api-1.0.0-alpha-11.jar
13 years, 6 months
JBoss Tools SVN: r30476 - in workspace/adietish/org.jboss.ide.eclipse.as7.deployment: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-11 11:55:25 -0400 (Mon, 11 Apr 2011)
New Revision: 30476
Added:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/REAME.txt
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta2-sources.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta2.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-logging-7.0.0.Beta2-sources.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-logging-7.0.0.Beta2.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta2-sources.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta2.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-marshalling-1.3.0.CR8-sources.jar
Removed:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT-sources.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT-sources.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-logging-3.0.0.Beta3.jar
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/META-INF/MANIFEST.MF
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties
Log:
[JBIDE-8690] replaced Beta3 jars with equivalents from Beta2, added documentation
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath 2011-04-11 15:45:10 UTC (rev 30475)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath 2011-04-11 15:55:25 UTC (rev 30476)
@@ -1,14 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="jboss-marshalling-1.3.0.CR8.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-logging-3.0.0.Beta3.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.CR8.jar" sourcepath="jboss-threads-2.0.0.CR8-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="shrinkwrap-api-1.0.0-alpha-11.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar" sourcepath="jboss-dmr-1.0.0.Beta5-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="lib" path="jboss-as-controller-client-7.0.0.Beta2-sources.jar"/>
+ <classpathentry kind="lib" path="jboss-as-logging-7.0.0.Beta2-sources.jar"/>
+ <classpathentry kind="lib" path="jboss-as-protocol-7.0.0.Beta2-sources.jar"/>
+ <classpathentry kind="lib" path="jboss-dmr-1.0.0.Beta5-sources.jar"/>
+ <classpathentry kind="lib" path="jboss-threads-2.0.0.CR8-sources.jar"/>
+ <classpathentry kind="lib" path="jboss-as-controller-client-7.0.0.Beta2.jar"/>
+ <classpathentry kind="lib" path="jboss-as-logging-7.0.0.Beta2.jar"/>
+ <classpathentry kind="lib" path="jboss-as-protocol-7.0.0.Beta2.jar"/>
+ <classpathentry kind="lib" path="jboss-dmr-1.0.0.Beta5.jar"/>
+ <classpathentry kind="lib" path="jboss-marshalling-1.3.0.CR8-sources.jar"/>
+ <classpathentry kind="lib" path="jboss-marshalling-1.3.0.CR8.jar"/>
+ <classpathentry kind="lib" path="jboss-threads-2.0.0.CR8.jar"/>
+ <classpathentry kind="lib" path="shrinkwrap-api-1.0.0-alpha-11.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/META-INF/MANIFEST.MF
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/META-INF/MANIFEST.MF 2011-04-11 15:45:10 UTC (rev 30475)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/META-INF/MANIFEST.MF 2011-04-11 15:55:25 UTC (rev 30476)
@@ -8,12 +8,13 @@
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
- jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar,
- jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar,
+ jboss-as-controller-client-7.0.0.Beta2.jar,
+ jboss-as-logging-7.0.0.Beta2.jar,
+ jboss-as-protocol-7.0.0.Beta2.jar,
+ jboss-as-threads-7.0.0.Beta2.jar,
jboss-dmr-1.0.0.Beta5.jar,
+ jboss-marshalling-1.3.0.CR8.jar,
shrinkwrap-api-1.0.0-alpha-11.jar,
- jboss-threads-2.0.0.CR8.jar,
- jboss-logging-3.0.0.Beta3.jar,
- jboss-marshalling-1.3.0.CR8.jar
+ jboss-threads-2.0.0.CR8.jar
Export-Package: org.jboss.ide.eclipse.as7.deployment
Bundle-Vendor: JBoss by Red Hat
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/REAME.txt
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/REAME.txt (rev 0)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/REAME.txt 2011-04-11 15:55:25 UTC (rev 30476)
@@ -0,0 +1,4 @@
+You may fetch updated jars (and source jars) at the jboss maven repository:
+
+https://repository.jboss.org/nexus/content/groups/public-jboss/org/jboss/as/
+
\ No newline at end of file
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/REAME.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties 2011-04-11 15:45:10 UTC (rev 30475)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/build.properties 2011-04-11 15:55:25 UTC (rev 30476)
@@ -2,10 +2,11 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar,\
- jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar,\
+ jboss-as-controller-client-7.0.0.Beta2.jar,\
+ jboss-as-logging-7.0.0.Beta2.jar,\
+ jboss-as-protocol-7.0.0.Beta2.jar,\
+ jboss-as-threads-7.0.0.Beta2.jar,\
jboss-dmr-1.0.0.Beta5.jar,\
+ jboss-marshalling-1.3.0.CR8.jar,\
shrinkwrap-api-1.0.0-alpha-11.jar,\
- jboss-threads-2.0.0.CR8.jar,\
- jboss-logging-3.0.0.Beta3.jar,\
- jboss-marshalling-1.3.0.CR8.jar
+ jboss-threads-2.0.0.CR8.jar
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta2-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta2-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta2.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT-sources.jar
===================================================================
(Binary files differ)
Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-logging-7.0.0.Beta2-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-logging-7.0.0.Beta2-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-logging-7.0.0.Beta2.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-logging-7.0.0.Beta2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta2-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta2-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta2.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta2.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT-sources.jar
===================================================================
(Binary files differ)
Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar
===================================================================
(Binary files differ)
Deleted: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-logging-3.0.0.Beta3.jar
===================================================================
(Binary files differ)
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-marshalling-1.3.0.CR8-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-marshalling-1.3.0.CR8-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
13 years, 6 months
JBoss Tools SVN: r30475 - trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-04-11 11:45:10 -0400 (Mon, 11 Apr 2011)
New Revision: 30475
Modified:
trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java
Log:
OPEN - issue JBIDE-8347: top down ws impl class should contain throws clause if it's present in generated ws interface
https://issues.jboss.org/browse/JBIDE-8347
Modified: trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2011-04-11 15:43:39 UTC (rev 30474)
+++ trunk/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2011-04-11 15:45:10 UTC (rev 30475)
@@ -39,6 +39,7 @@
import org.eclipse.jdt.core.dom.MemberValuePair;
import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.core.dom.Modifier;
+import org.eclipse.jdt.core.dom.Name;
import org.eclipse.jdt.core.dom.NormalAnnotation;
import org.eclipse.jdt.core.dom.NumberLiteral;
import org.eclipse.jdt.core.dom.PackageDeclaration;
@@ -46,6 +47,7 @@
import org.eclipse.jdt.core.dom.PrimitiveType;
import org.eclipse.jdt.core.dom.QualifiedName;
import org.eclipse.jdt.core.dom.ReturnStatement;
+import org.eclipse.jdt.core.dom.SimpleName;
import org.eclipse.jdt.core.dom.SimpleType;
import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
import org.eclipse.jdt.core.dom.StringLiteral;
@@ -198,6 +200,7 @@
protected void generateImplClass(ICompilationUnit service)
throws CoreException, BadLocationException {
ASTParser astp = ASTParser.newParser(AST.JLS3);
+ astp.setKind(ASTParser.K_COMPILATION_UNIT);
astp.setSource(service);
CompilationUnit cu = (CompilationUnit) astp.createAST(null);
IPackageFragment pack = getImplPakcage();
@@ -416,8 +419,18 @@
Type sType = copyTypeFromOtherASTNode(ast, inMethod.getReturnType2());
md.setReturnType2(sType);
-
+
@SuppressWarnings("rawtypes")
+ List thrownExceptions = inMethod.thrownExceptions();
+ for (Object obj : thrownExceptions) {
+ if (obj instanceof SimpleName) {
+ SimpleName sname = (SimpleName) obj;
+ Name newName = ast.newName(sname.getFullyQualifiedName());
+ md.thrownExceptions().add(newName);
+ }
+ }
+
+ @SuppressWarnings("rawtypes")
List parameters = inMethod.parameters();
for (Object obj : parameters) {
@@ -429,7 +442,7 @@
implSvd.setType(copyTypeFromOtherASTNode(ast, svd.getType()));
md.parameters().add(implSvd);
}
-
+
// create method body
Block block = ast.newBlock();
// add log info statement
13 years, 6 months
JBoss Tools SVN: r30474 - branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands.
by jbosstools-commits＠lists.jboss.org
Author: bfitzpat
Date: 2011-04-11 11:43:39 -0400 (Mon, 11 Apr 2011)
New Revision: 30474
Modified:
branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java
Log:
OPEN - issue JBIDE-8347: top down ws impl class should contain throws clause if it's present in generated ws interface
https://issues.jboss.org/browse/JBIDE-8347
Modified: branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java
===================================================================
--- branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2011-04-11 15:30:15 UTC (rev 30473)
+++ branches/jbosstools-3.2.x/ws/plugins/org.jboss.tools.ws.creation.core/src/org/jboss/tools/ws/creation/core/commands/ImplementationClassCreationCommand.java 2011-04-11 15:43:39 UTC (rev 30474)
@@ -39,6 +39,7 @@
import org.eclipse.jdt.core.dom.MemberValuePair;
import org.eclipse.jdt.core.dom.MethodDeclaration;
import org.eclipse.jdt.core.dom.Modifier;
+import org.eclipse.jdt.core.dom.Name;
import org.eclipse.jdt.core.dom.NormalAnnotation;
import org.eclipse.jdt.core.dom.NumberLiteral;
import org.eclipse.jdt.core.dom.PackageDeclaration;
@@ -46,6 +47,7 @@
import org.eclipse.jdt.core.dom.PrimitiveType;
import org.eclipse.jdt.core.dom.QualifiedName;
import org.eclipse.jdt.core.dom.ReturnStatement;
+import org.eclipse.jdt.core.dom.SimpleName;
import org.eclipse.jdt.core.dom.SimpleType;
import org.eclipse.jdt.core.dom.SingleVariableDeclaration;
import org.eclipse.jdt.core.dom.StringLiteral;
@@ -198,6 +200,7 @@
protected void generateImplClass(ICompilationUnit service)
throws CoreException, BadLocationException {
ASTParser astp = ASTParser.newParser(AST.JLS3);
+ astp.setKind(ASTParser.K_COMPILATION_UNIT);
astp.setSource(service);
CompilationUnit cu = (CompilationUnit) astp.createAST(null);
IPackageFragment pack = getImplPakcage();
@@ -416,8 +419,18 @@
Type sType = copyTypeFromOtherASTNode(ast, inMethod.getReturnType2());
md.setReturnType2(sType);
-
+
@SuppressWarnings("rawtypes")
+ List thrownExceptions = inMethod.thrownExceptions();
+ for (Object obj : thrownExceptions) {
+ if (obj instanceof SimpleName) {
+ SimpleName sname = (SimpleName) obj;
+ Name newName = ast.newName(sname.getFullyQualifiedName());
+ md.thrownExceptions().add(newName);
+ }
+ }
+
+ @SuppressWarnings("rawtypes")
List parameters = inMethod.parameters();
for (Object obj : parameters) {
@@ -429,7 +442,7 @@
implSvd.setType(copyTypeFromOtherASTNode(ast, svd.getType()));
md.parameters().add(implSvd);
}
-
+
// create method body
Block block = ast.newBlock();
// add log info statement
13 years, 6 months
JBoss Tools SVN: r30473 - in workspace/adietish: org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-11 11:30:15 -0400 (Mon, 11 Apr 2011)
New Revision: 30473
Added:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT-sources.jar
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-dmr-1.0.0.Beta5-sources.jar
Modified:
workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/Deployable.java
workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentBuilder.java
Log:
[JBIDE-8690] added further source jars
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath 2011-04-11 14:17:35 UTC (rev 30472)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/.classpath 2011-04-11 15:30:15 UTC (rev 30473)
@@ -4,9 +4,9 @@
<classpathentry exported="true" kind="lib" path="jboss-logging-3.0.0.Beta3.jar"/>
<classpathentry exported="true" kind="lib" path="jboss-threads-2.0.0.CR8.jar" sourcepath="jboss-threads-2.0.0.CR8-sources.jar"/>
<classpathentry exported="true" kind="lib" path="shrinkwrap-api-1.0.0-alpha-11.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Beta5.jar" sourcepath="jboss-dmr-1.0.0.Beta5-sources.jar"/>
<classpathentry exported="true" kind="lib" path="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="jboss-as-controller-client-7.0.0.Beta3-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar"/>
+ <classpathentry exported="true" kind="lib" path="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT.jar" sourcepath="jboss-as-protocol-7.0.0.Beta3-SNAPSHOT-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-as-protocol-7.0.0.Beta3-SNAPSHOT-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-dmr-1.0.0.Beta5-sources.jar
===================================================================
(Binary files differ)
Property changes on: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/jboss-dmr-1.0.0.Beta5-sources.jar
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/Deployable.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/Deployable.java 2011-04-11 14:17:35 UTC (rev 30472)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/Deployable.java 2011-04-11 15:30:15 UTC (rev 30473)
@@ -56,6 +56,10 @@
}
private IStatus createStatus(DeploymentAction action, ServerDeploymentActionResult actionResult) {
+ if (actionResult == null) {
+ return null;
+ }
+
IStatus status = null;
switch (actionResult.getResult()) {
case NOT_EXECUTED:
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentBuilder.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentBuilder.java 2011-04-11 14:17:35 UTC (rev 30472)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment/src/org/jboss/ide/eclipse/as7/deployment/DeploymentBuilder.java 2011-04-11 15:30:15 UTC (rev 30473)
@@ -28,7 +28,7 @@
*/
public class DeploymentBuilder {
- public static final long DEFAULT_TIMEOUT = 15 * 1000;
+ public static final long DEFAULT_TIMEOUT = 30 * 1000;
private final List<Deployable> deployables = new ArrayList<Deployable>();
private long timeout = DEFAULT_TIMEOUT;
@@ -71,8 +71,6 @@
return deployables;
} catch (Exception e) {
throw new DeploymentException(e);
- } finally {
- cleanup();
}
}
@@ -89,8 +87,4 @@
deployable.setDeploymentAction(builder.getLastAction());
}
}
-
- private void cleanup() {
- session.close();
- }
}
Modified: workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java
===================================================================
--- workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-11 14:17:35 UTC (rev 30472)
+++ workspace/adietish/org.jboss.ide.eclipse.as7.deployment.tests/src/org/jboss/ide/eclipse/as7/deployment/tests/DeploymentBuilderIntegrationTest.java 2011-04-11 15:30:15 UTC (rev 30473)
@@ -30,6 +30,7 @@
import org.jboss.ide.eclipse.as7.deployment.DeploymentBuilder;
import org.jboss.ide.eclipse.as7.deployment.DeploymentException;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.osgi.framework.Bundle;
@@ -38,7 +39,7 @@
*/
public class DeploymentBuilderIntegrationTest {
- private static final String WAR_FOLDER = "wars/";
+ private static final String WAR_FOLDER = "/wars/";
private static final String BUNDLE_ID = "org.jboss.ide.eclipse.as7.deployment.tests";
@@ -60,12 +61,14 @@
}
}
+ @Ignore
@Test
public void canDeploy() throws DeploymentException, URISyntaxException, IOException {
File file = getWarFile("minimalistic.war");
new DeploymentBuilder(HOST, PORT).add(file).deploy();
}
+ @Ignore
@Test
public void returnsDeployables() throws DeploymentException, URISyntaxException, IOException {
String warName = "minimalistic.war";
@@ -82,7 +85,6 @@
Deployable deployable = deployables.get(0);
assertNotNull(deployable.getStatus());
}
-
private File getWarFile(String name) throws URISyntaxException, IOException {
Bundle bundle = Platform.getBundle(BUNDLE_ID);
13 years, 6 months
JBoss Tools SVN: r30472 - branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-04-11 10:17:35 -0400 (Mon, 11 Apr 2011)
New Revision: 30472
Modified:
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnection.java
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPageModel.java
branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
Log:
[JBIDE-8599]
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnection.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnection.java 2011-04-11 14:03:00 UTC (rev 30471)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnection.java 2011-04-11 14:17:35 UTC (rev 30472)
@@ -1,7 +1,14 @@
package org.jboss.tools.internal.deltacloud.ui.wizards;
+import org.jboss.tools.deltacloud.core.DeltaCloud;
+
+/**
+ * @author Jeff Johnston
+ * @author André Dietisheim
+ */
public interface CloudConnection {
public boolean performTest();
+ public DeltaCloud getDeltaCloud();
}
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2011-04-11 14:03:00 UTC (rev 30471)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPage.java 2011-04-11 14:17:35 UTC (rev 30472)
@@ -240,12 +240,19 @@
* keeping the same name when editing must be valid
*/
try {
- if (!connectionName.equals(connectionModel.getInitialName())
- /* all new names must be unique */
- && DeltaCloudManager.getDefault().findCloud(connectionName) != null) {
- return ValidationStatus
- .error(WizardMessages.getString(NAME_ALREADY_IN_USE));
+ /* all new names must be unique */
+ DeltaCloud deltaCloud = DeltaCloudManager.getDefault().findCloud(connectionName);
+ if (cloudConnection.getDeltaCloud() == null) {
+ if (deltaCloud == null) {
+ return ValidationStatus.ok();
+ }
+ } else {
+ if (cloudConnection.getDeltaCloud().equals(deltaCloud)) {
+ return ValidationStatus.ok();
+ }
}
+ return ValidationStatus
+ .error(WizardMessages.getString(NAME_ALREADY_IN_USE));
} catch (DeltaCloudException e) {
// do nothing
}
@@ -275,7 +282,11 @@
setDescription(WizardMessages.getString(DESCRIPTION));
setTitle(WizardMessages.getString(TITLE));
setImageDescriptor(SWTImagesFactory.DESC_DELTA_LARGE);
- this.connectionModel = new CloudConnectionPageModel();
+ this.connectionModel = new CloudConnectionPageModel(
+ new StringPreferenceValue(IPreferenceKeys.LAST_NAME, Activator.PLUGIN_ID).get(null),
+ new StringPreferenceValue(IPreferenceKeys.LAST_URL, Activator.PLUGIN_ID).get(null),
+ new StringPreferenceValue(IPreferenceKeys.LAST_USERNAME, Activator.PLUGIN_ID).get(null),
+ null);
this.cloudConnection = cloudConnection;
}
@@ -289,6 +300,10 @@
public CloudConnectionPage(String pageName, String defaultName, String defaultUrl, String defaultUsername,
String defaultPassword, Driver defaultDriver, CloudConnection cloudConnection) throws MalformedURLException {
super(pageName);
+ defaultName = new StringPreferenceValue(IPreferenceKeys.LAST_NAME, Activator.PLUGIN_ID).get(defaultName);
+ defaultUrl = new StringPreferenceValue(IPreferenceKeys.LAST_URL, Activator.PLUGIN_ID).get(defaultUrl);
+ defaultUsername = new StringPreferenceValue(IPreferenceKeys.LAST_USERNAME, Activator.PLUGIN_ID)
+ .get(defaultUsername);
this.connectionModel =
new CloudConnectionPageModel(defaultName, defaultUrl, defaultUsername, defaultPassword, defaultDriver);
this.cloudConnection = cloudConnection;
@@ -316,19 +331,12 @@
nameLabel.setText(WizardMessages.getString(NAME_LABEL));
Text nameText = new Text(container, SWT.BORDER | SWT.SINGLE);
bindName(dbc, nameText);
- String name =
- new StringPreferenceValue(IPreferenceKeys.LAST_NAME, Activator.PLUGIN_ID).get(nameText.getText());
-
- nameText.setText(name);
// url
Label urlLabel = new Label(container, SWT.NULL);
urlLabel.setText(WizardMessages.getString(URL_LABEL));
Point p1 = urlLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT);
Text urlText = new Text(container, SWT.BORDER | SWT.SINGLE);
- String url =
- new StringPreferenceValue(IPreferenceKeys.LAST_URL, Activator.PLUGIN_ID).get(urlText.getText());
- connectionModel.setUrl(url);
dbc.bindValue(
WidgetProperties.text(SWT.Modify).observe(urlText),
@@ -362,10 +370,11 @@
usernameObservable,
BeanProperties.value(CloudConnectionPageModel.class, CloudConnectionPageModel.PROPERTY_USERNAME)
.observe(connectionModel));
- String username =
- new StringPreferenceValue(IPreferenceKeys.LAST_USERNAME, Activator.PLUGIN_ID).get(usernameText.getText());
+ String username =
+ new StringPreferenceValue(IPreferenceKeys.LAST_USERNAME, Activator.PLUGIN_ID).get(usernameText
+ .getText());
usernameText.setText(username);
-
+
// password
Label passwordLabel = new Label(container, SWT.NULL);
passwordLabel.setText(WizardMessages.getString(PASSWORD_LABEL));
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPageModel.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPageModel.java 2011-04-11 14:03:00 UTC (rev 30471)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/CloudConnectionPageModel.java 2011-04-11 14:17:35 UTC (rev 30472)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.internal.deltacloud.ui.wizards;
-import java.net.MalformedURLException;
+import java.net.URI;
import java.text.MessageFormat;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -37,32 +37,49 @@
public static final String INVALID_URL = "ErrorInvalidURL.text"; //$NON-NLS-1$
public static final String NONCLOUD_URL = "ErrorNonCloudURL.text"; //$NON-NLS-1$
+ private static final String HTTP_PREFIX = "http://"; //$NON-NLS-1$
+
private String name;
private String url;
private String username;
private String password;
private Driver driver;
- private String initialName;
- public CloudConnectionPageModel() {
- this("", "", "", "", Driver.UNKNOWN);
- }
-
- public CloudConnectionPageModel(String name, String url, String username, String password) throws MalformedURLException {
+ public CloudConnectionPageModel(String name, String url, String username, String password){
this(name, url, username, password, Driver.UNKNOWN);
}
public CloudConnectionPageModel(String name, String url, String username, String password, Driver driver) {
this.name = name;
- this.initialName = name;
- this.url = url;
+ setUrl(prependHttp(url));
this.username = username;
this.password = password;
// this.driver = driver;
setDriverByUrl(url);
}
+ private String prependHttp(String url) {
+ if (!startsWithScheme(url)) {
+ return HTTP_PREFIX + url;
+ } else {
+ return url;
+ }
+ }
+
+ private boolean startsWithScheme(String url) {
+ if (url == null || url.length() == 0) {
+ return false;
+ } else {
+ try {
+ String scheme = URI.create(url).getScheme();
+ return scheme!=null && scheme.length() > 0;
+ } catch (IllegalArgumentException e ) {
+ return false;
+ }
+ }
+ }
+
public String getUsername() {
return username;
}
@@ -79,10 +96,6 @@
firePropertyChange(PROPERTY_PASSWORD, this.password, this.password = password);
}
- public String getInitialName() {
- return initialName;
- }
-
public String getName() {
return name;
}
Modified: branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java
===================================================================
--- branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-04-11 14:03:00 UTC (rev 30471)
+++ branches/jbosstools-3.2.x/deltacloud/plugins/org.jboss.tools.deltacloud.ui/src/org/jboss/tools/internal/deltacloud/ui/wizards/NewCloudConnectionWizard.java 2011-04-11 14:17:35 UTC (rev 30472)
@@ -151,4 +151,8 @@
return false;
}
}
+
+ public DeltaCloud getDeltaCloud() {
+ return initialCloud;
+ }
}
13 years, 6 months
