JBoss Tools SVN: r26122 - in trunk/deltacloud: tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-29 05:35:07 -0400 (Fri, 29 Oct 2010)
New Revision: 26122
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ProfileMockIntegrationTest.java
Log:
[JBIDE-7437] fixed HardwareProfile unmarshalling
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-10-29 08:35:19 UTC (rev 26121)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-10-29 09:35:07 UTC (rev 26122)
@@ -288,7 +288,7 @@
@Override
public HardwareProfile listProfile(String profileId) throws DeltaCloudClientException {
String request = DCNS.HARDWARE_PROFILES + "/" + profileId;
- return JAXB.unmarshal(new StringReader(sendRequest(request, RequestType.GET)), HardwareProfile.class);
+ return buildDeltaCloudObject(HardwareProfile.class, sendRequest(request, RequestType.GET));
}
@Override
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ProfileMockIntegrationTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ProfileMockIntegrationTest.java 2010-10-29 08:35:19 UTC (rev 26121)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ProfileMockIntegrationTest.java 2010-10-29 09:35:07 UTC (rev 26122)
@@ -58,12 +58,13 @@
// get a profile seen in the web UI
HardwareProfile profile = testSetup.getClient().listProfile("m1-small");
assertNotNull(profile);
- assertHardWareProfile("i386", "1740.8", "160", profile);
+ assertHardWareProfile("i386", "1740.8 MB", "160 GB", "1", profile);
}
- public void assertHardWareProfile(String architecture, String memory, String storage, HardwareProfile profile) {
+ public void assertHardWareProfile(String architecture, String memory, String storage, String cpu, HardwareProfile profile) {
assertEquals(architecture, profile.getArchitecture());
assertEquals(memory, profile.getMemory());
assertEquals(storage, profile.getStorage());
+ assertEquals(cpu, profile.getCPU());
}
}
13 years, 6 months
JBoss Tools SVN: r26121 - trunk/as/plugins/org.jboss.ide.eclipse.as.core.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-10-29 04:35:19 -0400 (Fri, 29 Oct 2010)
New Revision: 26121
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
Log:
JBIDE-7454 - updating module versions
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-10-29 08:02:58 UTC (rev 26120)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2010-10-29 08:35:19 UTC (rev 26121)
@@ -486,19 +486,19 @@
version="1.0">
<moduleType
types="jst.appclient"
- versions="5.0"/>
+ versions="1.2,1.3,1.4,5.0,6.0"/>
<moduleType
types="jst.web"
- versions="2.2, 2.3, 2.4, 2.5"/>
+ versions="2.2, 2.3, 2.4, 2.5,3.0"/>
<moduleType
types="jst.ejb"
- versions="1.0, 1.1, 2.0, 2.1, 3.0"/>
+ versions="1.0, 1.1, 2.0, 2.1, 3.0,3.1"/>
<moduleType
types="jst.ear"
- versions="1.2, 1.3, 1.4, 5.0"/>
+ versions="1.2, 1.3, 1.4, 5.0,6.0"/>
<moduleType
types="jst.connector"
- versions="1.0, 1.5"/>
+ versions="1.0, 1.5,1.6"/>
<moduleType
types="jst.utility"
versions="1.0"/>
13 years, 6 months
JBoss Tools SVN: r26120 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-29 04:02:58 -0400 (Fri, 29 Oct 2010)
New Revision: 26120
Added:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ProfileMockIntegrationTest.java
Log:
[JBIDE-7437] added tests for profile related methods in DeltaCloudClient
Added: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ProfileMockIntegrationTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ProfileMockIntegrationTest.java (rev 0)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ProfileMockIntegrationTest.java 2010-10-29 08:02:58 UTC (rev 26120)
@@ -0,0 +1,69 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.internal.deltacloud.test.core.client;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.List;
+
+import org.jboss.tools.deltacloud.core.client.DeltaCloudClient;
+import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
+import org.jboss.tools.deltacloud.core.client.HardwareProfile;
+import org.jboss.tools.internal.deltacloud.test.context.MockIntegrationTestContext;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Integration tests for key related operations in delta cloud client.
+ *
+ * @author Andre Dietisheim
+ *
+ * @see DeltaCloudClient#listProfiles()
+ * @see DeltaCloudClient#listProfie(String)
+ */
+public class ProfileMockIntegrationTest {
+
+ private MockIntegrationTestContext testSetup;
+
+ @Before
+ public void setUp() throws IOException, DeltaCloudClientException {
+ this.testSetup = new MockIntegrationTestContext();
+ testSetup.setUp();
+ }
+
+ @After
+ public void tearDown() {
+ testSetup.tearDown();
+ }
+
+ @Test
+ public void canListProfiles() throws DeltaCloudClientException {
+ List<HardwareProfile> hardwareProfiles = testSetup.getClient().listProfiles();
+ assertNotNull(hardwareProfiles);
+ }
+
+ @Test
+ public void canGetProfile() throws DeltaCloudClientException {
+ // get a profile seen in the web UI
+ HardwareProfile profile = testSetup.getClient().listProfile("m1-small");
+ assertNotNull(profile);
+ assertHardWareProfile("i386", "1740.8", "160", profile);
+ }
+
+ public void assertHardWareProfile(String architecture, String memory, String storage, HardwareProfile profile) {
+ assertEquals(architecture, profile.getArchitecture());
+ assertEquals(memory, profile.getMemory());
+ assertEquals(storage, profile.getStorage());
+ }
+}
Property changes on: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ProfileMockIntegrationTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 6 months
JBoss Tools SVN: r26119 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-29 03:56:17 -0400 (Fri, 29 Oct 2010)
New Revision: 26119
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
Log:
[JBIDE-7437] corrected client to pass test on missing resource
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-10-29 07:56:02 UTC (rev 26118)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/ChangeLog 2010-10-29 07:56:17 UTC (rev 26119)
@@ -1,3 +1,11 @@
+2010-10-29 André Dietisheim <adietish(a)redhat.com>
+
+ * src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java: extracted and put in a 2 enums:
+ HttpStatusCode, HttpStatusRange (server-, client-error)
+ * src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
+ (listDeltaCloudObjects): rethrows DeltaCloudClientException (was catching and wrapping)
+ (getDocument): refactored and split #listDeltaCloudObjects implementation into parts
+
2010-10-26 André Dietisheim <adietish(a)redhat.com>
* src/org/jboss/tools/deltacloud/core/DeltaCloud.java (testConnection):
13 years, 6 months
JBoss Tools SVN: r26118 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-29 03:56:02 -0400 (Fri, 29 Oct 2010)
New Revision: 26118
Added:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusRange.java
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
Log:
[JBIDE-7437] corrected client to pass test on missing resource
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-10-29 07:55:41 UTC (rev 26117)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/DeltaCloudClient.java 2010-10-29 07:56:02 UTC (rev 26118)
@@ -56,12 +56,8 @@
public class DeltaCloudClient implements API {
private static final String PEM_FILE_SUFFIX = "pem";
- private static final int HTTP_STATUSCODE_NOTFOUND = 404;
- private static final int HTTP_STATUSCODE_FORBIDDEN = 403;
private static final String DOCUMENT_ELEMENT_DRIVER = "driver"; //$NON-NLS-1$
private static final String DOCUMENT_ELEMENT_API = "api"; //$NON-NLS-1$
- private static final int HTTP_STATUSCODE_SERVERERROR = 500;
- private static final int HTTP_STATUSCODE_CLIENTERROR = 400;
public static Logger logger = Logger.getLogger(DeltaCloudClient.class);
@@ -145,38 +141,24 @@
private void throwOnHttpErrors(String requestUrl, HttpResponse httpResponse) throws DeltaCloudClientException {
int statusCode = httpResponse.getStatusLine().getStatusCode();
- if (isHttpForbiddenError(statusCode)) {
+ if (HttpStatusCode.OK.isStatus(statusCode)) {
+ return;
+ }
+ else if (HttpStatusCode.FORBIDDEN.isStatus(statusCode)) {
throw new DeltaCloudAuthException(
MessageFormat.format("The server reported an authorization error \"{0}\" on requesting \"{1}\"",
httpResponse.getStatusLine().getReasonPhrase(), requestUrl));
- } else if (isHttpNotFoundError(statusCode)) {
+ } else if (HttpStatusCode.NOT_FOUND.isStatus(statusCode)) {
throw new DeltaCloudNotFoundException(
MessageFormat.format("The server could not find the resource \"{0}\"", requestUrl));
- } else if (isHttpClientError(statusCode) || isHttpServerError(statusCode)) {
+ } else if (HttpStatusRange.CLIENT_ERROR.isInRange(statusCode)
+ || HttpStatusRange.SERVER_ERROR.isInRange(statusCode)) {
throw new DeltaCloudClientException(
MessageFormat.format("The server reported an error \"{0}\" on requesting \"{1}\"",
httpResponse.getStatusLine().getReasonPhrase(), requestUrl));
}
}
- private boolean isHttpNotFoundError(int statusCode) {
- return statusCode == HTTP_STATUSCODE_NOTFOUND;
- }
-
- private boolean isHttpForbiddenError(int statusCode) {
- return statusCode == HTTP_STATUSCODE_FORBIDDEN;
- }
-
- private boolean isHttpClientError(int statusCode) {
- return (statusCode - HTTP_STATUSCODE_CLIENTERROR) >= 0
- && (statusCode - HTTP_STATUSCODE_CLIENTERROR) < 100;
- }
-
- private boolean isHttpServerError(int statusCode) {
- return (statusCode - HTTP_STATUSCODE_SERVERERROR) >= 0
- && (statusCode - HTTP_STATUSCODE_SERVERERROR) < 100;
- }
-
private String getResponse(HttpEntity entity) throws IOException,
DeltaCloudClientException {
if (entity == null) {
@@ -440,25 +422,6 @@
sendRequest(DCNS.INSTANCES + "/" + instanceId, RequestType.DELETE);
}
- // private void checkForErrors(Document d) throws DeltaCloudClientException
- // {
- // NodeList n = d.getElementsByTagName("error");
- // for (int i = 0; i < n.getLength(); ++i) {
- // Node node = n.item(i);
- // Node statusNode = node.getAttributes().getNamedItem("status");
- // if (statusNode != null) {
- // String status =
- // node.getAttributes().getNamedItem("status").getNodeValue();
- // if (status.equals("403"))
- // throw new DeltaCloudAuthException("Authorization error");
- // else if (status.equals("404"))
- // throw new DeltaCloudClientException("Not found");
- // else
- // throw new DeltaCloudClientException("Connection error");
- // }
- // }
- // }
-
private Instance buildInstance(String xml) throws DeltaCloudClientException {
try {
Instance instance = JAXB.unmarshal(new StringReader(xml), Instance.class);
@@ -636,37 +599,37 @@
private <T extends DeltaCloudObject> List<T> listDeltaCloudObjects(Class<T> clazz, String path, String elementName)
throws DeltaCloudClientException {
try {
- InputSource is = new InputSource(new StringReader(sendRequest(path, RequestType.GET)));
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- DocumentBuilder db = dbf.newDocumentBuilder();
- Document document = db.parse(is);
-
- // checkForErrors(document);
-
- document.getElementsByTagName(path).toString();
-
+ Document document = getDocument(path);
ArrayList<T> dco = new ArrayList<T>();
-
NodeList nodeList = document.getElementsByTagName(elementName);
for (int i = 0; i < nodeList.getLength(); i++) {
- dco.add(buildDeltaCloudObject(clazz, nodeList.item(i)));
+ dco.add(buildDeltaCloudObject(clazz, nodeToString(nodeList.item(i))));
}
return dco;
- } catch (DeltaCloudClientException e) {
+ } catch(DeltaCloudClientException e) {
throw e;
} catch (Exception e) {
throw new DeltaCloudClientException("Could not list object of type " + clazz, e);
}
}
+ private Document getDocument(String path) throws DeltaCloudClientException, ParserConfigurationException,
+ SAXException, IOException {
+ InputSource is = new InputSource(new StringReader(sendRequest(path, RequestType.GET)));
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ Document document = db.parse(is);
+ return document;
+ }
+
@SuppressWarnings("unchecked")
- private <T extends Object> T buildDeltaCloudObject(Class<T> clazz, Node node) throws DeltaCloudClientException {
+ private <T extends Object> T buildDeltaCloudObject(Class<T> clazz, String node) throws DeltaCloudClientException {
if (clazz.equals(Instance.class)) {
- return (T) buildInstance(nodeToString(node));
+ return (T) buildInstance(node);
} else if (clazz.equals(HardwareProfile.class)) {
- return (T) buildHardwareProfile(nodeToString(node));
+ return (T) buildHardwareProfile(node);
} else {
- return JAXB.unmarshal(new StringReader(nodeToString(node)), clazz);
+ return JAXB.unmarshal(new StringReader(node), clazz);
}
}
@@ -689,7 +652,5 @@
} catch (TransformerException e) {
throw new DeltaCloudClientException("Error transforming node to string", e);
}
-
}
-
}
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java 2010-10-29 07:56:02 UTC (rev 26118)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2010 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.deltacloud.core.client;
+public enum HttpStatusCode {
+
+ OK(200), NOT_FOUND(404), FORBIDDEN(403);
+
+ private int code;
+
+ private HttpStatusCode(int code) {
+ this.code = code;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public boolean isStatus(int statusCode) {
+ return code == statusCode;
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusCode.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusRange.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusRange.java (rev 0)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusRange.java 2010-10-29 07:56:02 UTC (rev 26118)
@@ -0,0 +1,18 @@
+package org.jboss.tools.deltacloud.core.client;
+
+public enum HttpStatusRange {
+ CLIENT_ERROR(400, 499), SERVER_ERROR(500, 599);
+
+ private int start;
+ private int stop;
+
+ HttpStatusRange(int start, int stop) {
+ this.start = start;
+ this.stop = stop;
+ }
+
+ public boolean isInRange(int statusCode) {
+ return statusCode >= start
+ && statusCode <= stop;
+ }
+}
Property changes on: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.core/src/org/jboss/tools/deltacloud/core/client/HttpStatusRange.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
13 years, 6 months
JBoss Tools SVN: r26117 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-29 03:55:41 -0400 (Fri, 29 Oct 2010)
New Revision: 26117
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ServerTypeMockIntegrationTest.java
Log:
[JBIDE-7437] corrected client to pass test on missing resource
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ServerTypeMockIntegrationTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ServerTypeMockIntegrationTest.java 2010-10-29 06:50:26 UTC (rev 26116)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/core/client/ServerTypeMockIntegrationTest.java 2010-10-29 07:55:41 UTC (rev 26117)
@@ -21,6 +21,7 @@
import org.apache.http.client.methods.HttpUriRequest;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClient;
import org.jboss.tools.deltacloud.core.client.DeltaCloudClientException;
+import org.jboss.tools.deltacloud.core.client.DeltaCloudNotFoundException;
import org.jboss.tools.internal.deltacloud.test.context.MockIntegrationTestContext;
import org.jboss.tools.internal.deltacloud.test.fakes.ServerFake;
import org.junit.After;
@@ -91,7 +92,7 @@
errorClient.listImages();
fail("no exception catched");
} catch (Exception e) {
- assertEquals(DeltaCloudClientException.class, e.getClass());
+ assertEquals(DeltaCloudNotFoundException.class, e.getClass());
}
}
}
13 years, 6 months
JBoss Tools SVN: r26116 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2010-10-29 02:50:26 -0400 (Fri, 29 Oct 2010)
New Revision: 26116
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
Log:
JBIDE-7453 - small update
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2010-10-29 06:46:46 UTC (rev 26115)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2010-10-29 06:50:26 UTC (rev 26116)
@@ -131,9 +131,10 @@
else
runtimeTypeId=IJBossToolingConstants.EAP_50;
+ IPath path2 = path.append(IJBossRuntimeResourceConstants.JBOSS_AS);
if( runtimeTypeId != null ) {
try {
- IRuntimeWorkingCopy wc = createRuntimeWorkingCopy(runtimeTypeId, path.toOSString(), IJBossRuntimeResourceConstants.DEFAULT_CONFIGURATION);
+ IRuntimeWorkingCopy wc = createRuntimeWorkingCopy(runtimeTypeId, path2.toOSString(), IJBossRuntimeResourceConstants.DEFAULT_CONFIGURATION);
return launchRuntimeWizard(wc);
} catch( CoreException ce) {
}
13 years, 6 months
JBoss Tools SVN: r26115 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-29 02:46:46 -0400 (Fri, 29 Oct 2010)
New Revision: 26115
Modified:
trunk/build/target-platform/
Log:
svn:ignore
Property changes on: trunk/build/target-platform
___________________________________________________________________
Name: svn:ignore
- REPO*
*target.zip
log*.txt
eclipse*
+ REPO*
*target.zip
log*.txt
eclipse*
.target
13 years, 6 months
JBoss Tools SVN: r26114 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-28 15:59:48 -0400 (Thu, 28 Oct 2010)
New Revision: 26114
Modified:
trunk/build/target-platform/e361-wtp322.target
trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
Log:
update w/ 3.6.1R versions instead of 3.6.2M versions
Modified: trunk/build/target-platform/e361-wtp322.target
===================================================================
--- trunk/build/target-platform/e361-wtp322.target 2010-10-28 19:29:05 UTC (rev 26113)
+++ trunk/build/target-platform/e361-wtp322.target 2010-10-28 19:59:48 UTC (rev 26114)
@@ -98,39 +98,38 @@
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
<unit version="1.1.0.v20090119-79318s73533B57" id="com.ibm.icu.base.feature.group"/>
- <unit version="1.0.1.R36x_v20101007-7K7QErDzbb9z-yqHb56L8H" id="org.eclipse.equinox.server.core.feature.group"/>
- <unit version="1.2.0.v20100427-7B77FKt90GE5h1JDK5GXEA01911" id="org.eclipse.cvs.feature.group"/>
- <unit version="1.2.0.v20100427-7e7jERFEp4jsWdTqCV2nD3" id="org.eclipse.help.feature.group"/>
- <unit version="3.6.2.r362_v20100929-7z8XFUUFLFlmgNd019WRcD5LVkHD" id="org.eclipse.jdt.feature.group"/>
- <unit version="3.6.2.r362_v20100929-9gF78GrqFrD9Uh-OltlT9H_z0p1mnhRBz-PPmGWk" id="org.eclipse.platform.feature.group"/>
- <unit version="3.6.2.M20101020-0925" id="org.eclipse.platform.ide"/>
- <unit version="3.4.1.R36x_v20101019_1345-7M7K7aF90dnJ-WLf3cut-MXrPgx" id="org.eclipse.equinox.executable.feature.group"/>
- <unit version="3.4.1.R36x_v20101019_1345-7M7K7aF90dnJ-WLf3cut-MXrPgx" id="org.eclipse.equinox.executable"/>
- <unit version="3.6.2.M20101020-0925" id="org.eclipse.platform.sdk"/>
- <unit version="3.6.1.r361_v20100727-7b7mFL-FET3dhET4i55adpJ" id="org.eclipse.pde.feature.group"/>
- <unit version="3.6.2.r362_v20100929-7Q7m7ADDaKh5py5C9f1kQXv_p6z-50gz09paZXCU1CV7x" id="org.eclipse.sdk.feature.group"/>
- <unit version="3.6.2.r362_v20100929-9OArFLtFjY-ThlnOoBv_whoMlFVj" id="org.eclipse.rcp.feature.group"/>
- <unit version="3.6.0.M20101020-0925" id="org.eclipse.rcp.id"/>
- <unit version="3.6.0.M20101020-0925" id="org.eclipse.rcp.sdk.id"/>
+ <unit version="1.0.0.v20100510-7K7QErDzbb9z-yqHb55T7I" id="org.eclipse.equinox.server.core.feature.group"/>
+ <unit version="1.2.0.v20100427-7B77FKt90GE5h0SBT5FV9A01911" id="org.eclipse.cvs.feature.group"/>
+ <unit version="1.2.0.v20100427-7e7jEQFEp4jsWcboLU9l93" id="org.eclipse.help.feature.group"/>
+ <unit version="3.6.1.r361_v20100714-0800-7z8XFUSFLFlmgLc5z-Bvrt8-HVkH" id="org.eclipse.jdt.feature.group"/>
+ <unit version="3.6.1.r361_v20100909-9gF78GrkFqw7GrsZnvz0JWNTeb6fue6896L" id="org.eclipse.platform.feature.group"/>
+ <unit version="3.6.1.M20100909-0800" id="org.eclipse.platform.ide"/>
+ <unit version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi" id="org.eclipse.equinox.executable.feature.group"/>
+ <unit version="3.4.1.R36x_v20100823-7M7K7JF90dnJ-WLf3cf4yi" id="org.eclipse.equinox.executable"/>
+ <unit version="3.6.1.M20100909-0800" id="org.eclipse.platform.sdk"/>
+ <unit version="3.6.1.r361_v20100727-7b7mFL-FET3dhESDgE5_bkJ" id="org.eclipse.pde.feature.group"/>
+ <unit version="3.6.1.r361_v20100714-0800-7Q7m6DDaKf5o2z-L9LxPSe6ygafz-KKIqk1rr_3j4dn7J" id="org.eclipse.sdk.feature.group"/>
+ <unit version="3.6.0.M20100909-0800" id="org.eclipse.rcp.id"/>
+ <unit version="3.6.0.M20100909-0800" id="org.eclipse.rcp.sdk.id"/>
<unit version="3.3.0.v20100427-44A77w31211642" id="org.eclipse.releng.tools.feature.group"/>
- <unit version="3.6.2.M20101020-0925" id="org.eclipse.sdk.ide"/>
- <unit version="3.3.1.r362_v20101014-817fFcgFE_dae7CiesDUeYc" id="org.eclipse.sdk.examples.feature.group"/>
- <unit version="3.3.1.r362_v20101014" id="org.eclipse.sdk.examples.source.feature.group"/>
- <unit version="3.6.1.R36x_v20101014-7V7RFiwFLSgEt4Pctn77c7J" id="org.eclipse.equinox.compendium.sdk.feature.group"/>
- <unit version="3.6.1.R36x_v20101007-7sF99FsHFSyAVFKfV4c7B7BR" id="org.eclipse.equinox.core.sdk.feature.group"/>
+ <unit version="3.6.1.M20100909-0800" id="org.eclipse.sdk.ide"/>
+ <unit version="3.3.0.v20100527-817fFcfFEdcVcRZlgyBRcVX" id="org.eclipse.sdk.examples.feature.group"/>
+ <unit version="3.3.0.v20100527" id="org.eclipse.sdk.examples.source.feature.group"/>
+ <unit version="3.6.0.v20100421-7V7RFiwFLSgEt4Pctn77c7J" id="org.eclipse.equinox.compendium.sdk.feature.group"/>
+ <unit version="3.6.0.v20100603-7sF99FsHFTw8HQBta4g33J3F" id="org.eclipse.equinox.core.sdk.feature.group"/>
<unit version="1.0.0.v20100510-4--9oB5855K7P" id="org.eclipse.equinox.p2.discovery.feature.feature.group"/>
- <unit version="2.0.1.r361_v20100903-897HFZGFYxvZ7cEJrRz0-9_0" id="org.eclipse.equinox.p2.user.ui.feature.group"/>
- <unit version="3.6.1.R36x_v20101007-9I7VGAgG7w-PNFWurwLPmgB" id="org.eclipse.equinox.p2.sdk.feature.group"/>
- <unit version="3.6.1.R36x_v20101014-7u7NFViFN5JdPKPhDHd_6Yqc54uw" id="org.eclipse.equinox.serverside.sdk.feature.group"/>
- <unit version="3.6.1.r361_v20100903-7H7R47v8rtOr0Yaw5jW85dbniBmw" id="org.eclipse.equinox.sdk.feature.group"/>
+ <unit version="2.0.1.r361_v20100903-897HFZFFZRuSD2LMtVxyz0Vr" id="org.eclipse.equinox.p2.user.ui.feature.group"/>
+ <unit version="3.6.0.v20100503-9I7VGAeG8tz-BY6jz0w2HLRYr" id="org.eclipse.equinox.p2.sdk.feature.group"/>
+ <unit version="3.6.0.v20100421-7u7NFVgFN5JdPKPhDHd_6Yqc54uw" id="org.eclipse.equinox.serverside.sdk.feature.group"/>
+ <unit version="3.6.1.r361_v20100903-7H7R07v8rtOZyYbv1I6aZgou5z07" id="org.eclipse.equinox.sdk.feature.group"/>
<unit version="1.0.0.v20100421-79--EVVFNFFsFc" id="org.eclipse.equinox.weaving.sdk.feature.group"/>
<unit version="1.0.0.v20100510-7I777iBgJ9DIARGH8IIQ" id="org.eclipse.equinox.server.jetty.feature.group"/>
- <unit version="1.0.1.R36x_v20101007-7x7IFGOFQ74dz0POCNUBjA6L" id="org.eclipse.equinox.server.p2.feature.group"/>
+ <unit version="1.0.0.v20100503-7x7IFGOFQ74dz0POCNUBjA6L" id="org.eclipse.equinox.server.p2.feature.group"/>
<unit version="1.0.0.v20100427-7C-7BF9JgLWLMBMMAMsLL" id="org.eclipse.pde.api.tools.ee.fragments.feature.group"/>
- <unit version="1.1.0.M20101020-0925" id="org.eclipse.equinox.p2.ui.admin.rcp.product"/>
+ <unit version="1.1.0.M20100909-0800" id="org.eclipse.equinox.p2.ui.admin.rcp.product"/>
<unit version="1.0.0.v20100510-42A79oB5855K5E" id="org.eclipse.equinox.server.servletbridge.feature.group"/>
<unit version="1.0.0.v20100510-44DF8s734C48662444" id="org.eclipse.equinox.server.simple.feature.group"/>
- <unit version="3.6.2.r362_v20100929-9OArFLtFjY-ThlnOoBv_whoMlFVj" id="org.eclipse.rcp.feature.group"/>
+ <unit version="3.6.1.r361_v20100827-9OArFLdFjY-ThSQXmKvKz0_T" id="org.eclipse.rcp.feature.group"/>
<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -161,7 +160,7 @@
<unit version="1.4.0.v20100428-2315-479-9oB56N5BBR6LCA6" id="org.eclipse.emf.validation.feature.group"/>
<unit version="1.4.0.v20100428-2315-23-7w3121133502768" id="org.eclipse.emf.validation.ocl.feature.group"/>
<unit version="2.1.0.v20100606-1530-7A2-AkF7AG8PBU3BRLA" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/>
- <unit version="1.3.1.20100915-2301" id="org.eclipse.rap.runtime.sdk.feature.group"/>
+ <unit version="${org.eclipse.rap.runtime.sdk.feature.group.version}" id="org.eclipse.rap.runtime.sdk.feature.group"/>
<repository location="http://download.eclipse.org/releases/helios/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" type="InstallableUnit">
@@ -231,4 +230,4 @@
<feature id="org.mozilla.xpcom.feature"/>
</includeBundles>
<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
+</target>
\ No newline at end of file
Modified: trunk/build/target-platform/e361-wtp322.target.p2mirror.xml
===================================================================
--- trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-28 19:29:05 UTC (rev 26113)
+++ trunk/build/target-platform/e361-wtp322.target.p2mirror.xml 2010-10-28 19:59:48 UTC (rev 26114)
@@ -41,7 +41,7 @@
<repository location="http://download.eclipse.org/modeling/emf/emf/updates/2.6/R201009141218/"/>
<repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/"/>
<repository location="http://download.eclipse.org/birt/update-site/2.6/"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.6.x/"/>
+<repository location="http://download.eclipse.org/eclipse/updates/3.6/"/>
<repository location="http://download.eclipse.org/releases/helios/"/>
<repository location="http://download.eclipse.org/webtools/repository/helios/"/>
<repository location="http://download.jboss.org/jbosstools/builds/staging/jbosstools-drools/all..."/>
@@ -147,6 +147,9 @@
<iu version="" id="org.eclipse.ocl.feature.group"/>
<iu version="" id="org.eclipse.pde.junit.runtime.standalone.feature.group"/>
<iu version="" id="org.eclipse.m2m.qvt.oml.common.feature.group"/>
+<iu version="" id="org.eclipse.emf.validation.feature.group"/>
+<iu version="" id="org.eclipse.emf.validation.ocl.feature.group"/>
+<iu version="" id="org.eclipse.m2m.qvt.oml.runtime.feature.group"/>
<iu version="" id="org.eclipse.jst.jee"/>
<iu version="" id="org.eclipse.wst.common.frameworks"/>
<iu version="" id="org.eclipse.wst.common.project.facet.ui"/>
13 years, 6 months