JBoss Tools SVN: r40477 - trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/resources.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-04-25 05:15:27 -0400 (Wed, 25 Apr 2012)
New Revision: 40477
Removed:
trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/resources/BarResource.txt
Log:
obsolete file
Deleted: trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/resources/BarResource.txt
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/resources/BarResource.txt 2012-04-25 09:14:52 UTC (rev 40476)
+++ trunk/ws/tests/org.jboss.tools.ws.jaxrs.core.test/resources/BarResource.txt 2012-04-25 09:15:27 UTC (rev 40477)
@@ -1,53 +0,0 @@
-package org.jboss.tools.ws.jaxrs.sample.services;
-
-import java.net.URI;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityNotFoundException;
-import javax.persistence.PersistenceContext;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.CacheControl;
-import javax.ws.rs.core.Context;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.ResponseBuilder;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
-
-import org.jboss.tools.ws.jaxrs.sample.domain.Address;
-import org.jboss.tools.ws.jaxrs.sample.domain.Customer;
-import org.jboss.tools.ws.jaxrs.sample.domain.PurchaseOrder;
-import org.jboss.tools.ws.jaxrs.sample.services.dto.CustomerDTO;
-import org.jboss.tools.ws.jaxrs.sample.services.dto.CustomersDTO;
-import org.jboss.tools.ws.jaxrs.sample.services.dto.Link;
-import org.jboss.tools.ws.jaxrs.sample.services.dto.Page;
-import org.jboss.tools.ws.jaxrs.sample.services.dto.PurchaseOrderDTO;
-import org.jboss.resteasy.annotations.providers.jaxb.Formatted;
-
-@Path("/bar")
-(a)Consumes(MediaType.APPLICATION_XML)
-@Produces({ "application/vnd.bytesparadise.customer+xml", MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
-public class BarResource {
-
- @PersistenceContext
- private EntityManager entityManager = null;
-
- public Response createFoo(Object foo) {
- return Response.created(null).build();
- }
-
- public Response getFoo(@PathParam("id") Integer id, @Context UriInfo uriInfo) {
- ResponseBuilder responseBuilder = Response.noContent();
- return responseBuilder.build();
- }
-
-}
\ No newline at end of file
13 years, 11 months
JBoss Tools SVN: r40476 - in trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core: metamodel and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-04-25 05:14:52 -0400 (Wed, 25 Apr 2012)
New Revision: 40476
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsEndpoint.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResource.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IJaxrsResource.java
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IJaxrsResourceMethod.java
Log:
Fixed - https://issues.jboss.org/browse/JBIDE-11648
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsEndpoint.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsEndpoint.java 2012-04-25 09:12:06 UTC (rev 40475)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsEndpoint.java 2012-04-25 09:14:52 UTC (rev 40476)
@@ -11,9 +11,13 @@
package org.jboss.tools.ws.jaxrs.core.internal.metamodel.domain;
import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsElementDelta.F_CONSUMED_MEDIATYPES_VALUE;
+import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsElementDelta.F_DEFAULT_VALUE_VALUE;
import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsElementDelta.F_HTTP_METHOD_VALUE;
+import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsElementDelta.F_MATRIX_PARAM_VALUE;
+import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsElementDelta.F_METHOD_PARAMETERS;
import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsElementDelta.F_PATH_VALUE;
import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsElementDelta.F_PRODUCED_MEDIATYPES_VALUE;
+import static org.jboss.tools.ws.jaxrs.core.internal.metamodel.builder.JaxrsElementDelta.F_QUERY_PARAM_VALUE;
import java.util.ArrayList;
import java.util.Arrays;
@@ -176,7 +180,8 @@
refreshHttpMethod();
}
- if ((flags & F_PATH_VALUE) > 0) {
+ if ((flags & F_PATH_VALUE) > 0 || (flags & F_QUERY_PARAM_VALUE) > 0 || (flags & F_MATRIX_PARAM_VALUE) > 0 || (flags & F_DEFAULT_VALUE_VALUE) > 0
+ || (flags & F_METHOD_PARAMETERS) > 0) {
refreshUriPathTemplate();
}
@@ -232,17 +237,16 @@
uriPathTemplateBuilder.append(application.getApplicationPath());
}
for (JaxrsResourceMethod resourceMethod : resourceMethods) {
- if (resourceMethod.getParentResource().getPathTemplate() != null) {
+ if (resourceMethod.getParentResource().hasPathTemplate()) {
uriPathTemplateBuilder.append("/").append(resourceMethod.getParentResource().getPathTemplate());
}
- if (resourceMethod.getPathTemplate() != null) {
+ if (resourceMethod.hasPathTemplate()) {
uriPathTemplateBuilder.append("/").append(resourceMethod.getPathTemplate());
}
if (resourceMethod.getJavaMethodParameters() != null) {
refreshUriTemplateMatrixParams(uriPathTemplateBuilder, resourceMethod);
refreshUriTemplateQueryParams(uriPathTemplateBuilder, resourceMethod);
}
-
}
this.uriPathTemplate = uriPathTemplateBuilder.toString();
while (uriPathTemplate.indexOf("//") > -1) {
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResource.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResource.java 2012-04-25 09:12:06 UTC (rev 40475)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResource.java 2012-04-25 09:14:52 UTC (rev 40476)
@@ -28,7 +28,6 @@
import org.jboss.tools.ws.jaxrs.core.jdt.Annotation;
import org.jboss.tools.ws.jaxrs.core.metamodel.EnumElementKind;
import org.jboss.tools.ws.jaxrs.core.metamodel.EnumKind;
-import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsApplication;
import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsResource;
import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsResourceField;
import org.jboss.tools.ws.jaxrs.core.metamodel.IJaxrsResourceMethod;
@@ -42,9 +41,6 @@
*/
public class JaxrsResource extends JaxrsJavaElement<IType> implements IJaxrsResource {
- /** Optional Application. */
- private final JaxrsJavaApplication application = null;
-
private final Map<String, JaxrsResourceField> resourceFields = new HashMap<String, JaxrsResourceField>();
private final Map<String, JaxrsParamBeanProperty> paramBeanProperties = new HashMap<String, JaxrsParamBeanProperty>();
@@ -134,6 +130,12 @@
}
return pathAnnotation.getValue("value");
}
+
+ @Override
+ public boolean hasPathTemplate() {
+ final Annotation pathAnnotation = getPathAnnotation();
+ return pathAnnotation != null && pathAnnotation.getValue("value") != null;
+ }
public Annotation getPathAnnotation() {
final Annotation pathAnnotation = getAnnotation(Path.class.getName());
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2012-04-25 09:12:06 UTC (rev 40475)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/internal/metamodel/domain/JaxrsResourceMethod.java 2012-04-25 09:14:52 UTC (rev 40476)
@@ -402,6 +402,12 @@
}
@Override
+ public boolean hasPathTemplate() {
+ final Annotation pathAnnotation = getPathAnnotation();
+ return pathAnnotation != null && pathAnnotation.getValue("value") != null;
+ }
+
+ @Override
public String getPathTemplate() {
final Annotation pathAnnotation = getPathAnnotation();
if (pathAnnotation == null) {
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IJaxrsResource.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IJaxrsResource.java 2012-04-25 09:12:06 UTC (rev 40475)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IJaxrsResource.java 2012-04-25 09:14:52 UTC (rev 40476)
@@ -16,9 +16,12 @@
String getPathTemplate();
+ boolean hasPathTemplate();
+
List<String> getConsumedMediaTypes();
List<String> getProducedMediaTypes();
List<IJaxrsResourceMethod> getAllMethods();
+
}
\ No newline at end of file
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IJaxrsResourceMethod.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IJaxrsResourceMethod.java 2012-04-25 09:12:06 UTC (rev 40475)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.core/src/org/jboss/tools/ws/jaxrs/core/metamodel/IJaxrsResourceMethod.java 2012-04-25 09:14:52 UTC (rev 40476)
@@ -51,4 +51,6 @@
*/
List<String> getPathParamValueProposals();
+ boolean hasPathTemplate();
+
}
\ No newline at end of file
13 years, 11 months
JBoss Tools SVN: r40475 - in trunk: vpe/tests/org.jboss.tools.vpe.ui.bot.test and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vpakan(a)redhat.com
Date: 2012-04-25 05:12:06 -0400 (Wed, 25 Apr 2012)
New Revision: 40475
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/requirements.properties
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/properties/swtbot.properties
trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
Log:
Fix mistyping error in property name for RichFaces UI jar location and use JBoss AS 7 for VPE SWTBot tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml 2012-04-25 09:08:53 UTC (rev 40474)
+++ trunk/jsf/tests/org.jboss.tools.jsf.ui.bot.test/pom.xml 2012-04-25 09:12:06 UTC (rev 40475)
@@ -14,8 +14,8 @@
<properties>
<jbosstools.test.jboss-as.home>${requirement.build.root}/jboss-as-web-7.0.2.Final</jbosstools.test.jboss-as.home>
<xulrunner.plugin.name>org.mozilla.xulrunner.gtk.linux.x86_1.9.2.16b</xulrunner.plugin.name>
- <org.jboss.tools.vpe.ui.bot.test.richafaces.ui.jar.location>${requirement.build.root}//richfaces-4.2.1.Final/artifacts/ui/richfaces-components-ui-4.2.1.Final.jar</org.jboss.tools.vpe.ui.bot.test.richafaces.ui.jar.location>
- <systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/properties/ -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home} -Dorg.eclipse.swt.browser.XULRunnerPath=${project.build.outputDirectory}/../work/plugins/${xulrunner.plugin.name}/xulrunner -Dorg.jboss.tools.vpe.ui.bot.test.richafaces.ui.jar.location=${org.jboss.tools.vpe.ui.bot.test.richafaces.ui.jar.location}</systemProperties>
+ <org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location>${requirement.build.root}//richfaces-4.2.1.Final/artifacts/ui/richfaces-components-ui-4.2.1.Final.jar</org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location>
+ <systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/properties/ -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home} -Dorg.eclipse.swt.browser.XULRunnerPath=${project.build.outputDirectory}/../work/plugins/${xulrunner.plugin.name}/xulrunner -Dorg.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location=${org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location}</systemProperties>
<test.suite.class>org.jboss.tools.jsf.ui.bot.test.JSFAllBotTests</test.suite.class>
</properties>
<build>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml 2012-04-25 09:08:53 UTC (rev 40474)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/pom.xml 2012-04-25 09:12:06 UTC (rev 40475)
@@ -1,59 +1,68 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.tools.vpe</groupId>
- <artifactId>tests</artifactId>
- <version>3.3.0-SNAPSHOT</version>
- </parent>
- <groupId>org.jboss.tools.vpe.tests</groupId>
- <artifactId>org.jboss.tools.vpe.ui.bot.test</artifactId>
-
- <packaging>eclipse-test-plugin</packaging>
- <properties>
- <jbosstools.test.jboss-as.home>${requirement.build.root}/jboss-5.1.0.GA</jbosstools.test.jboss-as.home>
- <systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/properties/ -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home}</systemProperties>
- <test.suite.class>org.jboss.tools.vpe.ui.bot.test.VPEAllBotTests</test.suite.class>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>tycho-surefire-plugin</artifactId>
- <configuration>
- <testSuite>org.jboss.tools.vpe.ui.bot.test</testSuite>
- <testClass>${test.suite.class}</testClass>
- <useUIThread>false</useUIThread>
- <skip>${swtbot.test.skip}</skip>
- <dependencies combine.children="append">
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.jboss.ide.eclipse.as.feature.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.jboss.tools.vpe.feature.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.jboss.tools.jsf.feature.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.jst.enterprise_ui.feature.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency>
- <dependency>
- <type>p2-installable-unit</type>
- <artifactId>org.eclipse.jst.web_core.feature.feature.group</artifactId>
- <version>0.0.0</version>
- </dependency>
- </dependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.vpe</groupId>
+ <artifactId>tests</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.vpe.tests</groupId>
+ <artifactId>org.jboss.tools.vpe.ui.bot.test</artifactId>
+
+ <packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <jbosstools.test.jboss-as.home>${requirement.build.root}/jboss-as-web-7.0.2.Final</jbosstools.test.jboss-as.home>
+ <xulrunner.plugin.name>org.mozilla.xulrunner.gtk.linux.x86_1.9.2.16b</xulrunner.plugin.name>
+ <org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location>${requirement.build.root}//richfaces-4.2.1.Final/artifacts/ui/richfaces-components-ui-4.2.1.Final.jar</org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location>
+ <systemProperties>-Dswtbot.test.skip=false -Dtest.configurations.dir=resources/properties/ -Djbosstools.test.jboss-as.home=${jbosstools.test.jboss-as.home} -Dorg.eclipse.swt.browser.XULRunnerPath=${project.build.outputDirectory}/../work/plugins/${xulrunner.plugin.name}/xulrunner -Dorg.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location=${org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location}</systemProperties>
+ <test.suite.class>org.jboss.tools.vpe.ui.bot.test.VPEAllBotTests</test.suite.class>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <testSuite>org.jboss.tools.vpe.ui.bot.test</testSuite>
+ <testClass>${test.suite.class}</testClass>
+ <useUIThread>false</useUIThread>
+ <skip>${swtbot.test.skip}</skip>
+ <product>org.eclipse.platform.ide</product>
+ <dependencies combine.children="append">
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.ide.eclipse.as.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.vpe.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.jsf.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.enterprise_ui.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.eclipse.jst.web_core.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>
+ </dependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/requirements.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/requirements.properties 2012-04-25 09:08:53 UTC (rev 40474)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/requirements.properties 2012-04-25 09:12:06 UTC (rev 40475)
@@ -1 +1 @@
-requirements=jbossas-5.1.0.GA
+requirements=jbossas-7.0.2.Final,richfaces-4.2.1.Final
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties 2012-04-25 09:08:53 UTC (rev 40474)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties 2012-04-25 09:12:06 UTC (rev 40475)
@@ -1,8 +1 @@
-JSFProjectName=JBIDETestProject
RichFacesUiJarLocation=/opt/jboss-eap-5.1/seam/lib/richfaces-ui.jar
-FaceletsProjectName=FaceletsTestProject
-Apachev6.0=D\:/Java/apache-tomcat-6.0.18
-JBossEap5.x=/opt/jbdevstudio4.1.1.GA/jboss-eap/jboss-as
-JSF2ProjectName=JSF2TestProject
-JBossASForJSF2=/opt/jboss-6.0.0.Final
-JBossASForJSF2Version=6.0
\ No newline at end of file
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/properties/swtbot.properties
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/properties/swtbot.properties 2012-04-25 09:08:53 UTC (rev 40474)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/resources/properties/swtbot.properties 2012-04-25 09:12:06 UTC (rev 40475)
@@ -5,7 +5,7 @@
# JAVA=1.6,${JAVA_HOME}
#EAP|JBOSS_AS|EPP|SOA,<server version>,<jre version to run with>|default,<server home>
# note : when server is type of SOA, version is version of SOA (not the bundled EAP)
-SERVER=EAP,5.x,default,${jbosstools.test.jboss-as.home}
+SERVER=AS,7.0,default,${jbosstools.test.jboss-as.home}
#<seam version>,<seam runtime home>
#SEAM=2.2,/opt/jbdevstudio4.1.1.GA/jboss-eap/seam
#<esb versoin>,<esb runtime home>
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2012-04-25 09:08:53 UTC (rev 40474)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2012-04-25 09:12:06 UTC (rev 40475)
@@ -100,7 +100,7 @@
}
// Get richfaces-ui.jar location
// System property has priority
- String richFacesUiLocation = System.getProperty("org.jboss.tools.vpe.ui.bot.test.richafaces.ui.jar.location","");
+ String richFacesUiLocation = System.getProperty("org.jboss.tools.vpe.ui.bot.test.richfaces.ui.jar.location","");
// Read property from Properties File
if (richFacesUiLocation.length() == 0){
if (projectProperties.containsKey("RichFacesUiJarLocation")){
13 years, 11 months
JBoss Tools SVN: r40474 - trunk/openshift/features/org.jboss.tools.openshift.express.feature.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2012-04-25 05:08:53 -0400 (Wed, 25 Apr 2012)
New Revision: 40474
Modified:
trunk/openshift/features/org.jboss.tools.openshift.express.feature/feature.properties
Log:
In progress JBIDE-11475
Flex and Express merged, we need to correct our wording
Modified: trunk/openshift/features/org.jboss.tools.openshift.express.feature/feature.properties
===================================================================
--- trunk/openshift/features/org.jboss.tools.openshift.express.feature/feature.properties 2012-04-25 08:59:47 UTC (rev 40473)
+++ trunk/openshift/features/org.jboss.tools.openshift.express.feature/feature.properties 2012-04-25 09:08:53 UTC (rev 40474)
@@ -15,7 +15,7 @@
# This file should be translated.
# "featureName" property - name of the feature
-featureName=JBoss OpenShift Express Tools
+featureName=JBoss OpenShift Tools
# "providerName" property - name of the company that provides the feature
providerName=JBoss by Red Hat
@@ -26,7 +26,7 @@
devUpdateSiteName=JBossTools Development Update Site
# "description" property - description of the feature
-description=Provides Tooling to deal with OpenShift Express. It will allow you to sign into your OpenShift Express account, create a domain and manage applications. It will furthermore allow you to setup an Eclipse WTP server adapter that would be able to publish projects to the OpenShift Express PaaS platform..
+description=Provides Tooling to deal with OpenShift. It will allow you to sign into your OpenShift account, create a domain and manage applications. It will furthermore allow you to setup an Eclipse WTP server adapter that would be able to publish projects to the OpenShift PaaS..
copyright=Copyright (c) 2011-2012 Red Hat, Inc. and others.\n\
All rights reserved. This program and the accompanying materials\n\
13 years, 11 months
JBoss Tools SVN: r40473 - in trunk/central/tests/org.jboss.tools.central.test.ui.bot: src/org/jboss/tools/central/test/ui/bot and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-04-25 04:59:47 -0400 (Wed, 25 Apr 2012)
New Revision: 40473
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml
trunk/central/tests/org.jboss.tools.central.test.ui.bot/requirements.properties
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
Log:
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-04-25 08:41:41 UTC (rev 40472)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-04-25 08:59:47 UTC (rev 40473)
@@ -13,11 +13,21 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
- <jbosstools.test.jbossas.home>${requirement.build.root}/jboss-as-web-7.0.2.Final</jbosstools.test.jbossas.home>
+ <additionalSystemProperties></additionalSystemProperties>
+ <jbosstools.test.jbossas.home>${requirement.build.root}/jboss-as-7.1.1.Final</jbosstools.test.jbossas.home>
<!-- for debugging ucomment and comment next line <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y -Djbosstools.test.jbossas.home=${jbosstools.test.jbossas.home} -Dswtbot.test.properties.file=${swtbot.properties}</systemProperties> -->
- <systemProperties>-Djbosstools.test.jbossas.home=${jbosstools.test.jbossas.home} -Dswtbot.test.properties.file=${swtbot.properties}</systemProperties>
+ <systemProperties>${additionalSystemProperties} -Djbosstools.test.jbossas.home=${jbosstools.test.jbossas.home} -Dswtbot.test.properties.file=${swtbot.properties}</systemProperties>
</properties>
+ <profiles>
+ <profile>
+ <id>debug</id>
+ <properties>
+ <additionalSystemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y</additionalSystemProperties>
+ </properties>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/requirements.properties
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/requirements.properties 2012-04-25 08:41:41 UTC (rev 40472)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/requirements.properties 2012-04-25 08:59:47 UTC (rev 40473)
@@ -1 +1 @@
-requirements=jbossas-7.0.2.Final
\ No newline at end of file
+requirements=jbossas-7.1.1.Final
\ No newline at end of file
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-04-25 08:41:41 UTC (rev 40472)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsWithServerTest.java 2012-04-25 08:59:47 UTC (rev 40473)
@@ -50,7 +50,9 @@
log.info(bot.activeShell().getText());
bot.hyperlink(IDELabel.JBossCentralEditor.OPENSHIFT_APP).click();
bot.waitForShell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD);
- assertTrue("New OpenShift Express Application window should have appeared", bot.shell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD).isActive());
+ bot.waitWhile(new NonSystemJobRunsCondition());
+ assertTrue("New OpenShift Express Application window should have appeared", bot.activeShell().getText().equals(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD));
+ //assertTrue("New OpenShift Express Application window should have appeared", bot.shell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD).isActive());
bot.activeShell().close();
//check Project example and detection of server
@@ -147,21 +149,33 @@
@Test
public void canBeDeployedTest(){
servers.show();
- servers.findServerByName(servers.bot().tree(), "AS-7.0").contextMenu("Add and Remove...").click();
+ String serverName = bot.tree().getAllItems()[0].getText().substring(0, bot.tree().getAllItems()[0].getText().indexOf(' '));
+ servers.findServerByName(servers.bot().tree(), serverName).contextMenu("Add and Remove...").click();
+ bot.shell("Add and Remove...").activate();
for (SWTBotTreeItem treeItem : bot.tree().getAllItems()) {
treeItem.select();
bot.clickButton("Add >");
}
-
bot.clickButton("Finish");
+ servers.show();
+ log.info("========================================");
+ log.info(bot.tree().getAllItems().toString());
bot.waitWhile(new NonSystemJobRunsCondition());
+ log.info("Pred getErrorsNode");
assertNull("Errors node should be null", problems.getErrorsNode(bot));
- SWTBotTreeItem serverTreeItem = servers.findServerByName(servers.bot().tree(), "AS-7.0").expand();
+ log.info("Za getErrorsNode");
+ servers.show();
+ bot.waitWhile(new NonSystemJobRunsCondition());
+ SWTBotTreeItem serverTreeItem = servers.findServerByName(servers.bot().tree(), serverName).expand();
for (SWTBotTreeItem projectName : projectExplorer.show().bot().tree().getAllItems()) {
try{
serverTreeItem.getNode(projectName.getText()+" [Started, Synchronized]");
+ log.info("Project: "+projectName.getText()+" is properly deployed.");
}catch (WidgetNotFoundException wnfe){
- fail("Project <"+projectName.getText()+"> is not deployed on server correctly");
+ //exception for Java EE Web project. It hase 4 projects, multi, multi-ear, multi-ejb and multi-web.
+ if (!projectName.getText().contains("multi")){
+ fail("Project <"+projectName.getText()+"> is not deployed on server correctly");
+ }
}
}
}
13 years, 11 months
JBoss Tools SVN: r40472 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: webservice and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-25 04:41:41 -0400 (Wed, 25 Apr 2012)
New Revision: 40472
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/WebServiceTestBase.java
Log:
workaround for JBIDE-9606
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-25 08:40:54 UTC (rev 40471)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/WSTestBase.java 2012-04-25 08:41:41 UTC (rev 40472)
@@ -35,12 +35,12 @@
* @author jjankovi
*
*/
+@Require(perspective="Java EE",
+ server=(a)Server(type=ServerType.JbossAS,
+ version = "7.1", operator = ">="))
//@Require(perspective="Java EE",
-// server=(a)Server(type=ServerType.JbossAS,
-// version = "7.1", operator = ">="))
-@Require(perspective="Java EE",
- server=(a)Server(type=ServerType.EAP,
- version = "5.1", operator = ">="))
+// server=(a)Server(type=ServerType.EAP,
+// version = "5.1", operator = ">="))
@RunWith(RequirementAwareSuite.class)
@SuiteClasses({ WSAllBotTests.class })
public class WSTestBase extends SWTTestExt {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/WebServiceTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/WebServiceTestBase.java 2012-04-25 08:40:54 UTC (rev 40471)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/webservice/WebServiceTestBase.java 2012-04-25 08:41:41 UTC (rev 40472)
@@ -121,6 +121,7 @@
wsw.next();
wsw.setPackageName(pkg);
}
+ wsw.next();
wsw.finish();
util.waitForNonIgnoredJobs();
bot.sleep(2*TIME_1S);
13 years, 11 months
JBoss Tools SVN: r40471 - trunk/ws/tests/org.jboss.tools.ws.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-04-25 04:40:54 -0400 (Wed, 25 Apr 2012)
New Revision: 40471
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml
Log:
workaround for JBIDE-11645
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-25 08:17:47 UTC (rev 40470)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/pom.xml 2012-04-25 08:40:54 UTC (rev 40471)
@@ -47,8 +47,15 @@
<artifactId>org.jboss.tools.ws.jaxrs.feature.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
+ <!-- workaround until JIRA fixed -->
<dependency>
<type>p2-installable-unit</type>
+ <artifactId>org.jboss.ide.eclipse.as.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <!-- end of workaround -->
+ <dependency>
+ <type>p2-installable-unit</type>
<artifactId>org.eclipse.jst.enterprise_ui.feature.feature.group</artifactId>
<version>0.0.0</version>
</dependency>
13 years, 11 months
JBoss Tools SVN: r40470 - in trunk: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-25 04:17:47 -0400 (Wed, 25 Apr 2012)
New Revision: 40470
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IMultiModuleURLProvider.java
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/EarArtifactAdapter.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLaunchAdapter.java
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java
Log:
JBIDE-10930
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/EarArtifactAdapter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/EarArtifactAdapter.java 2012-04-25 07:46:16 UTC (rev 40469)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/modules/EarArtifactAdapter.java 2012-04-25 08:17:47 UTC (rev 40470)
@@ -46,10 +46,25 @@
String typeId = children[i].getModuleType().getId();
if( typeId.equals(IModuleConstants.JST_WEB_MODULE) || typeId.equals(IModuleConstants.WST_WEB_MODULE))
tmp = WebDeployableArtifactUtil.getModuleObject(children[i].getProject());
- if( tmp != null )
- return tmp;
+ if( tmp != null ) {
+ return new EarModuleArtifact(ear, tmp);
+ }
}
return null;
}
+ public static class EarModuleArtifact implements IModuleArtifact {
+ private IModule earModule;
+ private IModuleArtifact webArtifact;
+ public EarModuleArtifact(IModule ear, IModuleArtifact web) {
+ this.earModule = ear;
+ this.webArtifact = web;
+ }
+ public IModule getModule() {
+ return earModule;
+ }
+ public IModuleArtifact getWebArtifact() {
+ return webArtifact;
+ }
+ }
}
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IMultiModuleURLProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IMultiModuleURLProvider.java (rev 0)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IMultiModuleURLProvider.java 2012-04-25 08:17:47 UTC (rev 40470)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2011 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.ide.eclipse.as.core.server;
+
+import java.net.URL;
+
+import org.eclipse.wst.server.core.IModule;
+import org.eclipse.wst.server.core.model.IURLProvider;
+
+public interface IMultiModuleURLProvider extends IURLProvider {
+ public URL getModuleRootURL(IModule[] module);
+}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2012-04-25 07:46:16 UTC (rev 40469)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServer.java 2012-04-25 08:17:47 UTC (rev 40470)
@@ -20,21 +20,22 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.j2ee.project.WebUtilities;
import org.eclipse.jst.server.core.IWebModule;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IServerWorkingCopy;
import org.eclipse.wst.server.core.ServerPort;
-import org.eclipse.wst.server.core.model.IURLProvider;
import org.eclipse.wst.server.core.model.ServerDelegate;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.IMultiModuleURLProvider;
import org.jboss.ide.eclipse.as.core.util.RuntimeUtils;
import org.jboss.ide.eclipse.as.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.wtp.core.util.ServerModelUtilities;
-public class DeployableServer extends ServerDelegate implements IDeployableServer, IURLProvider {
+public class DeployableServer extends ServerDelegate implements IDeployableServer, IMultiModuleURLProvider {
public DeployableServer() {
}
@@ -183,15 +184,26 @@
return false;
}
+ protected int getWebPort() {
+ return 80;
+ }
public URL getModuleRootURL(IModule module) {
- return getModuleRootURL(module, getServer().getHost(), 80);
+ return getModuleRootURL(module, getServer().getHost(), getWebPort(), null);
}
-
- public static URL getModuleRootURL(IModule module, String host, int port) {
- return getModuleRootURL(module, host, port, false);
+ public URL getModuleRootURL(IModule[] module) {
+ if( module.length == 2) {
+ String contextRoot = WebUtilities.getServerContextRoot(module[1].getProject(),
+ module[0].getProject());
+ return getModuleRootURL(module[1], getServer().getHost(), getWebPort(), contextRoot);
+ } else {
+ return module.length > 0 ? getModuleRootURL(module[0]) : null;
+ }
}
-
- public static URL getModuleRootURL(IModule module, String host, int port, boolean ignoreContextRoot) {
+ public URL getModuleRootURL(IModule module, String contextRoot) {
+ return getModuleRootURL(module, getServer().getHost(), getWebPort(), contextRoot);
+ }
+
+ public static URL getModuleRootURL(IModule module, String host, int port, String contextRoot) {
if (module == null || module.loadAdapter(IWebModule.class,null)==null )
return null;
@@ -203,11 +215,11 @@
if (port != 80)
url += ":" + port; //$NON-NLS-1$
- if( !ignoreContextRoot ) {
- String cxRoot = webModule.getContextRoot();
- if( !cxRoot.equals("/") && !cxRoot.equals("./")) //$NON-NLS-1$ //$NON-NLS-2$
- url += "/"+webModule.getContextRoot(); //$NON-NLS-1$
+ if( contextRoot == null ) {
+ contextRoot = webModule.getContextRoot();
}
+ if( !contextRoot.equals("/") && !contextRoot.equals("./")) //$NON-NLS-1$ //$NON-NLS-2$
+ url += "/"+contextRoot; //$NON-NLS-1$
if (!url.endsWith("/")) //$NON-NLS-1$
url += "/"; //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLaunchAdapter.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLaunchAdapter.java 2012-04-25 07:46:16 UTC (rev 40469)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossLaunchAdapter.java 2012-04-25 08:17:47 UTC (rev 40470)
@@ -20,6 +20,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.jst.j2ee.project.WebUtilities;
import org.eclipse.jst.server.core.EJBBean;
import org.eclipse.jst.server.core.JndiLaunchable;
import org.eclipse.jst.server.core.JndiObject;
@@ -34,7 +35,9 @@
import org.eclipse.wst.server.core.model.LaunchableAdapterDelegate;
import org.eclipse.wst.server.core.model.ServerDelegate;
import org.eclipse.wst.server.core.util.WebResource;
+import org.jboss.ide.eclipse.as.core.modules.EarArtifactAdapter.EarModuleArtifact;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
+import org.jboss.ide.eclipse.as.core.server.IMultiModuleURLProvider;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeConstants;
import org.jboss.ide.eclipse.as.core.util.IJBossRuntimeResourceConstants;
import org.jboss.ide.eclipse.as.core.util.PortalUtil;
@@ -60,11 +63,23 @@
public Object getLaunchable(IServer server, IModuleArtifact moduleObject) {
if (server != null) {
ServerDelegate delegate = (ServerDelegate)server.loadAdapter(ServerDelegate.class,null);
-// if (!(delegate instanceof JBossServer ))
-// return null;
- if ((moduleObject instanceof Servlet) ||(moduleObject instanceof WebResource))
- return prepareHttpLaunchable(moduleObject, delegate, server);
-
+ if( moduleObject instanceof EarModuleArtifact ) {
+ EarModuleArtifact earArt = ((EarModuleArtifact)moduleObject);
+ IModuleArtifact webArtifact = earArt.getWebArtifact();
+ if( delegate instanceof IMultiModuleURLProvider) {
+ URL root = ((IMultiModuleURLProvider)delegate).getModuleRootURL(new IModule[]{
+ earArt.getModule(), webArtifact.getModule()
+ });
+ return prepareHttpLaunchable(moduleObject, delegate, server, root);
+ } else {
+ // Cannot calculate root url from application.xml for this server type.
+ moduleObject = webArtifact;
+ }
+ }
+ if ((moduleObject instanceof Servlet) ||(moduleObject instanceof WebResource)) {
+ URL root = ((IURLProvider) delegate).getModuleRootURL(moduleObject.getModule());
+ return prepareHttpLaunchable(moduleObject, delegate, server, root);
+ }
if((moduleObject instanceof EJBBean) || (moduleObject instanceof JndiObject))
return prepareJndiLaunchable(moduleObject,delegate);
}
@@ -103,9 +118,9 @@
* @param server
* @return object
*/
- private Object prepareHttpLaunchable(IModuleArtifact moduleObject, ServerDelegate delegate, IServer server) {
+ private Object prepareHttpLaunchable(IModuleArtifact moduleObject, ServerDelegate delegate, IServer server, URL rootUrl) {
try {
- URL url = ((IURLProvider) delegate).getModuleRootURL(moduleObject.getModule());
+ URL url = rootUrl;
if (moduleObject instanceof Servlet) {
Servlet servlet = (Servlet) moduleObject;
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-04-25 07:46:16 UTC (rev 40469)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/JBossServer.java 2012-04-25 08:17:47 UTC (rev 40470)
@@ -29,8 +29,6 @@
import static org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants.WEB_PORT_DETECT_XPATH;
import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.Date;
import org.eclipse.core.runtime.IPath;
@@ -40,11 +38,7 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.security.storage.StorageException;
-import org.eclipse.jst.server.core.IWebModule;
-import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.model.IURLProvider;
import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin;
import org.jboss.ide.eclipse.as.core.extensions.descriptors.XPathModel;
@@ -191,6 +185,10 @@
JNDI_PORT_DEFAULT_XPATH, JNDI_DEFAULT_PORT);
}
+ protected int getWebPort() {
+ return getJBossWebPort();
+ }
+
public int getJBossWebPort() {
return findPort(WEB_PORT, WEB_PORT_DETECT, WEB_PORT_DETECT_XPATH,
WEB_PORT_DEFAULT_XPATH, JBOSS_WEB_DEFAULT_PORT);
@@ -225,10 +223,6 @@
return ExpressionResolverUtil.safeReplaceProperties(result);
}
- public URL getModuleRootURL(IModule module) {
- return getModuleRootURL(module, getHost(), getJBossWebPort());
- }
-
// first class parameters
public String getUsername() {
return getAttribute(SERVER_USERNAME, "admin"); //$NON-NLS-1$
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-04-25 07:46:16 UTC (rev 40469)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressServer.java 2012-04-25 08:17:47 UTC (rev 40470)
@@ -61,7 +61,7 @@
IProject appProj = appProjString == null ? null : ResourcesPlugin.getWorkspace().getRoot().getProject(appProjString);
IProject p =module.getProject();
boolean shouldIgnore = ExpressServerUtils.getIgnoresContextRoot(getServer()) && p.equals(appProj);
- return JBossServer.getModuleRootURL(module, getServer().getHost(), 80, shouldIgnore);
+ return JBossServer.getModuleRootURL(module, getServer().getHost(), 80, shouldIgnore ? "" : null);
}
public ServerExtendedProperties getExtendedProperties() {
13 years, 11 months
JBoss Tools SVN: r40469 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-25 03:46:16 -0400 (Wed, 25 Apr 2012)
New Revision: 40469
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
Log:
JBIDE-11194
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-04-25 07:13:21 UTC (rev 40468)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-04-25 07:46:16 UTC (rev 40469)
@@ -182,6 +182,7 @@
passText.setText(pass);
passText.setEnabled(fapplication == null);
}
+ rememberPassword = pass != null && !"".equals(pass);
rememberPasswordCheckBox.setSelection(rememberPassword);
}
if (remote != null)
13 years, 11 months
JBoss Tools SVN: r40468 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-04-25 03:13:21 -0400 (Wed, 25 Apr 2012)
New Revision: 40468
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PortalUtil.java
Log:
JBIDE-11340 patch from snjezana
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PortalUtil.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PortalUtil.java 2012-04-25 06:47:57 UTC (rev 40467)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/PortalUtil.java 2012-04-25 07:13:21 UTC (rev 40468)
@@ -48,7 +48,7 @@
// JBoss Portal server
if (exists(configFile, SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_SAR)) {
- return TYPE_PORTAL_UNKNOWN;
+ return TYPE_PORTAL;
}
// JBoss Portal clustering server
if (exists(configFile, SERVER_DEFAULT_DEPLOY_JBOSS_PORTAL_HA_SAR)) {
13 years, 11 months