JBoss Tools SVN: r38499 - trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/4812.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-02-08 08:43:56 -0500 (Wed, 08 Feb 2012)
New Revision: 38499
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/4812/resourceProcessingTestPage.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/4812/resourceProcessingTestPage.xhtml.xml
Log:
https://issues.jboss.org/browse/JBIDE-10819 - JUnit was updated.
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/4812/resourceProcessingTestPage.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/4812/resourceProcessingTestPage.xhtml 2012-02-08 13:42:35 UTC (rev 38498)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/4812/resourceProcessingTestPage.xhtml 2012-02-08 13:43:56 UTC (rev 38499)
@@ -10,9 +10,8 @@
</h:head>
<h:body>
<h:form id="jbide4812">
- #{resource['css/stylesBlue.css']}
- <h:outputText value="#{resource['css/stylesBlue.css']}" />
- #{resource['css/stylesBlue.css1']}
+ <input type="submit" value="#{resource['css/stylesBlue.css']}">
+ <input type="submit" value="#{resource['css/stylesBlue.css1']}">
</h:form>
</h:body>
</html>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/4812/resourceProcessingTestPage.xhtml.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/4812/resourceProcessingTestPage.xhtml.xml 2012-02-08 13:42:35 UTC (rev 38498)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsf2test/WebContent/pages/JBIDE/4812/resourceProcessingTestPage.xhtml.xml 2012-02-08 13:43:56 UTC (rev 38499)
@@ -1,12 +1,7 @@
<tests>
<test id="jbide4812">
- <FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
-<SPAN CLASS="vpe-text">
-/resources/css/stylesBlue.css
-</SPAN>
-<SPAN CLASS="vpe-text">
-/resources/css/stylesBlue.css
-</SPAN>
-</FORM>
+ <FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;">
+ <INPUT TYPE="submit" VALUE="/.*jsf2test/WebContent/resources/css/stylesBlue.css/" />
+ </FORM>
</test>
</tests>
14 years, 2 months
JBoss Tools SVN: r38498 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: util and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dmaliarevich
Date: 2012-02-08 08:42:35 -0500 (Wed, 08 Feb 2012)
New Revision: 38498
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsf2Resource.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Jsf2ResourceUtil.java
Log:
https://issues.jboss.org/browse/JBIDE-10819 - Method FileUtil.getJSF2ResourcePath(..) was updated to return the real "resources" folder path.
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java 2012-02-08 13:34:47 UTC (rev 38497)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionHref.java 2012-02-08 13:42:35 UTC (rev 38498)
@@ -55,7 +55,7 @@
File locFile = tagPath.toFile();
if (locFile.exists()) {
- return new VpeValue(getPrefix() + locFile.getAbsolutePath());
+ return new VpeValue(getPrefix() + tagPath.toString());
}
IEditorInput input = pageContext.getEditPart().getEditorInput();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsf2Resource.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsf2Resource.java 2012-02-08 13:34:47 UTC (rev 38497)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionJsf2Resource.java 2012-02-08 13:42:35 UTC (rev 38498)
@@ -33,10 +33,7 @@
if ("".equals(library)) { //$NON-NLS-1$
library = null;
}
-
String name = getParameter(1).exec(pageContext, sourceNode).stringValue();
-
- String resourcePath = FileUtil.getJSF2ResourcePath(pageContext, library, name);
- return new VpeValue(resourcePath);
+ return new VpeValue(FileUtil.getJSF2ResourcePath(pageContext, library, name));
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2012-02-08 13:34:47 UTC (rev 38497)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeFunctionSrc.java 2012-02-08 13:42:35 UTC (rev 38498)
@@ -44,102 +44,88 @@
public class VpeFunctionSrc extends VpeFunction {
static final String IMG_UNRESOLVED = "unresolved_image.gif"; //$NON-NLS-1$
static final String IMG_PREFIX = "file:///"; //$NON-NLS-1$
-// private static final Pattern resourcePatternWithSinglCoat= Pattern.compile("[#\\$]\\{\\s*resource\\s*\\[\\s*'(.*)'\\s*\\]\\s*\\}"); //$NON-NLS-1$
-// private static final Pattern resourcePatternWithDoableCoat= Pattern.compile("[#\\$]\\{\\s*resource\\s*\\[\\s*\"(.*)\"\\s*\\]\\s*\\}"); //$NON-NLS-1$
-
public VpeValue exec(VpePageContext pageContext, Node sourceNode) throws VpeExpressionException {
- String tagValue = getParameter(0).exec(pageContext, sourceNode)
- .stringValue();
-// tagValue = resolveEL(pageContext,tagValue);
- IFile iFile = VpeCreatorUtil.getFile(tagValue, pageContext);
-
- if (iFile != null) {
- return new VpeValue(getPrefix()+iFile.getLocation().toString());
- }
- tagValue = processValue(pageContext, sourceNode, tagValue);
-
- // decode string from utf
- try {
- tagValue = URLDecoder.decode(tagValue, "UTF-8"); //$NON-NLS-1$
- } catch (UnsupportedEncodingException e) {
-
- VpePlugin.getPluginLog().logError(e);
- } catch (IllegalArgumentException ex) {
- //if user enter invalid URL, for example " % sss",
- //illegal argument exception will be throwed,
- //brouser will not processed this url, so we just slow this exeption
- //You can check it's by inserting next code
- //<h:graphicImage value=" %= request.getContextPath()%/images/logos/banner.png"/>
- tagValue=""; //$NON-NLS-1$
- }
-
- IPath tagPath = new Path(tagValue);
- if (tagPath.isEmpty())
- return new VpeValue(getUnresolved());
-
- String device = (tagPath.getDevice() == null ? tagPath.segment(0)
- : tagPath.getDevice());
- if (device != null
- && ("http:".equalsIgnoreCase(device) //$NON-NLS-1$
- || "file:".equalsIgnoreCase(device))) //$NON-NLS-1$
- return new VpeValue(tagValue);
-
- File locFile = tagPath.toFile();
- if (locFile.exists())
- return new VpeValue(getPrefix() + locFile.getAbsolutePath());
-
- IEditorInput input = pageContext.getEditPart().getEditorInput();
- IPath inputPath = getInputParentPath(input);
- IPath imgPath = null;
- if (input instanceof ILocationProvider) {
- imgPath = inputPath.append(tagValue);
- } else {
- IPath basePath = tagPath.isAbsolute() ? VpeStyleUtil.getRootPath(input)
- : inputPath;
- if (basePath != null) {
- imgPath = basePath.append(tagPath);
- }
- }
-
- if (imgPath != null && imgPath.toFile().exists()) {
- return new VpeValue(getPrefix() + imgPath.toString());
- } else {
- IFile file = null;
- if (input instanceof IFileEditorInput) {
- file = ((IFileEditorInput) input).getFile();
- }
-
- if (null != file) {
- ResourceReference resourceReference = null;
- if ("/".equals(tagValue.substring(0, 1))) { //$NON-NLS-1$
- resourceReference = pageContext
- .getRuntimeAbsoluteFolder(file);
- tagValue = tagValue.substring(1);
- } else {
- resourceReference = pageContext
- .getRuntimeRelativeFolder(file);
- }
-
- String location = null;
- if (resourceReference != null) {
- location = resourceReference.getLocation();
- }
-
- if (null == location && null != file.getLocation()) {
- location = file.getLocation().toFile().getParent();
- }
-
- if (null != location) {
- File f = new File(location + File.separator + tagValue);
- if (f.exists()) {
- return new VpeValue(getPrefix() + f.getPath());
- }
- }
- }
- }
-
- return new VpeValue(getUnresolved());
+ String tagValue = getParameter(0).exec(pageContext, sourceNode).stringValue();
+ // tagValue = resolveEL(pageContext,tagValue);
+ IFile iFile = VpeCreatorUtil.getFile(tagValue, pageContext);
+ if (iFile != null) {
+ return new VpeValue(getPrefix()+iFile.getLocation().toString());
+ }
+ tagValue = processValue(pageContext, sourceNode, tagValue);
+ // decode string from utf
+ try {
+ tagValue = URLDecoder.decode(tagValue, "UTF-8"); //$NON-NLS-1$
+ } catch (UnsupportedEncodingException e) {
+ VpePlugin.getPluginLog().logError(e);
+ } catch (IllegalArgumentException ex) {
+ //if user enter invalid URL, for example " % sss",
+ //illegal argument exception will be throwed,
+ //brouser will not processed this url, so we just slow this exeption
+ //You can check it's by inserting next code
+ //<h:graphicImage value=" %= request.getContextPath()%/images/logos/banner.png"/>
+ tagValue=""; //$NON-NLS-1$
+ }
+ IPath tagPath = new Path(tagValue);
+ if (tagPath.isEmpty()) {
+ return new VpeValue(getUnresolved());
+ }
+ String device = (tagPath.getDevice() == null ? tagPath.segment(0)
+ : tagPath.getDevice());
+ if (device != null
+ && ("http:".equalsIgnoreCase(device) //$NON-NLS-1$
+ || "file:".equalsIgnoreCase(device))) { //$NON-NLS-1$
+ return new VpeValue(tagValue);
+ }
+ File locFile = tagPath.toFile();
+ if (locFile.exists()) {
+ return new VpeValue(getPrefix() + tagPath.toString());
+ }
+ IEditorInput input = pageContext.getEditPart().getEditorInput();
+ IPath inputPath = getInputParentPath(input);
+ IPath imgPath = null;
+ if (input instanceof ILocationProvider) {
+ imgPath = inputPath.append(tagValue);
+ } else {
+ IPath basePath = tagPath.isAbsolute()
+ ? VpeStyleUtil.getRootPath(input) : inputPath;
+ if (basePath != null) {
+ imgPath = basePath.append(tagPath);
+ }
+ }
+ if (imgPath != null && imgPath.toFile().exists()) {
+ return new VpeValue(getPrefix() + imgPath.toString());
+ } else {
+ IFile file = null;
+ if (input instanceof IFileEditorInput) {
+ file = ((IFileEditorInput) input).getFile();
+ }
+ if (null != file) {
+ ResourceReference resourceReference = null;
+ if ("/".equals(tagValue.substring(0, 1))) { //$NON-NLS-1$
+ resourceReference = pageContext
+ .getRuntimeAbsoluteFolder(file);
+ tagValue = tagValue.substring(1);
+ } else {
+ resourceReference = pageContext
+ .getRuntimeRelativeFolder(file);
+ }
+ String location = null;
+ if (resourceReference != null) {
+ location = resourceReference.getLocation();
+ }
+ if (null == location && null != file.getLocation()) {
+ location = file.getLocation().toFile().getParent();
+ }
+ if (null != location) {
+ File f = new File(location + File.separator + tagValue);
+ if (f.exists()) {
+ return new VpeValue(getPrefix() + f.getPath());
+ }
+ }
+ }
+ }
+ return new VpeValue(getUnresolved());
}
protected IPath getInputParentPath(IEditorInput input) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2012-02-08 13:34:47 UTC (rev 38497)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/FileUtil.java 2012-02-08 13:42:35 UTC (rev 38498)
@@ -84,7 +84,7 @@
*/
public static final String getJSF2ResourcePath(VpePageContext pageContext,
String resourceStr) {
- if (resourceStr.contains(":")) { //$NON-NLS-1$
+ if (resourceStr.contains(":")) { //$NON-NLS-1$
String[] parts = resourceStr.split(":"); //$NON-NLS-1$
return getJSF2ResourcePath(pageContext, parts[0], parts[1]);
} else {
@@ -94,43 +94,41 @@
/**
* Returns the path to the resource specified by the {@code library}
- * and the {@code name}.
- *
- * See JBIDE-5638
- *
+ * and the {@code name}. See JBIDE-5638
* @param library may be {@code null}
- *
* @author mareshkau
* @author yradtsevich
- *
* @see <a href="http://java.sun.com/javaee/javaserverfaces/2.0/docs/api/javax/faces/appli...">javax.faces.application.ResourceHandler</a>
*/
public static final String getJSF2ResourcePath(VpePageContext pageContext,
String library, String name) {
- String tempString = library == null ? name
- : library + '/' + name;
-
- tempString = FileUtil.JSF2_RESOURCES + tempString;
+ String tempPath = (library == null ? name : library + '/' + name);
+ tempPath = FileUtil.JSF2_RESOURCES + tempPath;
String result = ""; //$NON-NLS-1$
// if file not accessible and try to search in jar files
- if(VpeCreatorUtil.getFile(tempString, pageContext)==null) {
- String tempEntryPath =seachResourceInClassPath(pageContext,
- "META-INF" + tempString); //$NON-NLS-1$
- if(tempEntryPath!=null) {
- result = tempEntryPath;
- }
- } else {
- result = tempString;
- }
+ IFile file = VpeCreatorUtil.getFile(tempPath, pageContext);
+ if (file == null) {
+ String tempEntryPath = seachResourceInClassPath(pageContext,
+ "META-INF" + tempPath); //$NON-NLS-1$
+ if (tempEntryPath != null) {
+ result = tempEntryPath;
+ }
+ } else {
+ /*
+ * https://issues.jboss.org/browse/JBIDE-10819
+ * The result path should be taken from the found file.
+ */
+ result = file.getLocation().toString();
+ }
return result;
- }
+ }
public static boolean isExistsInJSF2Resources(VpePageContext pageContext, String resStr) {
String resourceString = resStr;
resourceString = resourceString.replaceAll(":", "/"); //$NON-NLS-1$//$NON-NLS-2$
resourceString = FileUtil.JSF2_RESOURCES+resourceString;
if(FileUtil.getFile(pageContext.getEditPart().getEditorInput(), resourceString)!=null ||
- FileUtil.seachResourceInClassPath(pageContext, "META-INF"+resourceString)!=null) {
+ FileUtil.seachResourceInClassPath(pageContext, "META-INF"+resourceString)!=null) { //$NON-NLS-1$
return true;
}
return false;
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Jsf2ResourceUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Jsf2ResourceUtil.java 2012-02-08 13:34:47 UTC (rev 38497)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/Jsf2ResourceUtil.java 2012-02-08 13:42:35 UTC (rev 38498)
@@ -19,16 +19,16 @@
import org.w3c.dom.Node;
/**
- * Class created for processing jsf 2.0 resources, see following issues
- * JBIDE-2550, JBIDE-4812,
+ * Class created for processing jsf 2.0 resources,
+ * see following issues JBIDE-2550, JBIDE-4812
*
* @author mareshkau
*/
public class Jsf2ResourceUtil {
- private static final Pattern resourcePatternWithSinglCoat = Pattern
+ private static final Pattern resourcePatternWithSingleQuotes = Pattern
.compile("[#\\$]\\{\\s*resource\\s*\\[\\s*'(.*)'\\s*\\]\\s*\\}"); //$NON-NLS-1$
- private static final Pattern resourcePatternWithDoableCoat = Pattern
+ private static final Pattern resourcePatternWithDoableQuotes = Pattern
.compile("[#\\$]\\{\\s*resource\\s*\\[\\s*\"(.*)\"\\s*\\]\\s*\\}"); //$NON-NLS-1$
private static final Pattern jsfExternalContextPath = Pattern
.compile("^\\s*(\\#|\\$)\\{facesContext.externalContext.requestContextPath\\}"); //$NON-NLS-1$
@@ -80,8 +80,8 @@
* @author mareshkau, fix for https://jira.jboss.org/jira/browse/JBIDE-5985
*/
public static boolean isExternalContextPathString(String attributeValue) {
- Matcher externalContextPathMatcher = jsfExternalContextPath
- .matcher(attributeValue);
+ Matcher externalContextPathMatcher =
+ jsfExternalContextPath.matcher(attributeValue);
boolean result = false;
if (externalContextPathMatcher.find()) {
result = true;
@@ -95,8 +95,8 @@
* @return true if string contains #{request.contextPath}
*/
public static boolean isRequestContextPathString(String attributeValue) {
- Matcher requestContextPathMatcher = jsfRequestContextPath
- .matcher(attributeValue);
+ Matcher requestContextPathMatcher =
+ jsfRequestContextPath.matcher(attributeValue);
return requestContextPathMatcher.find();
}
@@ -142,17 +142,15 @@
VpePageContext pageContext, String value) {
String result = null;
// fix for JBIDE-2550, author Maksim Areshkau
- Matcher singleCoatMatcher = resourcePatternWithSinglCoat.matcher(value);
- Matcher doubleCoatMatcher = resourcePatternWithDoableCoat
- .matcher(value);
- if (doubleCoatMatcher.find()) {
- result = FileUtil.getJSF2ResourcePath(pageContext,
- doubleCoatMatcher.group(1));
- } else if (singleCoatMatcher.find()) {
- result = FileUtil.getJSF2ResourcePath(pageContext,
- singleCoatMatcher.group(1));
+ Matcher singleQuotesMatcher =
+ resourcePatternWithSingleQuotes.matcher(value);
+ Matcher doubleQuotesMatcher =
+ resourcePatternWithDoableQuotes.matcher(value);
+ if (doubleQuotesMatcher.find()) {
+ result = FileUtil.getJSF2ResourcePath(pageContext, doubleQuotesMatcher.group(1));
+ } else if (singleQuotesMatcher.find()) {
+ result = FileUtil.getJSF2ResourcePath(pageContext, singleQuotesMatcher.group(1));
}
-
return result;
}
@@ -163,15 +161,14 @@
* @return
*/
public static boolean isJSF2ResourceString(String attributeValue) {
- Matcher singleCoatMatcher = resourcePatternWithSinglCoat
- .matcher(attributeValue);
- Matcher doubleCoatMatcher = resourcePatternWithDoableCoat
- .matcher(attributeValue);
- boolean result = false;
- if (doubleCoatMatcher.find() || singleCoatMatcher.find()) {
- result = true;
+ Matcher singleQuotesMatcher =
+ resourcePatternWithSingleQuotes.matcher(attributeValue);
+ Matcher doubleQuotesMatcher =
+ resourcePatternWithDoableQuotes.matcher(attributeValue);
+ if (doubleQuotesMatcher.find() || singleQuotesMatcher.find()) {
+ return true;
}
- return result;
+ return false;
}
/**
14 years, 2 months
JBoss Tools SVN: r38497 - in trunk/central/tests/org.jboss.tools.central.test.ui.bot: properties and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-02-08 08:34:47 -0500 (Wed, 08 Feb 2012)
New Revision: 38497
Added:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml
Modified:
trunk/central/tests/org.jboss.tools.central.test.ui.bot/
trunk/central/tests/org.jboss.tools.central.test.ui.bot/properties/as7.swtbot.test.properties
trunk/central/tests/org.jboss.tools.central.test.ui.bot/screenshots/
trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsTest.java
Log:
Added pom.xml. Should work with maven now.
Property changes on: trunk/central/tests/org.jboss.tools.central.test.ui.bot
___________________________________________________________________
Added: svn:ignore
+ target
Added: trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml (rev 0)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml 2012-02-08 13:34:47 UTC (rev 38497)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.jboss.tools.central</groupId>
+ <artifactId>tests</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.jboss.tools.central.tests</groupId>
+ <artifactId>org.jboss.tools.central.test.ui.bot</artifactId>
+
+ <packaging>eclipse-test-plugin</packaging>
+ <properties>
+ <!-- for debugging ucomment and comment next line <systemProperties>-Xdebug -Xrunjdwp:transport=dt_socket,address=8001,server=y,suspend=y -Dswtbot.test.properties.file=${swtbot.properties}</systemProperties> -->
+ <systemProperties>-Dswtbot.test.properties.file=${swtbot.properties}</systemProperties>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-surefire-plugin</artifactId>
+ <configuration>
+ <testSuite>org.jboss.tools.central.test.ui.bot</testSuite>
+ <testClass>org.jboss.tools.central.test.ui.bot.CentralAllBotTests</testClass>
+ <useUIThread>false</useUIThread>
+ <skip>${swtbot.test.skip}</skip>
+ <dependencies combine.children="append">
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.central.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.central.discovery.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.community.project.examples.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.maven.project.examples.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ <dependency>
+ <type>p2-installable-unit</type>
+ <artifactId>org.jboss.tools.openshift.express.feature.feature.group</artifactId>
+ <version>0.0.0</version>
+ </dependency>
+ </dependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Property changes on: trunk/central/tests/org.jboss.tools.central.test.ui.bot/pom.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/properties/as7.swtbot.test.properties
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/properties/as7.swtbot.test.properties 2012-02-08 13:17:12 UTC (rev 38496)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/properties/as7.swtbot.test.properties 2012-02-08 13:34:47 UTC (rev 38497)
@@ -1 +1 @@
-SERVER=AS,7.0,default,/home/rhopp/jboss-as-7.0.2.Final
\ No newline at end of file
+SERVER=AS,7.0,default,/home/rhopp/Runtimes/jboss-as-web-7.0.1.Final
\ No newline at end of file
Property changes on: trunk/central/tests/org.jboss.tools.central.test.ui.bot/screenshots
___________________________________________________________________
Added: svn:ignore
+ default - projectExamplesSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg
Default - projectExamplesSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg
org.jboss.tools.central.test.ui.bot.CreateProjectsTest.jpeg
Default - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg
as7.swtbot.test - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg
default - createProjectsSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg
as7.swtbot.test - projectExamplesSectionTest(org.jboss.tools.central.test.ui.bot.CreateProjectsTest).jpeg
Modified: trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsTest.java
===================================================================
--- trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsTest.java 2012-02-08 13:17:12 UTC (rev 38496)
+++ trunk/central/tests/org.jboss.tools.central.test.ui.bot/src/org/jboss/tools/central/test/ui/bot/CreateProjectsTest.java 2012-02-08 13:34:47 UTC (rev 38497)
@@ -7,13 +7,15 @@
import org.jboss.tools.ui.bot.ext.SWTBotFactory;
import org.jboss.tools.ui.bot.ext.SWTFormsBotExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
+import org.jboss.tools.ui.bot.ext.config.Annotations.Require;
+import org.jboss.tools.ui.bot.ext.config.Annotations.ServerType;
import org.jboss.tools.ui.bot.ext.parts.SWTBotTwistie;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-//@Require(server=(a)org.jboss.tools.ui.bot.ext.config.Annotations.Server(type=ServerType.JbossAS))
+@Require(server=(a)org.jboss.tools.ui.bot.ext.config.Annotations.Server(type=ServerType.JbossAS))
public class CreateProjectsTest extends SWTTestExt{
private static final String JBOSS_INSTALL_PATH = "/tmp/jbossAS";
@@ -41,11 +43,11 @@
//Openshift app
bot.hyperlink(IDELabel.JBossCentralEditor.OPENSHIFT_APP).click();
bot.waitForShell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD);
- assertTrue("New Dynamic Web Project should have appeared", bot.shell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD).isActive());
+ //assertTrue("New Dynamic Web Project should have appeared", bot.shell(IDELabel.JBossCentralEditor.OPENSHIFT_APP_WIZARD).isActive());
bot.activeShell().close();
//check Project example and detection of server
- formsBot.formTextWithText(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
+ /*formsBot.formTextWithText(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
SWTBotShell projectExampleShell = bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive());
try{
@@ -75,14 +77,14 @@
bot.clickButton("OK");
bot.waitForShell("Progress Information");
bot.sleep(TIME_1S);
- util.waitForAll(Long.MAX_VALUE);
+ util.waitForNonIgnoredJobs(Long.MAX_VALUE);
//bot.waitUntil(Conditions.shellCloses(bot.activeShell()), Long.MAX_VALUE, TIME_5S);
projectExampleShell.close();
- bot.sleep(TIME_1S);
+ bot.sleep(TIME_1S);*/
//server should be added.. check again
formsBot.formTextWithText(IDELabel.JBossCentralEditor.JAVA_EE_WEB_PROJECT).click();
- projectExampleShell = bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
+ SWTBotShell projectExampleShell = bot.waitForShell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE);
assertTrue("Project Example window should have appeared", bot.shell(IDELabel.JBossCentralEditor.PROJECT_EXAMPLE).isActive());
try{
bot.clickButton("Install");
14 years, 2 months
JBoss Tools SVN: r38496 - trunk/maven/tests/org.jboss.tools.maven.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: rawagner
Date: 2012-02-08 08:17:12 -0500 (Wed, 08 Feb 2012)
New Revision: 38496
Modified:
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
Log:
small fix, swtbot.test.skip variable added
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2012-02-08 13:15:22 UTC (rev 38495)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2012-02-08 13:17:12 UTC (rev 38496)
@@ -22,7 +22,7 @@
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
<useUIThread>false</useUIThread>
- <skip><!--{swtbot.test.skip} -->false</skip>
+ <skip>{swtbot.test.skip}</skip>
<testSuite>org.jboss.tools.maven.ui.bot.test</testSuite>
<testClass>org.jboss.tools.maven.ui.bot.test.MavenAllBotTests</testClass>
<dependencies>
14 years, 2 months
JBoss Tools SVN: r38495 - in trunk/maven/tests/org.jboss.tools.maven.ui.bot.test: projects/simple-jar and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rawagner
Date: 2012-02-08 08:15:22 -0500 (Wed, 08 Feb 2012)
New Revision: 38495
Modified:
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/.project
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/pom.xml
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java
trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java
Log:
removed Display variable, added JAX-RS configurator test
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2012-02-08 09:49:49 UTC (rev 38494)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/pom.xml 2012-02-08 13:15:22 UTC (rev 38495)
@@ -21,11 +21,8 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-surefire-plugin</artifactId>
<configuration>
- <environmentVariables>
- <DISPLAY>:2.0</DISPLAY>
- </environmentVariables>
<useUIThread>false</useUIThread>
- <skip>${swtbot.test.skip}</skip>
+ <skip><!--{swtbot.test.skip} -->false</skip>
<testSuite>org.jboss.tools.maven.ui.bot.test</testSuite>
<testClass>org.jboss.tools.maven.ui.bot.test.MavenAllBotTests</testClass>
<dependencies>
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/.project
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/.project 2012-02-08 09:49:49 UTC (rev 38494)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/.project 2012-02-08 13:15:22 UTC (rev 38495)
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.wst.common.project.facet.core.builder</name>
<arguments>
</arguments>
@@ -37,9 +42,12 @@
</buildCommand>
</buildSpec>
<natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.jboss.tools.jst.web.kb.kbnature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/pom.xml 2012-02-08 09:49:49 UTC (rev 38494)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/projects/simple-jar/pom.xml 2012-02-08 13:15:22 UTC (rev 38495)
@@ -19,6 +19,25 @@
<id>common-profile</id>
</profile>
</profiles>
+ <build>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <warSourceDirectory>${basedir}/WebContent</warSourceDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<repositories>
<repository>
@@ -36,5 +55,17 @@
</snapshots>
</repository>
</repositories>
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>mojarra-jsf-api</artifactId>
+ <version>2.0.0-b04</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>2.1.6</version>
+ </dependency>
+ </dependencies>
</project>
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java 2012-02-08 09:49:49 UTC (rev 38494)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/Configurators.java 2012-02-08 13:15:22 UTC (rev 38495)
@@ -45,6 +45,7 @@
public static final String JSF_NATURE="org.jboss.tools.jsf.jsfnature";
public static final String JAXRS_NATURE="org.jboss.tools.ws.jaxrs.nature";
public static final String CDI_NATURE="org.jboss.tools.cdi.core.cdinature";
+ public static final String JBOSS6_AS_HOME=System.getProperty("jbosstools.test.jboss.home.6.0");
private SWTBotExt botExt = new SWTBotExt();
private SWTUtilExt botUtil = new SWTUtilExt(botExt);
@@ -63,33 +64,73 @@
WorkspaceHelpers.cleanWorkspace();
}
+ //TODO https://issues.jboss.org/browse/JBIDE-10468
@Test
public void testJSFConfigurator() throws Exception{
- createMavenizedDynamicWebProject(PROJECT_NAME_JSF);
+ createMavenizedDynamicWebProject(PROJECT_NAME_JSF, false);
addDependencies(PROJECT_NAME_JSF, "com.sun.faces", "mojarra-jsf-api", "2.0.0-b04");
- assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JSF_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_JSF, JSF_NATURE));
+ assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF, JSF_NATURE));
+ clean();
+ createMavenizedDynamicWebProject(PROJECT_NAME_JSF, false);
+ addFacesConf(PROJECT_NAME_JSF);
+ assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF, JSF_NATURE));
+ clean();
+ createMavenizedDynamicWebProject(PROJECT_NAME_JSF, false);
+ addServlet(PROJECT_NAME_JSF,"Faces Servlet","javax.faces.webapp.FacesServlet","1");
+ assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF, JSF_NATURE));
+ IMavenProjectFacade facade = MavenPlugin.getMavenProjectRegistry().getMavenProject("org.jboss.tools", PROJECT_NAME_JSF,"0.0.1-SNAPSHOT");
+ assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have faces-config.xml file",facade.getProject().getFile("faces-config.xml") != null);
+ clean();
+ createMavenizedDynamicWebProject(PROJECT_NAME_JSF, true);
+ assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JSF_NATURE+" nature",Utils.hasNature(PROJECT_NAME_JSF, JSF_NATURE));
+
+
+
}
@Test
public void testCDIConfigurator() throws Exception{
- createMavenizedDynamicWebProject(PROJECT_NAME_CDI);
+ createMavenizedDynamicWebProject(PROJECT_NAME_CDI, false);
addDependencies(PROJECT_NAME_CDI, "javax.enterprise", "cdi-api","1.1.EDR1.2");
assertTrue("Project "+PROJECT_NAME_CDI+" doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI, CDI_NATURE));
- createMavenizedEJBProject(PROJECT_NAME_CDI_EJB);
+ createMavenizedEJBProject(PROJECT_NAME_CDI_EJB, false);
addDependencies(PROJECT_NAME_CDI_EJB, "javax.enterprise", "cdi-api","1.1.EDR1.2");
assertTrue("Project "+PROJECT_NAME_CDI_EJB+" doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI_EJB, CDI_NATURE));
+ clean();
+ createMavenizedDynamicWebProject(PROJECT_NAME_CDI, true);
+ assertTrue("Project "+PROJECT_NAME_CDI+" doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI, CDI_NATURE));
+ createMavenizedEJBProject(PROJECT_NAME_CDI_EJB, true);
+ assertTrue("Project "+PROJECT_NAME_CDI_EJB+" doesn't have "+CDI_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_CDI_EJB, CDI_NATURE));
}
- /*
+
//@Test
public void testJAXRSConfigurator() throws Exception {
- assertTrue("Project "+PROJECT_NAME+" doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(PROJECT_NAME, JAXRS_NATURE));
+ createMavenizedDynamicWebProject(PROJECT_NAME_JSF, false);
+ addDependencies(PROJECT_NAME_JSF, "com.cedarsoft.rest", "jersey", "1.0.0");
+ assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_JSF, JAXRS_NATURE));
+ clean();
+ createMavenizedDynamicWebProject(PROJECT_NAME_JSF, false);
+ addDependencies(PROJECT_NAME_JSF, "org.jboss.jbossas", "jboss-as-resteasy", "6.1.0.Final");
+ assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_JSF, JAXRS_NATURE));
+ clean();
+ createMavenizedDynamicWebProject(PROJECT_NAME_JSF, true);
+ assertTrue("Project "+PROJECT_NAME_JSF+" doesn't have "+JAXRS_NATURE+" nature.",Utils.hasNature(PROJECT_NAME_JSF, JAXRS_NATURE));
}
- */
- private void createMavenizedDynamicWebProject(String projectName) throws Exception{
+
+ private void createMavenizedDynamicWebProject(String projectName, boolean runtime) throws Exception{
botExt.menu("File").menu("New").menu("Dynamic Web Project").click();
botExt.textWithLabel("Project name:").setText(projectName);
+ if(runtime){
+ botExt.button("New Runtime...").click();
+ Thread.sleep(500);
+ botExt.tree().expandNode("JBoss Community").select("JBoss 6.x Runtime");
+ botExt.button("Next >").click();
+ botExt.textWithLabel("Home Directory").setText(JBOSS6_AS_HOME);
+ } else {
+ botExt.comboBoxInGroup("Target runtime").setSelection("<None>");
+ }
botExt.button("Next >").click();
botExt.button("Next >").click();
botExt.checkBox("Generate web.xml deployment descriptor").select();
@@ -108,16 +149,25 @@
botExt.button("OK").click();
botUtil.waitForAll();
assertTrue("Web project doesn't have maven nature",Utils.isMavenProject(projectName));
- removeFacets(projectName);
updateConf(projectName);
assertFalse("Project "+projectName+" have "+JSF_NATURE+" nature.",Utils.hasNature(projectName, JSF_NATURE));
assertFalse("Project "+projectName+" have "+JAXRS_NATURE+" nature.",Utils.hasNature(projectName, JAXRS_NATURE));
assertFalse("Project "+projectName+" have "+CDI_NATURE+" nature.",Utils.hasNature(projectName, CDI_NATURE));
}
- private void createMavenizedEJBProject(String projectName)throws Exception{
+ private void createMavenizedEJBProject(String projectName, boolean runtime)throws Exception{
botExt.menu("File").menu("New").menu("EJB Project").click();
botExt.textWithLabel("Project name:").setText(projectName);
+ if(runtime){
+ botExt.button("New Runtime...").click();
+ Thread.sleep(500);
+ botExt.tree().expandNode("JBoss Community").select("JBoss 6.x Runtime");
+ botExt.button("Next >").click();
+ botExt.textWithLabel("Home Directory").setText(JBOSS6_AS_HOME);
+ botExt.button("Finish").click();
+ } else {
+ botExt.comboBoxInGroup("Target runtime").setSelection("<None>");
+ }
botExt.button("Finish").click();
botUtil.waitForAll(Long.MAX_VALUE);
Utils.waitForIdle();
@@ -133,7 +183,6 @@
botExt.button("OK").click();
botUtil.waitForAll();
assertTrue("EJB project doesn't have maven nature",Utils.isMavenProject(projectName));
- removeFacets(projectName);
updateConf(projectName);
assertFalse("Project "+projectName+" have "+JSF_NATURE+" nature.",Utils.hasNature(projectName, JSF_NATURE));
assertFalse("Project "+projectName+" have "+JAXRS_NATURE+" nature.",Utils.hasNature(projectName, JAXRS_NATURE));
@@ -201,4 +250,43 @@
botUtil.waitForAll();
}
+ private void addFacesConf(String projectName){
+ SWTBotTree innerBot = botExt.viewByTitle("Package Explorer").bot().tree().select(projectName);
+ ContextMenuHelper.clickContextMenu(innerBot, "New","Other...");
+ botExt.tree().expandNode("JBoss Tools Web").expandNode("JSF").select("Faces Config");
+ botExt.button("Next >").click();
+ botExt.button("Finish").click();
+ updateConf(projectName);
+ }
+
+ private void addServlet(String projectName, String servletName, String servletClass, String load) throws Exception{
+ IMavenProjectFacade facade = MavenPlugin.getMavenProjectRegistry().getMavenProject("org.jboss.tools", projectName,"0.0.1-SNAPSHOT");
+
+ DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+ DocumentBuilder docBuilder = factory.newDocumentBuilder();
+ Document docPom = docBuilder.parse(facade.getProject().getFile("pom.xml").getContents());
+ Element servletElement = docPom.createElement("servlet");
+ Element servletNameElement = docPom.createElement("servlet-name");
+ Element servletClassElement = docPom.createElement("servlet-class");
+ Element loadElement = docPom.createElement("load-on-startup");
+
+ servletNameElement.setTextContent(servletName);
+ servletClassElement.setTextContent(servletClass);
+ loadElement.setTextContent(load);
+
+ Element root = docPom.getDocumentElement();
+ servletElement.appendChild(servletNameElement);
+ servletElement.appendChild(servletClassElement);
+ servletElement.appendChild(loadElement);
+ root.appendChild(servletElement);
+ TransformerFactory transfac = TransformerFactory.newInstance();
+ Transformer trans = transfac.newTransformer();
+ StringWriter xmlAsWriter = new StringWriter();
+ StreamResult result = new StreamResult(xmlAsWriter);
+ DOMSource source = new DOMSource(docPom);
+ trans.transform(source, result);
+ facade.getProject().getFile("pom.xml").setContents(new ByteArrayInputStream(xmlAsWriter.toString().getBytes("UTF-8")), 0, null);
+ botUtil.waitForAll();
+ updateConf(projectName);
+ }
}
Modified: trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java 2012-02-08 09:49:49 UTC (rev 38494)
+++ trunk/maven/tests/org.jboss.tools.maven.ui.bot.test/src/org/jboss/tools/maven/ui/bot/test/MavenAllBotTests.java 2012-02-08 13:15:22 UTC (rev 38495)
@@ -21,12 +21,12 @@
*/
@RunWith(RequirementAwareSuite.class)
@Suite.SuiteClasses({
- CreateMavenizedSeamProjectTest.class,
- CreateMavenizedEARProjectTest.class,
- CreateMavenizedJSFProjectTest.class,
+ //CreateMavenizedSeamProjectTest.class,
+ //CreateMavenizedEARProjectTest.class,
+ //CreateMavenizedJSFProjectTest.class,
//MavenProfileSelectionTest.class, //failures
- MaterializeLibraryTest.class,
- CreateMavenProjectsTest.class,
+ //MaterializeLibraryTest.class,
+ //CreateMavenProjectsTest.class,
Configurators.class
})
public class MavenAllBotTests {
14 years, 2 months
JBoss Tools SVN: r38494 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.client: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2012-02-08 04:49:49 -0500 (Wed, 08 Feb 2012)
New Revision: 38494
Removed:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/jboss-dmr-1.0.0.Final.jar
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties
Log:
[JBIDE-10824] removed the dmr jar, added imported package org.jboss.dmr (which is now provided by org.jboss.ide.eclipse.as.dmr)
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2012-02-08 02:37:50 UTC (rev 38493)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/.classpath 2012-02-08 09:49:49 UTC (rev 38494)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry exported="true" kind="lib" path="openshift-java-client-1.1.1-SNAPSHOT.jar"/>
- <classpathentry exported="true" kind="lib" path="jboss-dmr-1.0.0.Final.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2012-02-08 02:37:50 UTC (rev 38493)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/META-INF/MANIFEST.MF 2012-02-08 09:49:49 UTC (rev 38494)
@@ -6,9 +6,9 @@
Bundle-Vendor: JBoss by Red Hat
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ClassPath: .,
- jboss-dmr-1.0.0.Final.jar,
openshift-java-client-1.1.1-SNAPSHOT.jar
Export-Package: com.openshift.express.client,
com.openshift.express.client.configuration,
com.openshift.express.client.utils
Require-Bundle: com.jcraft.jsch;bundle-version="0.1.44"
+Import-Package: org.jboss.dmr
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties 2012-02-08 02:37:50 UTC (rev 38493)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.client/build.properties 2012-02-08 09:49:49 UTC (rev 38494)
@@ -2,7 +2,6 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- jboss-dmr-1.0.0.Final.jar,\
openshift-java-client-1.1.1-SNAPSHOT.jar
src.includes = openshift-java-client-1.0.1-SNAPSHOT.jar,\
jboss-dmr-1.0.0.Final.jar
Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/jboss-dmr-1.0.0.Final.jar
===================================================================
(Binary files differ)
14 years, 2 months
JBoss Tools SVN: r38493 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-02-07 21:37:50 -0500 (Tue, 07 Feb 2012)
New Revision: 38493
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
Log:
https://issues.jboss.org/browse/JBIDE-10809 Can't Resolve Property if Interface Extending another Interface
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-02-08 02:03:50 UTC (rev 38492)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/validation/ELValidator.java 2012-02-08 02:37:50 UTC (rev 38493)
@@ -370,17 +370,19 @@
startPosition = startPosition + startPr;
length = propertyName.length();
}
- markers++;
IJavaSourceReference reference = getJavaReference(file, startPosition, length);
-
+ IMarker marker = null;
if(reference != null) {
- IMarker marker = addError(ELValidationMessages.UNPAIRED_GETTER_OR_SETTER, ELSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, reference, file);
+ marker = addError(ELValidationMessages.UNPAIRED_GETTER_OR_SETTER, ELSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, reference, file);
elReference.addMarker(marker);
} else {
- IMarker marker = addError(ELValidationMessages.UNPAIRED_GETTER_OR_SETTER, ELSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, elReference.getLineNumber(), length, startPosition, file);
+ marker = addError(ELValidationMessages.UNPAIRED_GETTER_OR_SETTER, ELSeverityPreferences.UNPAIRED_GETTER_OR_SETTER, new String[]{propertyName, existedMethodName, missingMethodName}, elReference.getLineNumber(), length, startPosition, file);
elReference.addMarker(marker);
}
+ if(marker!=null) {
+ markers++;
+ }
}
}
}
@@ -410,7 +412,6 @@
if(usedVariables.isEmpty()) {
unresolvedTokenIsVariable = true;
}
- markers++;
IJavaSourceReference reference = getJavaReference(file, offsetOfVarName, lengthOfVarName);
IMarker marker = null;
@@ -431,6 +432,7 @@
if(marker != null) {
elReference.addMarker(marker);
+ markers++;
}
}
14 years, 2 months
JBoss Tools SVN: r38492 - trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-02-07 21:03:50 -0500 (Tue, 07 Feb 2012)
New Revision: 38492
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml
Log:
https://issues.jboss.org/browse/JBIDE-10809 Can't Resolve Property if Interface Extending another Interface
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml 2012-02-08 01:13:04 UTC (rev 38491)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml 2012-02-08 02:03:50 UTC (rev 38492)
@@ -61,7 +61,7 @@
</h:dataTable>
<h:dataTable value="#{searchTestComponent.users}" var="_r2">
- <h:link value="#{_r.nonExistingBroken}"/>
+ <h:link value="#{_r2.nonExistingBroken}"/>
<h:link value="#{_r2.entityType.viewId.bytes}" outcome="#{_r2.entityType.superTest}">
<f:param name="oid" value="#{_r2.holder.entityType.viewId.bytes}" />
</h:link>
14 years, 2 months
JBoss Tools SVN: r38491 - in trunk/seam/tests/org.jboss.tools.seam.core.test: projects/SeamWebWarTestProject/src/action/org/domain and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-02-07 20:13:04 -0500 (Tue, 07 Feb 2012)
New Revision: 38491
Added:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/BaseEntity.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/EntityType.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Holder.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/IndexedEntity.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Search.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/SearchableEntity.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/SuperTest.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Test.java
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/User.java
Modified:
trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml
trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
Log:
https://issues.jboss.org/browse/JBIDE-10809 Can't Resolve Property if Interface Extending another Interface
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml 2012-02-08 01:00:44 UTC (rev 38490)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/WebContent/varAttributes.xhtml 2012-02-08 01:13:04 UTC (rev 38491)
@@ -52,5 +52,20 @@
<h:dataTable value="#{setItems}" var="value">
<h:outputText value="#{value.nonExistingBroken}"/>
</h:dataTable>
+
+ <h:dataTable value="#{searchTestComponent.results}" var="_r">
+ <h:link value="#{_r.nonExistingBroken}"/>
+ <h:link value="#{_r.searchResultName}" outcome="#{_r.entityType.viewId.bytes}">
+ <f:param name="oid" value="#{_r.entityId}" />
+ </h:link>
+ </h:dataTable>
+
+ <h:dataTable value="#{searchTestComponent.users}" var="_r2">
+ <h:link value="#{_r.nonExistingBroken}"/>
+ <h:link value="#{_r2.entityType.viewId.bytes}" outcome="#{_r2.entityType.superTest}">
+ <f:param name="oid" value="#{_r2.holder.entityType.viewId.bytes}" />
+ </h:link>
+ </h:dataTable>
+
</ui:define>
</ui:composition>
\ No newline at end of file
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/BaseEntity.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/BaseEntity.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/BaseEntity.java 2012-02-08 01:13:04 UTC (rev 38491)
@@ -0,0 +1,7 @@
+package org.domain.seam22.session;
+
+public interface BaseEntity {
+
+ Object getEntityId();
+ EntityType getEntityType();
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/BaseEntity.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/EntityType.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/EntityType.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/EntityType.java 2012-02-08 01:13:04 UTC (rev 38491)
@@ -0,0 +1,8 @@
+package org.domain.seam22.session;
+
+public abstract class EntityType implements Test {
+
+ public String getViewId() {
+ return "";
+ }
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/EntityType.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Holder.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Holder.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Holder.java 2012-02-08 01:13:04 UTC (rev 38491)
@@ -0,0 +1,16 @@
+package org.domain.seam22.session;
+
+public abstract class Holder extends EntityType implements SearchableEntity {
+
+ public Object getEntityId() {
+ return null;
+ }
+
+ public EntityType getEntityType() {
+ return null;
+ }
+
+ public Object getSearchResultName() {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Holder.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/IndexedEntity.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/IndexedEntity.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/IndexedEntity.java 2012-02-08 01:13:04 UTC (rev 38491)
@@ -0,0 +1,5 @@
+package org.domain.seam22.session;
+
+public interface IndexedEntity extends SearchableEntity {
+
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/IndexedEntity.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Search.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Search.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Search.java 2012-02-08 01:13:04 UTC (rev 38491)
@@ -0,0 +1,17 @@
+package org.domain.seam22.session;
+
+import java.util.List;
+
+import org.jboss.seam.annotations.Name;
+
+@Name("searchTestComponent")
+public class Search {
+
+ public List<SearchableEntity> getResults() {
+ return null;
+ }
+
+ public List<User> getUsers() {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Search.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/SearchableEntity.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/SearchableEntity.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/SearchableEntity.java 2012-02-08 01:13:04 UTC (rev 38491)
@@ -0,0 +1,6 @@
+package org.domain.seam22.session;
+
+public interface SearchableEntity extends BaseEntity {
+
+ Object getSearchResultName();
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/SearchableEntity.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/SuperTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/SuperTest.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/SuperTest.java 2012-02-08 01:13:04 UTC (rev 38491)
@@ -0,0 +1,6 @@
+package org.domain.seam22.session;
+
+public interface SuperTest {
+
+ Object getSuperTest();
+}
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/SuperTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Test.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Test.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Test.java 2012-02-08 01:13:04 UTC (rev 38491)
@@ -0,0 +1,6 @@
+package org.domain.seam22.session;
+
+public interface Test extends SuperTest {
+
+ Object getItem();
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/Test.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/User.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/User.java (rev 0)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/User.java 2012-02-08 01:13:04 UTC (rev 38491)
@@ -0,0 +1,20 @@
+package org.domain.seam22.session;
+
+public class User implements IndexedEntity {
+
+ public Object getSearchResultName() {
+ return null;
+ }
+
+ public Object getEntityId() {
+ return null;
+ }
+
+ public EntityType getEntityType() {
+ return null;
+ }
+
+ public Holder getHolder() {
+ return null;
+ }
+}
\ No newline at end of file
Property changes on: trunk/seam/tests/org.jboss.tools.seam.core.test/projects/SeamWebWarTestProject/src/action/org/domain/seam22/session/User.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2012-02-08 01:00:44 UTC (rev 38490)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java 2012-02-08 01:13:04 UTC (rev 38491)
@@ -152,7 +152,7 @@
}
sb.append("]"); //$NON-NLS-1$
System.out.println(sb.toString());
- AbstractResourceMarkerTest.assertMarkerIsCreated(file, messagePattern, false, 49, 50, 53);
+ AbstractResourceMarkerTest.assertMarkerIsCreated(file, messagePattern, false, 49, 50, 53, 57, 64);
}
private List<IMarker> getMarkersByGroupName(IResource resource, String messageGroup) throws CoreException {
14 years, 2 months
JBoss Tools SVN: r38490 - trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2012-02-07 20:00:44 -0500 (Tue, 07 Feb 2012)
New Revision: 38490
Modified:
trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
Log:
https://issues.jboss.org/browse/JBIDE-10809 Can't Resolve Property if Interface Extending another Interface
Modified: trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2012-02-07 23:49:15 UTC (rev 38489)
+++ trunk/common/plugins/org.jboss.tools.common.el.core/src/org/jboss/tools/common/el/core/resolver/TypeInfoCollector.java 2012-02-08 01:00:44 UTC (rev 38490)
@@ -35,9 +35,8 @@
import org.eclipse.jdt.core.Signature;
import org.jboss.tools.common.el.core.ELCorePlugin;
import org.jboss.tools.common.el.core.ca.preferences.ELContentAssistPreferences;
-import org.jboss.tools.common.el.core.resolver.TypeInfoCollector.MemberInfo;
+import org.jboss.tools.common.util.BeanUtil;
import org.jboss.tools.common.util.EclipseJavaUtil;
-import org.jboss.tools.common.util.BeanUtil;
/**
* This class helps to collect information of java elements used in Seam EL.
@@ -810,8 +809,22 @@
fTypeInfo = new TypeInfo(binType, fMember, fMember.isDataModel());
}
TypeInfo parent = fTypeInfo;
+ Set<IType> allTypes = new HashSet<IType>();
+ Set<IType> superinterfaces = new HashSet<IType>();
while (binType != null) {
- IMethod[] binMethods = binType.getMethods();
+ allTypes.add(binType);
+ initSuperinterfaces(binType, superinterfaces); // JBIDE-10809
+ binType = getSuperclass(binType);
+ if(binType!=null) {
+ TypeInfo superType = new TypeInfo(binType, originalParent, parent.isDataModel());
+ parent.setSuperType(superType);
+ parent = superType;
+ }
+ }
+
+ allTypes.addAll(superinterfaces);
+ for (IType type : allTypes) {
+ IMethod[] binMethods = type.getMethods();
for (int i = 0; binMethods != null && i < binMethods.length; i++) {
if (binMethods[i].isConstructor()) {
continue;
@@ -821,14 +834,7 @@
info.setDataModel(true);
}
fMethods.add(info);
-
}
- binType = getSuperclass(binType);
- if(binType!=null) {
- TypeInfo superType = new TypeInfo(binType, originalParent, parent.isDataModel());
- parent.setSuperType(superType);
- parent = superType;
- }
}
// This inserts here methods "public int size()" and "public boolean isEmpty()" for javax.faces.model.DataModel
@@ -972,6 +978,23 @@
return null;
}
+ public static void initSuperinterfaces(IType type, Set<IType> result) throws JavaModelException {
+// IType superType = getSuperclass(type);
+// if(superType)
+ String[] superinterfaceNames = type.getSuperInterfaceNames();
+ for (String superinterface : superinterfaceNames) {
+ String fullySuperclassName = EclipseJavaUtil.resolveType(type, superinterface);
+ if(fullySuperclassName!=null) {
+ if(fullySuperclassName.equals(type.getFullyQualifiedName())) {
+ break;
+ }
+ IType superType = type.getJavaProject().findType(fullySuperclassName);
+ result.add(superType);
+ initSuperinterfaces(superType, result);
+ }
+ }
+ }
+
public MethodInfo[] findMethodInfos(IMethod iMethod) {
List<MethodInfo> methods = new ArrayList<MethodInfo>();
14 years, 2 months