JBoss Tools SVN: r24557 - trunk/jsf/features/org.jboss.tools.richfaces.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2010-08-30 16:01:30 -0400 (Mon, 30 Aug 2010)
New Revision: 24557
Modified:
trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
Log:
https://jira.jboss.org/browse/JBIDE-6711 VPE Support for Spring
spring templates included in reachfaces feature
Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
===================================================================
--- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2010-08-30 19:51:06 UTC (rev 24556)
+++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2010-08-30 20:01:30 UTC (rev 24557)
@@ -330,4 +330,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.jboss.tools.vpe.spring"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
13 years, 7 months
JBoss Tools SVN: r24556 - branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-08-30 15:51:06 -0400 (Mon, 30 Aug 2010)
New Revision: 24556
Modified:
branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java
branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeStartup.java
Log:
https://jira.jboss.org/browse/JBIDE-6936 Runtime detection - invalid runtimes / servers created
Modified: branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java
===================================================================
--- branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java 2010-08-30 19:44:52 UTC (rev 24555)
+++ branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java 2010-08-30 19:51:06 UTC (rev 24556)
@@ -82,6 +82,7 @@
droolsFound = true;
}
}
+ boolean jbpmFound = false;
if (!droolsFound) {
boolean isJBPM = isValidJbpmInstallation(root.getAbsolutePath());
if (isJBPM) {
@@ -92,10 +93,14 @@
version = JBPM4;
}
serverDefinitions.add(new ServerDefinition(root.getName(), version, JBossRuntimeStartup.JBPM, root.getAbsoluteFile()));
+ jbpmFound = true;
}
}
+ if (!droolsFound && !jbpmFound) {
+ children = root.listFiles();
+ }
}
- children = root.listFiles();
+
}
} else {
children = File.listRoots();
Modified: branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeStartup.java
===================================================================
--- branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeStartup.java 2010-08-30 19:44:52 UTC (rev 24555)
+++ branches/jbosstools-3.2.0.M2/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeStartup.java 2010-08-30 19:51:06 UTC (rev 24556)
@@ -93,6 +93,8 @@
public static final String SEAM = "SEAM"; // NON-NLS-1$
public static final String DROOLS = "DROOLS"; // NON-NLS-1$
+
+ private static final String AS = "AS"; //$NON-NLS-1$
public static final String JBOSS_EAP_HOME = "../../../../jboss-eap/jboss-as"; // JBoss AS home directory (relative to plugin)- <RHDS_HOME>/jbossas. //$NON-NLS-1$
@@ -312,12 +314,15 @@
// then process seam runtimes from bundled servers
for(ServerDefinition serverDefinition:serverDefinitions) {
String type = serverDefinition.getType();
- if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type) || EWP.equals(type)) {
+ if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type) || EWP.equals(type) ) {
for (String folder : SEAM_HOME_FOLDER_OPTIONS) {
File seamFile = new File(serverDefinition.getLocation(),folder); //$NON-NLS-1$
addSeam(map, serverDefinition, seamFile);
}
}
+ if (SEAM.equals(type)) {
+ addSeam(map, serverDefinition, serverDefinition.getLocation());
+ }
}
// Initialize Seam Runtime from JBoss EAP
@@ -459,7 +464,7 @@
int index = getJBossASVersion(asLocation);
createJBossServer(asLocation,index,name, runtimeName);
}
- } else {
+ } else if (AS.equals(type)){
String version = serverDefinition.getVersion();
int index = 2;
if ("3.2".equals(version)) { //$NON-NLS-1$
13 years, 7 months
JBoss Tools SVN: r24555 - trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-08-30 15:44:52 -0400 (Mon, 30 Aug 2010)
New Revision: 24555
Modified:
trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java
trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeStartup.java
Log:
https://jira.jboss.org/browse/JBIDE-6936 Runtime detection - invalid runtimes / servers created
Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java 2010-08-30 18:28:12 UTC (rev 24554)
+++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeLocator.java 2010-08-30 19:44:52 UTC (rev 24555)
@@ -82,6 +82,7 @@
droolsFound = true;
}
}
+ boolean jbpmFound = false;
if (!droolsFound) {
boolean isJBPM = isValidJbpmInstallation(root.getAbsolutePath());
if (isJBPM) {
@@ -92,10 +93,14 @@
version = JBPM4;
}
serverDefinitions.add(new ServerDefinition(root.getName(), version, JBossRuntimeStartup.JBPM, root.getAbsoluteFile()));
+ jbpmFound = true;
}
}
+ if (!droolsFound && !jbpmFound) {
+ children = root.listFiles();
+ }
}
- children = root.listFiles();
+
}
} else {
children = File.listRoots();
Modified: trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeStartup.java
===================================================================
--- trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeStartup.java 2010-08-30 18:28:12 UTC (rev 24554)
+++ trunk/runtime/plugins/org.jboss.tools.runtime/src/org/jboss/tools/runtime/JBossRuntimeStartup.java 2010-08-30 19:44:52 UTC (rev 24555)
@@ -93,6 +93,8 @@
public static final String SEAM = "SEAM"; // NON-NLS-1$
public static final String DROOLS = "DROOLS"; // NON-NLS-1$
+
+ private static final String AS = "AS"; //$NON-NLS-1$
public static final String JBOSS_EAP_HOME = "../../../../jboss-eap/jboss-as"; // JBoss AS home directory (relative to plugin)- <RHDS_HOME>/jbossas. //$NON-NLS-1$
@@ -312,12 +314,15 @@
// then process seam runtimes from bundled servers
for(ServerDefinition serverDefinition:serverDefinitions) {
String type = serverDefinition.getType();
- if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type) || EWP.equals(type)) {
+ if (SOA_P.equals(type) || EAP.equals(type) || EPP.equals(type) || EWP.equals(type) ) {
for (String folder : SEAM_HOME_FOLDER_OPTIONS) {
File seamFile = new File(serverDefinition.getLocation(),folder); //$NON-NLS-1$
addSeam(map, serverDefinition, seamFile);
}
}
+ if (SEAM.equals(type)) {
+ addSeam(map, serverDefinition, serverDefinition.getLocation());
+ }
}
// Initialize Seam Runtime from JBoss EAP
@@ -459,7 +464,7 @@
int index = getJBossASVersion(asLocation);
createJBossServer(asLocation,index,name, runtimeName);
}
- } else {
+ } else if (AS.equals(type)){
String version = serverDefinition.getVersion();
int index = 2;
if ("3.2".equals(version)) { //$NON-NLS-1$
13 years, 7 months
JBoss Tools SVN: r24554 - in trunk/documentation/whatsnew/jbpm: images and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2010-08-30 14:28:12 -0400 (Mon, 30 Aug 2010)
New Revision: 24554
Added:
trunk/documentation/whatsnew/jbpm/.project
trunk/documentation/whatsnew/jbpm/images/jBPM-jPDL3-perspective.png
trunk/documentation/whatsnew/jbpm/images/jPDL3-project-new-layout.png
trunk/documentation/whatsnew/jbpm/images/move-process-refactoring.png
trunk/documentation/whatsnew/jbpm/images/rename-process-refactoring.png
Modified:
trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html
Log:
Added: trunk/documentation/whatsnew/jbpm/.project
===================================================================
--- trunk/documentation/whatsnew/jbpm/.project (rev 0)
+++ trunk/documentation/whatsnew/jbpm/.project 2010-08-30 18:28:12 UTC (rev 24554)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jbpm-new-and-noteworthy</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Property changes on: trunk/documentation/whatsnew/jbpm/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/documentation/whatsnew/jbpm/images/jBPM-jPDL3-perspective.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/jBPM-jPDL3-perspective.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/jbpm/images/jPDL3-project-new-layout.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/jPDL3-project-new-layout.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/jbpm/images/move-process-refactoring.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/move-process-refactoring.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/documentation/whatsnew/jbpm/images/rename-process-refactoring.png
===================================================================
(Binary files differ)
Property changes on: trunk/documentation/whatsnew/jbpm/images/rename-process-refactoring.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html
===================================================================
--- trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html 2010-08-30 16:58:01 UTC (rev 24553)
+++ trunk/documentation/whatsnew/jbpm/jbpm-news-3.2.0.M2.html 2010-08-30 18:28:12 UTC (rev 24554)
@@ -19,18 +19,52 @@
<tr>
<td colspan="2">
<hr/>
- <h3>jbpm 4</h3>
+ <h3>jbpm 3.x</h3>
<hr/>
</td>
</tr>
<tr>
- <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>New jbpm4 plugin</b></td>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Process Rename Refactoring</b></td>
<td valign="top">
- <p>The newly released jbpm4 plugin that supports jbpm4 with a better jPDL editor with BPMN based graphics is included in this release.</p>
- <p>It can coexist with the jbpm3 plugin but some actions/wizards will overlap but that will be merged before the final release</p>
+ <p>The default Resource Rename Refactoring was adapted for processes. Bringing up and completing the Rename Refactoring Wizard
+ in the Process Explorer View or in the Navigator View results in not only the file 'process.jpdl.xml' to be changed but also the file '.process.gpd.xml' which contains the graphical
+ information. In this way the implicit reference is harder to break. This is illustrated in the screenshot below.</p>
+ <p><img src="images/rename-process-refactoring.png"/></p>
</td>
</tr>
<tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Process Move Refactoring</b></td>
+ <td valign="top">
+ <p>Similar to the Rename Refactoring the default Resource Move Refactoring was adapted for processes. Again, not only the
+ file 'process.jpdl.xml' is moved to the new location when bringing up and completing the Move Refactoring Wizard in the
+ Process Explorer View or in the Navigator View. The file '.process.jpdl.xml' containing the graphical information will also be moved to this new location.
+ This is illustrated in the screenshot below.</p>
+ <p><img src="images/move-process-refactoring.png"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>jBPM jPDL3 Perspective</b></td>
+ <td valign="top">
+ <p>As I indicated the two aforementioned refactorings are available when they are started from the Project Explorer View or
+ from the Navigator view. Unfortunately they do not yet work in the Package Explorer. Because of this fact we made the
+ Project Explorer View the default view instead of the Package Explorer when opening the jBPM jPDL3 Perspective. This is
+ illustrated in the screenshot below. </p>
+ <p><img src="images/jBPM-jPDL3-perspective.png"/></p>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" align="right"><a name="itemname3" id="itemname3"></a><b>Process Project Layout</b></td>
+ <td valign="top">
+ <p>There has been a minor change in the layout of new process projects. The sample process is still created in the folder
+ 'src/main/jpdl' but not anymore in a subfolder called 'simple'. Instead the process file ('simple.jpdl.xml') the (invisible)
+ graphical information file ('.simple.jpdl.xml') and the image file ('simple.jpg') are now created immediately in the root of
+ 'src/main/jpdl'. This is because multiple processes can now coexist in the same folder and it is not needed anymore to host them
+ in their own subfolders. This is illustrated in the image below.
+ </p>
+ <p><img src="images/jPDL3-project-new-layout.png"/></p>
+ </td>
+ </tr>
+ <tr>
<td colspan="2">
<hr/>
</td>
13 years, 7 months
JBoss Tools SVN: r24553 - trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-08-30 12:58:01 -0400 (Mon, 30 Aug 2010)
New Revision: 24553
Modified:
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java
Log:
Fixed NPE in Seam OpenOns.
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2010-08-30 15:10:37 UTC (rev 24552)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamComponentHyperlinkDetector.java 2010-08-30 16:58:01 UTC (rev 24553)
@@ -111,7 +111,7 @@
IAnnotatable annotatable = (IAnnotatable)element;
IAnnotation annotation = annotatable.getAnnotation("In");
- if (annotation == null)
+ if (annotation == null || !annotation.exists())
continue;
String nameToSearch = element.getElementName();
13 years, 7 months
JBoss Tools SVN: r24552 - trunk/esb/tests/org.jboss.tools.esb.ui.bot.test.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2010-08-30 11:10:37 -0400 (Mon, 30 Aug 2010)
New Revision: 24552
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/
Log:
svn:ignore
Property changes on: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test
___________________________________________________________________
Name: svn:ignore
+ screenshots
13 years, 7 months
JBoss Tools SVN: r24551 - in trunk: jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-08-30 11:07:01 -0400 (Mon, 30 Aug 2010)
New Revision: 24551
Added:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jboss-seam-mail.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jboss-seam-pdf.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/richfaces-ui.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/facetname.jsp
Removed:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jboss-seam-mail.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jboss-seam-pdf.jar
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebKbTest.java
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ProjectImportTestSetup.java
trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java
Log:
https://jira.jboss.org/browse/JBIDE-3875 Provide content assist for faset@name attribute based on parent JSF tag metadata.
Added tests.
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2010-08-30 14:42:40 UTC (rev 24550)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/PageProcessor.java 2010-08-30 15:07:01 UTC (rev 24551)
@@ -175,9 +175,11 @@
IComponent[] components = getComponents(query, context, includeComponentExtensions);
for (int i = 0; i < components.length; i++) {
IAttribute[] libAttributess = components[i].getAttributes(query, context);
- for (int j = 0; j < libAttributess.length; j++) {
- attributes.add(libAttributess[j]);
- attrbMap.put(libAttributess[j].getName(), libAttributess[j]);
+ if(libAttributess!=null) {
+ for (int j = 0; j < libAttributess.length; j++) {
+ attributes.add(libAttributess[j]);
+ attrbMap.put(libAttributess[j].getName(), libAttributess[j]);
+ }
}
}
if(includeComponentExtensions) {
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2010-08-30 14:42:40 UTC (rev 24550)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/taglib/AbstractComponent.java 2010-08-30 15:07:01 UTC (rev 24551)
@@ -156,7 +156,7 @@
attrName = query.getParent();
}
if(attrName == null) {
- return null;
+ return EMPTY_ARRAY;
}
if(mask) {
return getAttributes(attrName, context, query);
Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jboss-seam-mail.jar
===================================================================
(Binary files differ)
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jboss-seam-mail.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jboss-seam-mail.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jboss-seam-pdf.jar
===================================================================
(Binary files differ)
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jboss-seam-pdf.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/jboss-seam-pdf.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/richfaces-ui.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/WEB-INF/lib/richfaces-ui.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/facetname.jsp
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/facetname.jsp (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/facetname.jsp 2010-08-30 15:07:01 UTC (rev 24551)
@@ -0,0 +1,16 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://richfaces.org/rich" prefix="rich" %>
+
+<html>
+ <body>
+
+ <f:view>
+ <rich:page >
+ <f:facet name="header">
+ </f:facet>
+ </rich:page>
+
+ </f:view>
+ </body>
+</html>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/TestKbModel/WebContent/pages/facetname.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2010-08-30 14:42:40 UTC (rev 24550)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2010-08-30 15:07:01 UTC (rev 24551)
@@ -22,11 +22,12 @@
public static Test suite() {
TestSuite suite = new TestSuite(JstWebKbAllTests.class.getName());
- suite.addTest(new ProjectImportTestSetup(new TestSuite(WebKbTest.class),
+ suite.addTestSuite(KbModelTest.class);
+ suite.addTestSuite(WebKbTest.class);
+ ProjectImportTestSetup testSetup = new ProjectImportTestSetup(suite,
"org.jboss.tools.jst.web.kb.test",
new String[]{"projects/TestKbModel"},
- new String[]{"TestKbModel"}));
- suite.addTestSuite(KbModelTest.class);
- return suite;
+ new String[]{"TestKbModel"});
+ return testSetup;
}
}
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java 2010-08-30 14:42:40 UTC (rev 24550)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java 2010-08-30 15:07:01 UTC (rev 24551)
@@ -12,24 +12,20 @@
import java.util.List;
+import junit.framework.TestCase;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.internal.scanner.LoadedDeclarations;
import org.jboss.tools.jst.web.kb.internal.scanner.ScannerException;
import org.jboss.tools.jst.web.kb.internal.scanner.XMLScanner;
import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
import org.jboss.tools.test.util.JUnitUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
-import junit.framework.TestCase;
-
public class KbModelTest extends TestCase {
- TestProjectProvider provider = null;
IProject project = null;
boolean makeCopy = true;
@@ -38,11 +34,8 @@
}
public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.web.kb.test",
- null,"TestKbModel" ,true);
- project = provider.getProject();
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- this.project.build(IncrementalProjectBuilder.FULL_BUILD, null);
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject("TestKbModel");
+ assertNotNull("Can't load TestKbModel", project); //$NON-NLS-1$
}
private IKbProject getKbProject() {
@@ -91,10 +84,4 @@
public void toDoCleanBuild() {
}
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-}
+}
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebKbTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebKbTest.java 2010-08-30 14:42:40 UTC (rev 24550)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/WebKbTest.java 2010-08-30 15:07:01 UTC (rev 24551)
@@ -14,17 +14,16 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.common.el.core.resolver.ELContext;
import org.jboss.tools.common.text.TextProposal;
import org.jboss.tools.jst.web.kb.KbQuery;
+import org.jboss.tools.jst.web.kb.KbQuery.Type;
import org.jboss.tools.jst.web.kb.PageContextFactory;
import org.jboss.tools.jst.web.kb.PageProcessor;
-import org.jboss.tools.jst.web.kb.KbQuery.Type;
import org.jboss.tools.jst.web.kb.internal.taglib.CustomTagLibAttribute;
import org.jboss.tools.jst.web.kb.taglib.CustomTagLibManager;
import org.jboss.tools.jst.web.kb.taglib.ICustomTagLibrary;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.ProjectImportTestSetup;
/**
* @author Alexey Kazakov
@@ -36,9 +35,8 @@
protected void setUp() throws Exception {
if(testProject==null) {
- testProject = ProjectImportTestSetup.loadProject("TestKbModel");
- JobUtils.waitForIdle();
- JobUtils.delay(2000);
+ testProject = ResourcesPlugin.getWorkspace().getRoot().getProject("TestKbModel");
+ assertNotNull("Can't load TestKbModel", testProject); //$NON-NLS-1$
}
}
@@ -132,4 +130,30 @@
assertNotNull("Can't load component extensions.", attributes);
assertFalse("Can't load component extensions.", attributes.length==0);
}
+
+ /**
+ * https://jira.jboss.org/jira/browse/JBIDE-3875
+ */
+ public void testFacetNames() {
+ IFile file = testProject.getFile("WebContent/pages/facetname.jsp");
+ ELContext context = PageContextFactory.createPageContext(file);
+ KbQuery query = new KbQuery();
+ query.setMask(true);
+ query.setOffset(302);
+ query.setType(Type.ATTRIBUTE_VALUE);
+ query.setPrefix("f");
+ query.setUri("http://java.sun.com/jsf/core");
+ query.setValue("h");
+ query.setParentTags(new String[]{"rich:page", "f:facet"});
+ query.setParent("name");
+ query.setStringQuery("h");
+
+ TextProposal[] proposals = PageProcessor.getInstance().getProposals(query, context);
+ for (TextProposal proposal : proposals) {
+ if("header".equals(proposal.getReplacementString())) {
+ return;
+ }
+ }
+ fail("Can't find \"header\" proposal.");
+ }
}
\ No newline at end of file
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ProjectImportTestSetup.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2010-08-30 14:42:40 UTC (rev 24550)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/ProjectImportTestSetup.java 2010-08-30 15:07:01 UTC (rev 24551)
@@ -15,7 +15,6 @@
import org.eclipse.core.internal.resources.ResourceException;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -62,16 +61,15 @@
}
public static IProject loadProject(String projectName) throws CoreException {
- IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember(projectName);
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
assertNotNull("Can't load " + projectName, project); //$NON-NLS-1$
- IProject result = project.getProject();
try {
- result.build(IncrementalProjectBuilder.FULL_BUILD, null);
+ project.build(IncrementalProjectBuilder.FULL_BUILD, null);
} catch (ResourceException e) {
JUnitUtils.fail(e.getMessage(), e);
}
JobUtils.waitForIdle();
- return result;
+ return project;
}
@Override
Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java 2010-08-30 14:42:40 UTC (rev 24550)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java 2010-08-30 15:07:01 UTC (rev 24551)
@@ -17,15 +17,10 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
@@ -55,10 +50,13 @@
*/
public TestProjectProvider(String bundleName, String projectPath, String name, boolean makeCopy) throws CoreException {
try {
- if( null == projectPath ) {
- project = ResourcesUtils.importProject(bundleName, "projects" + Path.SEPARATOR + name, null);
- } else {
- project = ResourcesUtils.importProject(bundleName, projectPath, name, null);
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject(name);
+ if(project==null || !project.isAccessible()) {
+ if( null == projectPath ) {
+ project = ResourcesUtils.importProject(bundleName, "projects" + Path.SEPARATOR + name, null);
+ } else {
+ project = ResourcesUtils.importProject(bundleName, projectPath, name, null);
+ }
}
} catch (IOException e) {
throw new CoreException(new Status(Status.ERROR,bundleName,e.getMessage(),e));
13 years, 7 months
JBoss Tools SVN: r24550 - in trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests: editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2010-08-30 10:42:40 -0400 (Mon, 30 Aug 2010)
New Revision: 24550
Modified:
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java
trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/Assertions.java
Log:
esb ui bot tests : setup editing test by creating esb project, not classic java one
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2010-08-30 14:37:09 UTC (rev 24549)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/Editing.java 2010-08-30 14:42:40 UTC (rev 24550)
@@ -34,7 +34,9 @@
import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.config.Annotations.SWTBotTestRequires;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.ESBESBFile;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.ESBESBProject;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.JavaProject;
import org.jboss.tools.ui.bot.ext.helper.ContextMenuHelper;
import org.jboss.tools.ui.bot.ext.parts.ObjectMultiPageEditorBot;
@@ -59,20 +61,17 @@
@BeforeClass
public static void setupProject() {
- SWTBot wiz = open.newObject(JavaProject.LABEL);
- wiz.textWithLabel(JavaProject.TEXT_PROJECT_NAME).setText(projectName);
+ SWTBot wiz = open.newObject(ActionItem.NewObject.ESBESBProject.LABEL);
+ wiz.textWithLabel(ESBESBProject.TEXT_PROJECT_NAME).setText(projectName);
wiz.button(IDELabel.Button.NEXT).click();
- open.finish(wiz, true);
- packageExplorer.show().bot().tree().select(projectName);
- wiz = open.newObject(ESBESBFile.LABEL);
- wiz.textWithLabel(ESBESBFile.TEXT_NAME).setText(configFile);
+ wiz.button(IDELabel.Button.NEXT).click();
+
+
open.finish(wiz);
- assertTrue(bot.editorByTitle(configFileFull) != null);
- assertTrue("ESB Editor opened problems",
- problems.getErrorsNode(bot) == null);
+
}
- //@AfterClass
+ @AfterClass
public static void waitAMinute() {
bot.sleep(Long.MAX_VALUE);
}
@@ -101,6 +100,8 @@
ESBProvider action = (ESBProvider) m.invoke(null, new Object[]{});
action.create(getEditor(), actionPath);
providerList.remove(action.getMenuLabel());
+ bot.sleep(TIME_1S);
+ Assertions.assertEmptyProblemsView("after "+action.getMenuLabel()+" was added");
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
Modified: trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/Assertions.java
===================================================================
--- trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/Assertions.java 2010-08-30 14:37:09 UTC (rev 24549)
+++ trunk/esb/tests/org.jboss.tools.esb.ui.bot.test/src/org/jboss/tools/esb/ui/bot/tests/editor/Assertions.java 2010-08-30 14:42:40 UTC (rev 24550)
@@ -8,8 +8,10 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.esb.ui.bot.tests.XmlFileValidator;
import org.jboss.tools.ui.bot.ext.SWTEclipseExt;
+import org.jboss.tools.ui.bot.ext.SWTTestExt;
public class Assertions {
public static void assertTreeContent(SWTBotEditor editor, String... items) {
@@ -59,4 +61,8 @@
public static void assertXmlContentExists(String xml, String xpath) {
assertXmlContentBool(xml, "count("+xpath+")=1");
}
+ public static void assertEmptyProblemsView(String message ) {
+ SWTBotTreeItem node = SWTTestExt.problems.getErrorsNode(SWTTestExt.bot);
+ assertTrue("ESB Editor has errors in 'Problems View' - "+message,node == null);
+ }
}
13 years, 7 months
JBoss Tools SVN: r24549 - in trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext: widgets and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: lzoubek(a)redhat.com
Date: 2010-08-30 10:37:09 -0400 (Mon, 30 Aug 2010)
New Revision: 24549
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/widgets/SWTBotSection.java
Log:
SWTBot ext - SWTSection
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-08-30 13:55:09 UTC (rev 24548)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2010-08-30 14:37:09 UTC (rev 24549)
@@ -22,6 +22,7 @@
import org.eclipse.swt.widgets.Scale;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
+import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotButton;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotCCombo;
@@ -174,5 +175,15 @@
"Could not find widget of type Section", ex);
}
}
+ @SuppressWarnings("unchecked")
+ public SWTBotSection section(SWTBot bot, String label) {
+ try {
+ List<Section> sections = (List<Section>)bot.widgets(allOf(withText(label),widgetOfType(Section.class)));
+ return new SWTBotSection(sections.get(0));
+ } catch (WidgetNotFoundException ex) {
+ throw new WidgetNotFoundException(
+ "Could not find widget of type Section", ex);
+ }
+ }
}
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/widgets/SWTBotSection.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/widgets/SWTBotSection.java 2010-08-30 13:55:09 UTC (rev 24548)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/widgets/SWTBotSection.java 2010-08-30 14:37:09 UTC (rev 24549)
@@ -1,5 +1,6 @@
package org.jboss.tools.ui.bot.ext.widgets;
+import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.widgets.AbstractSWTBotControl;
import org.eclipse.ui.forms.widgets.Section;
@@ -12,8 +13,13 @@
*/
public class SWTBotSection extends AbstractSWTBotControl<Section> {
+ private final SWTBot bot;
public SWTBotSection(Section w) throws WidgetNotFoundException {
- super(w);
+ super(w);
+ bot = new SWTBot(w);
}
+ public SWTBot bot() {
+ return bot;
+ }
}
13 years, 7 months
JBoss Tools SVN: r24548 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-08-30 09:55:09 -0400 (Mon, 30 Aug 2010)
New Revision: 24548
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
Log:
https://jira.jboss.org/browse/JBIDE-6935
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-08-30 13:48:15 UTC (rev 24547)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2010-08-30 13:55:09 UTC (rev 24548)
@@ -170,7 +170,7 @@
Set<IQualifier> qs = new HashSet<IQualifier>();
for(IAnnotationDeclaration a: definition.getAnnotations()) {
int k = getCDIProject().getNature().getDefinitions().getAnnotationKind(a.getType());
- if(k > 0 && (k & AnnotationDefinition.QUALIFIER) > 0) {
+ if(k > 0 && (k & AnnotationDefinition.QUALIFIER) > 0 && a instanceof IQualifierDeclaration) {
IQualifierDeclaration q = (IQualifierDeclaration)a;
result.add(q);
if(q.getQualifier() != null) qs.add(q.getQualifier());
@@ -250,7 +250,7 @@
Set<IScopeDeclaration> result = new HashSet<IScopeDeclaration>();
for (IAnnotationDeclaration d: ds) {
int k = n.getDefinitions().getAnnotationKind(d.getType());
- if(k > 0 && (k & AnnotationDefinition.SCOPE) > 0) {
+ if(k > 0 && (k & AnnotationDefinition.SCOPE) > 0 && d instanceof IScopeDeclaration) {
result.add((IScopeDeclaration)d);
}
}
13 years, 7 months