JBoss Tools SVN: r40528 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2012-04-26 16:02:51 -0400 (Thu, 26 Apr 2012)
New Revision: 40528
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
Log:
https://issues.jboss.org/browse/JBIDE-11283
Remote Server Launch Configuration, wrong filepath separators in path to jboss-modules.jar in Automatically Calculated start command
fixed path but unfortunately found several other issues
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-04-26 19:20:35 UTC (rev 40527)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEJBoss7LaunchConfigurator.java 2012-04-26 20:02:51 UTC (rev 40528)
@@ -112,7 +112,7 @@
protected String getJar(JBossServer server, IJBossServerRuntime runtime) {
String rseHome = RSEUtils.getRSEHomeDir(server.getServer());
- return new Path(rseHome).append(IJBossRuntimeResourceConstants.JBOSS7_MODULES_JAR).toOSString();
+ return new Path(rseHome).append(IJBossRuntimeResourceConstants.JBOSS7_MODULES_JAR).toString();
}
protected String getMainType() {
13 years, 8 months
JBoss Tools SVN: r40527 - in trunk/ws: features/org.jboss.tools.ws.jaxrs.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-26 15:20:35 -0400 (Thu, 26 Apr 2012)
New Revision: 40527
Modified:
trunk/ws/features/org.jboss.tools.ws.feature/feature.xml
trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/feature.xml
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
Log:
https://issues.jboss.org/browse/JBIDE-10827 add dependencies to org.eclipse.jst.enterprise_ui.feature, org.eclipse.jst.web_ui.feature, org.eclipse.wst.web_ui.feature, org.eclipse.wst.ws_ui.feature, org.eclipse.wst.xml_ui.feature into features and ui.bot.test pom.xml
Modified: trunk/ws/features/org.jboss.tools.ws.feature/feature.xml
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.feature/feature.xml 2012-04-26 18:53:57 UTC (rev 40526)
+++ trunk/ws/features/org.jboss.tools.ws.feature/feature.xml 2012-04-26 19:20:35 UTC (rev 40527)
@@ -18,6 +18,14 @@
%license
</license>
+ <requires>
+ <import feature="org.eclipse.jst.enterprise_ui.feature" version="3.3.2" match="compatible"/>
+ <import feature="org.eclipse.jst.web_ui.feature" version="3.3.2" match="compatible"/>
+ <import feature="org.eclipse.wst.web_ui.feature" version="3.3.2" match="compatible"/>
+ <import feature="org.eclipse.wst.ws_ui.feature" version="3.3.2" match="compatible"/>
+ <import feature="org.eclipse.wst.xml_ui.feature" version="3.3.2" match="compatible"/>
+ </requires>
+
<plugin
id="org.jboss.tools.ws.core"
download-size="0"
Modified: trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/feature.xml
===================================================================
--- trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/feature.xml 2012-04-26 18:53:57 UTC (rev 40526)
+++ trunk/ws/features/org.jboss.tools.ws.jaxrs.feature/feature.xml 2012-04-26 19:20:35 UTC (rev 40527)
@@ -17,6 +17,14 @@
%license
</license>
+ <requires>
+ <import feature="org.eclipse.jst.enterprise_ui.feature" version="3.3.2" match="compatible"/>
+ <import feature="org.eclipse.jst.web_ui.feature" version="3.3.2" match="compatible"/>
+ <import feature="org.eclipse.wst.web_ui.feature" version="3.3.2" match="compatible"/>
+ <import feature="org.eclipse.wst.ws_ui.feature" version="3.3.2" match="compatible"/>
+ <import feature="org.eclipse.wst.xml_ui.feature" version="3.3.2" match="compatible"/>
+ </requires>
+
<plugin
id="org.jboss.tools.ws.jaxrs.core"
download-size="0"
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-04-26 18:53:57 UTC (rev 40526)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-04-26 19:20:35 UTC (rev 40527)
@@ -61,14 +61,24 @@
</dependency>
<dependency>
<type>p2-installable-unit</type>
- <artifactId>org.eclipse.wst.xml_ui.feature.feature.group</artifactId>
+ <artifactId>org.eclipse.jst.web_ui.feature.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
<dependency>
<type>p2-installable-unit</type>
+ <artifactId>org.eclipse.wst.web_ui.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
<artifactId>org.eclipse.wst.ws_ui.feature.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.wst.xml_ui.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
</dependencies>
</configuration>
</plugin>
13 years, 8 months
JBoss Tools SVN: r40526 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-04-26 14:53:57 -0400 (Thu, 26 Apr 2012)
New Revision: 40526
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
Log:
committed latest client jar
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/openshift-java-client-2.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
13 years, 8 months
JBoss Tools SVN: r40525 - trunk/forge/plugins/org.jboss.tools.forge.runtime.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-04-26 14:45:45 -0400 (Thu, 26 Apr 2012)
New Revision: 40525
Modified:
trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties
Log:
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2012-04-26 18:19:41 UTC (rev 40524)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2012-04-26 18:45:45 UTC (rev 40525)
@@ -1,5 +1,5 @@
bin.includes = META-INF/,\
forge-distribution-1.0.3.Final/
-source.. = src/
src.includes = *
-src.excludes = src
+jars.compile.order = .
+source.. =
13 years, 8 months
JBoss Tools SVN: r40524 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2012-04-26 14:19:41 -0400 (Thu, 26 Apr 2012)
New Revision: 40524
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
Log:
JBIDE-11680 Made openshift explorer lazy load cartridges
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-04-26 18:19:32 UTC (rev 40523)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/viewer/OpenShiftExpressConsoleContentProvider.java 2012-04-26 18:19:41 UTC (rev 40524)
@@ -157,7 +157,7 @@
// Get the actual children, with the delay
loadingUsers.add(user);
try {
- getChildrenForElement(user, true);
+ getChildrenForElement(user, false);
} catch(OpenShiftException e) {
errors.put(user, e);
} catch(SocketTimeoutException e) {
13 years, 8 months
JBoss Tools SVN: r40523 - /.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2012-04-26 14:19:32 -0400 (Thu, 26 Apr 2012)
New Revision: 40523
Removed:
forge/
Log:
13 years, 8 months
JBoss Tools SVN: r40521 - trunk/forge/plugins/org.jboss.tools.forge.runtime.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-26 12:42:29 -0400 (Thu, 26 Apr 2012)
New Revision: 40521
Modified:
trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties
Log:
fix org.jboss.tools.forge.runtime/build.properties to generate sources.
Modified: trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties
===================================================================
--- trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2012-04-26 16:34:54 UTC (rev 40520)
+++ trunk/forge/plugins/org.jboss.tools.forge.runtime/build.properties 2012-04-26 16:42:29 UTC (rev 40521)
@@ -1,5 +1,5 @@
bin.includes = META-INF/,\
forge-distribution-1.0.3.Final/
+source.. = src/
src.includes = *
-jars.compile.order = .
-source.. =
+src.excludes = src
13 years, 8 months
JBoss Tools SVN: r40520 - trunk/build/parent.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2012-04-26 12:34:54 -0400 (Thu, 26 Apr 2012)
New Revision: 40520
Modified:
trunk/build/parent/pom.xml
Log:
rollback addition of osx64 and win64 to target-platform-configuration plugin; breaks XulRunner build and inclusion in .continuous job
Modified: trunk/build/parent/pom.xml
===================================================================
--- trunk/build/parent/pom.xml 2012-04-26 15:30:22 UTC (rev 40519)
+++ trunk/build/parent/pom.xml 2012-04-26 16:34:54 UTC (rev 40520)
@@ -144,21 +144,11 @@
<arch>x86</arch>
</environment>
<environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
<os>win32</os>
<ws>win32</ws>
<arch>x86</arch>
</environment>
<environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
<os>linux</os>
<ws>gtk</ws>
<arch>x86</arch>
13 years, 8 months
JBoss Tools SVN: r40519 - in trunk/ws: tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-04-26 11:30:22 -0400 (Thu, 26 Apr 2012)
New Revision: 40519
Added:
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/ParameterizedResource.java
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/BarResource.java
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/BazResource.java
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java
Log:
Fixed - JBIDE-11576
ClassCastException in JavaMethodSignaturesVisitor
Fixing failing tests
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java 2012-04-26 11:21:04 UTC (rev 40518)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/jdt/JavaMethodSignaturesVisitor.java 2012-04-26 15:30:22 UTC (rev 40519)
@@ -84,8 +84,8 @@
if (methodBinding == null) {
Logger.warn("Could not resolve bindings form method " + method.getElementName());
} else {
- final IType returnedType = methodBinding.getReturnType() != null ? (IType) methodBinding
- .getReturnType().getJavaElement().getAdapter(IType.class) : null;
+ final IType returnedType = getReturnType(methodBinding);
+ //.getReturnType().getJavaElement() : null;
List<JavaMethodParameter> methodParameters = new ArrayList<JavaMethodParameter>();
@SuppressWarnings("unchecked")
List<SingleVariableDeclaration> parameters = declaration.parameters();
@@ -122,6 +122,18 @@
return true;
}
+ /**
+ * Returns the ReturnType for the given method or null of the return type could not be found or is 'void'
+ * @param methodBinding
+ * @return
+ */
+ private IType getReturnType(final IMethodBinding methodBinding) {
+ if (methodBinding.getReturnType() != null && methodBinding.getReturnType().getJavaElement() != null) {
+ return (IType) methodBinding.getReturnType().getJavaElement().getAdapter(IType.class);
+ }
+ return null;
+ }
+
private static Map<String, List<String>> resolveAnnotationElements(IAnnotationBinding annotationBinding) {
final Map<String, List<String>> annotationElements = new HashMap<String, List<String>>();
for (IMemberValuePairBinding binding : annotationBinding.getAllMemberValuePairs()) {
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/BarResource.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/BarResource.java 2012-04-26 11:21:04 UTC (rev 40518)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/BarResource.java 2012-04-26 15:30:22 UTC (rev 40519)
@@ -1,4 +1,4 @@
-package org.bytesparadise.pastebin.service;
+package org.jboss.tools.ws.jaxrs.sample.services;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.PUT;
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/BazResource.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/BazResource.java 2012-04-26 11:21:04 UTC (rev 40518)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/BazResource.java 2012-04-26 15:30:22 UTC (rev 40519)
@@ -1,4 +1,4 @@
-package org.bytesparadise.pastebin.service;
+package org.jboss.tools.ws.jaxrs.sample.services;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.PUT;
Added: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/ParameterizedResource.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/ParameterizedResource.java (rev 0)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/ParameterizedResource.java 2012-04-26 15:30:22 UTC (rev 40519)
@@ -0,0 +1,9 @@
+package org.jboss.tools.ws.jaxrs.sample.services;
+
+public class ParameterizedResource<T> {
+
+ public T getType() {
+ return null;
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/projects/org.jboss.tools.ws.jaxrs.tests.sampleproject/src/main/java/org/jboss/tools/ws/jaxrs/sample/services/ParameterizedResource.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java 2012-04-26 11:21:04 UTC (rev 40518)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/src/org/jboss/tools/ws/jaxrs/core/jdt/JdtUtilsTestCase.java 2012-04-26 15:30:22 UTC (rev 40519)
@@ -454,6 +454,16 @@
}
@Test
+ public void shouldResolveJavaMethodSignaturesForParameterizedType() throws CoreException {
+ final IType type = getType("org.jboss.tools.ws.jaxrs.sample.services.ParameterizedResource");
+ // operation
+ final List<JavaMethodSignature> methodSignatures = JdtUtils.resolveMethodSignatures(type,
+ JdtUtils.parse(type, progressMonitor));
+ // verification
+ Assert.assertEquals(1, methodSignatures.size());
+ }
+
+ @Test
public void shouldResolveJavaMethodSignature() throws CoreException {
final IType type = getType("org.jboss.tools.ws.jaxrs.sample.services.CustomerResource");
final IMethod method = getMethod(type, "getCustomers");
13 years, 8 months