JBoss Tools SVN: r25002 - in trunk/jst/tests/org.jboss.tools.jst.jsp.test: projects/JsfJbide1791Test/WebContent/pages and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-09-17 13:51:11 -0400 (Fri, 17 Sep 2010)
New Revision: 25002
Removed:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1704Test/
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1791Test/WebContent/pages/jbide1791.xhtml
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
Log:
JBIDE-6529 : jsf test failures
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1791Test/WebContent/pages/jbide1791.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1791Test/WebContent/pages/jbide1791.xhtml 2010-09-17 17:18:05 UTC (rev 25001)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/projects/JsfJbide1791Test/WebContent/pages/jbide1791.xhtml 2010-09-17 17:51:11 UTC (rev 25002)
@@ -5,8 +5,6 @@
xmlns:f="http://java.sun.com/jsf/core">
<head>
- <style type="text/css">
-
- </style>
+ <style type="text/css"></style>
</head>
</html>
\ No newline at end of file
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2010-09-17 17:18:05 UTC (rev 25001)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/JstJspAllTests.java 2010-09-17 17:51:11 UTC (rev 25002)
@@ -4,8 +4,6 @@
import junit.framework.TestSuite;
import org.jboss.tools.jst.jsp.test.ca.Jbide1791Test;
-import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1704Test;
-import org.jboss.tools.jst.jsp.test.ca.JsfJspJbide1717Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1585Test;
import org.jboss.tools.jst.jsp.test.ca.JstJspJbide1641Test;
@@ -15,8 +13,8 @@
TestSuite suite = new TestSuite("Test for org.jboss.tools.jst.jsp.test");
suite.addTestSuite(JstJspJbide1585Test.class);
suite.addTestSuite(JstJspJbide1641Test.class);
- suite.addTestSuite(JsfJspJbide1704Test.class);
- suite.addTestSuite(JsfJspJbide1717Test.class);
+// suite.addTestSuite(JsfJspJbide1704Test.class);
+// suite.addTestSuite(JsfJspJbide1717Test.class);
suite.addTestSuite(Jbide1791Test.class);
suite.addTestSuite(JspPreferencesPageTest.class);
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2010-09-17 17:18:05 UTC (rev 25001)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2010-09-17 17:51:11 UTC (rev 25002)
@@ -1,114 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.FindReplaceDocumentAdapter;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.test.util.TestProjectProvider;
-
-public class JsfJspJbide1704Test extends ContentAssistantTestCase {
- TestProjectProvider provider = null;
-
- boolean makeCopy = false;
- private static final String PROJECT_NAME = "JsfJbide1704Test";
- private static final String PAGE_NAME = "/WebContent/pages/greeting";
-
- public static Test suite() {
- return new TestSuite(JsfJspJbide1704Test.class);
- }
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
- public void testJspJbide1704 () {
- assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
- doTestJsfJspJbide1704(PAGE_NAME + ".jsp");
- }
-
- public void testXhtmlJbide1704 () {
- assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
- doTestJsfJspJbide1704(PAGE_NAME + ".xhtml");
- }
-
- private static final String TEST_RESOURCES_VALUE = "\"resources\"";
-
- private void doTestJsfJspJbide1704(String pageName) {
-
- openEditor(pageName);
-
- try {
-
- final IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
- " var=\"msg\"", true, true, false, false);
- String text = document.get();
- String errorMessage = null;
-
- List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, reg.getOffset());
-
- assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0));
-
- for (ICompletionProposal proposal : res) {
- // There should not be a proposal of type AutoContentAssistantProposal in the result
- // (the only exclusion is EL-proposals)
-
- if (proposal instanceof AutoContentAssistantProposal) {
- if(((AutoContentAssistantProposal)proposal).getReplacementString().startsWith("#{")) {
- // The only EL template proposal is allowed to be shown here
- continue;
- }
- }
-
-
- if (proposal instanceof CustomCompletionProposal) {
- // There are two cases are allowed to be shown
- // AutoContentAssistantProposal which returns the "resources" string as replacement
- // CustomCompletionProposal which returns the current value string as replacement
-
- if (!(proposal instanceof AutoContentAssistantProposal)) {
- int equalSignIndex = text.lastIndexOf('=', reg.getOffset());
- if (equalSignIndex != -1) {
- String prevAttrValue = text.substring(equalSignIndex+1, reg.getOffset()).trim();
- if (((CustomCompletionProposal)proposal).getReplacementString().equals(prevAttrValue)){
- // The old value for the attribute is allowed to be shown here
- continue;
- }
- }
- } else {
- if (((CustomCompletionProposal)proposal).getReplacementString().equals(TEST_RESOURCES_VALUE)){
- // The old value for the attribute is allowed to be shown here
- continue;
- }
-
- }
- }
-
- assertFalse("Content Assistant peturned proposals of type (" + proposal.getClass().getName() + ").", (proposal instanceof AutoContentAssistantProposal));
- }
-
- } catch (BadLocationException e) {
- fail(e.getMessage());
- }
-
- closeEditor();
- }
-
-}
Deleted: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java 2010-09-17 17:18:05 UTC (rev 25001)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java 2010-09-17 17:51:11 UTC (rev 25002)
@@ -1,115 +0,0 @@
-package org.jboss.tools.jst.jsp.test.ca;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-import org.jboss.tools.jst.jsp.test.TestUtil;
-import org.jboss.tools.test.util.JobUtils;
-import org.jboss.tools.test.util.TestProjectProvider;
-
-
-public class JsfJspJbide1717Test extends ContentAssistantTestCase {
- TestProjectProvider provider = null;
- boolean makeCopy = false;
- private static final String PROJECT_NAME = "JsfJbide1704Test";
- private static final String PAGE_NAME = "/WebContent/pages/greeting.jsp";
- private static final String INSERT_BEFORE_STRING = "<h:outputText";
- private static final String INSERTION_BEGIN_STRING = "<h:outputText value=\"";
- private static final String INSERTION_END_STRING = "\" />";
- private static final String JSF_EXPR_STRING = "#{msg.greeting}";
-
- public static Test suite() {
- return new TestSuite(JsfJspJbide1717Test.class);
- }
-
- public void setUp() throws Exception {
- provider = new TestProjectProvider("org.jboss.tools.jst.jsp.test", null, PROJECT_NAME, makeCopy);
- project = provider.getProject();
- }
-
- protected void tearDown() throws Exception {
- if(provider != null) {
- provider.dispose();
- }
- }
-
- public void testJstJspJbide1717() {
- openEditor(PAGE_NAME);
-
- // Find start of <h:outputText> tag
- String documentContent = document.get();
- int start = (documentContent == null ? -1 : documentContent.indexOf(INSERT_BEFORE_STRING));
-
- assertTrue("Cannot find the starting point in the test file \"" + PAGE_NAME + "\"", (start != -1));
-
- // First of all perform the test on a region placed in one space behind empty-valued attribute -
- // this is to return normal list of attribute names proposal list
-
- String documentContentModified = documentContent.substring(0, start) +
- INSERTION_BEGIN_STRING + INSERTION_END_STRING + documentContent.substring(start);
-
- int offsetToTest = start + INSERTION_BEGIN_STRING.length() + 2;
-
- jspTextEditor.setText(documentContentModified);
-
- String errorMessage = null;
-
- List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest);
-
- List<String> customCompletionProposals = new ArrayList<String>();
-
- if (res != null) {
- for (ICompletionProposal proposal : res) {
- // There should be at least one proposal of type CustomCompletionProposal in the result
- if (proposal instanceof CustomCompletionProposal) {
- customCompletionProposals.add(((CustomCompletionProposal)proposal).getReplacementString());
- }
- }
- }
- assertFalse("Content Assistant returned no proposals of type CustomCompletionProposal.",customCompletionProposals.isEmpty());
-
- try {
- JobUtils.waitForIdle();
- } catch (Exception e) {
- e.printStackTrace();
- assertTrue("Waiting for the jobs to complete has failed.", false);
- }
-
- // Next perform the test on a region placed in one space behind an attribute those value is a container
- // (contains JSF expression) - this has to return the same normal list of attribute names proposal list as
- // we got at the first step (because the tag is the same, but only the attribute value is changed)
-
- documentContentModified = documentContent.substring(0, start) +
- INSERTION_BEGIN_STRING + JSF_EXPR_STRING + INSERTION_END_STRING + documentContent.substring(start);
-
- offsetToTest = start + INSERTION_BEGIN_STRING.length() + JSF_EXPR_STRING.length() + 2;
-
- String visualizeCursorPosition = documentContentModified.substring(0, offsetToTest) +
- "|" + documentContentModified.substring(offsetToTest);
-
- jspTextEditor.setText(documentContentModified);
-
- res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest);
-
- if (res != null) {
- for (ICompletionProposal proposal : res) {
- // There should be the same proposals as in the saved result
- if (proposal instanceof CustomCompletionProposal) {
- assertTrue("Content Assistant returned additional proposal (proposal returned doesn't exist in the saved list).",
- customCompletionProposals.contains(((CustomCompletionProposal)proposal).getReplacementString()));
- customCompletionProposals.remove(((CustomCompletionProposal)proposal).getReplacementString());
- }
- }
- }
- assertTrue("Content Assistant didn't returned some proposals.",customCompletionProposals.isEmpty());
-
- closeEditor();
- }
-
-
-}
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r25001 - in trunk/cdi/tests: org.jboss.tools.cdi.ui.test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-09-17 13:18:05 -0400 (Fri, 17 Sep 2010)
New Revision: 25001
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/test.jsp
Removed:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/resources/
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java
Log:
JBIDE-7091
https://jira.jboss.org/browse/JBIDE-7091 fixed CDI core tests
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/test.jsp
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/test.jsp (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/test.jsp 2010-09-17 17:18:05 UTC (rev 25001)
@@ -0,0 +1,15 @@
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<html>
+ <head>
+ <title>JSF Test Page</title>
+ </head>
+ <body>
+ <f:view>
+ <h1>
+ <h:outputText value="#{sheep.name}"
+ rendered="#{(game.value == 'foo' and game.value == 'foo') ? game.value == 'foo' : false}"/>
+ </h1>
+ </f:view>
+ </body>
+</html>
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/projects/tck/WebContent/test.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties 2010-09-17 17:10:36 UTC (rev 25000)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/build.properties 2010-09-17 17:18:05 UTC (rev 25001)
@@ -1,5 +1,4 @@
bin.includes = META-INF/,\
- resources/,\
.
jars.compile.order = .
source.. = src/
Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2010-09-17 17:10:36 UTC (rev 25000)
+++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/CATest.java 2010-09-17 17:18:05 UTC (rev 25001)
@@ -10,20 +10,11 @@
******************************************************************************/
package org.jboss.tools.cdi.ui.test;
-import java.io.File;
-
import junit.framework.TestCase;
import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Platform;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
-import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
-import org.jboss.tools.test.util.JobUtils;
-import org.osgi.framework.Bundle;
/**
* @author Alexey Kazakov
@@ -33,33 +24,20 @@
private IProject project;
private ContentAssistantTestCase caTest = new ContentAssistantTestCase();
private static final String PAGE_NAME = "WebContent/test.jsp";
- private static final String RESOURCE_NAME = "/resources/CATest/test.jsp";
private String[] beanProposals = new String[] {"example", "example.com", "fish", "game", "haddock", "salmon", "sheep", "tunaFarm", "whitefish", "wolf"};
private String[] propertyProposals = new String[] {"game.value", "game.initialize"};
- private final static String UI_TEST_PLUGIN_ID = "org.jboss.tools.cdi.ui.test";
public CATest() {
super();
try {
project = TCKTest.importPreparedProject("/tests/lookup");
- Bundle ui = Platform.getBundle(UI_TEST_PLUGIN_ID);
- String projectPath = project.getLocation().toString();
- String resourcePath = FileLocator.resolve(ui.getEntry(RESOURCE_NAME)).getFile();
-
- File from = new File(resourcePath);
- File to = new File(projectPath, PAGE_NAME);
-
- FileUtil.copyFile(from, to);
caTest.setProject(project);
- project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
- JobUtils.waitForIdle(2000);
} catch (Exception e) {
e.printStackTrace();
}
}
public void testEL() {
- JobUtils.waitForIdle(2000);
caTest.checkProposals(PAGE_NAME, "value=\"#{", 9, beanProposals, false);
caTest.checkProposals(PAGE_NAME, "rendered=\"#{(game.", 18, propertyProposals, false);
}
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r25000 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-09-17 13:10:36 -0400 (Fri, 17 Sep 2010)
New Revision: 25000
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
JBIDE-6229 https://jira.jboss.org/browse/JBIDE-6229:
Implement DnD support for selected text in VPE
- Minor refactoring
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-09-17 17:02:00 UTC (rev 24999)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-09-17 17:10:36 UTC (rev 25000)
@@ -10,6 +10,7 @@
******************************************************************************/
package org.jboss.tools.vpe.editor;
+import java.text.MessageFormat;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -170,7 +171,6 @@
private Attr lastRemovedAttr;
private String lastRemovedAttrName;
private boolean mouseUpSelectionReasonFlag;
- private boolean mouseDownSelectionFlag;
private boolean sourceChangeFlag;
private boolean commentNodeChanged;
private int commentRemoveCount = 0;
@@ -1114,7 +1114,7 @@
if (switcher
.startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_VISUAL)) {
try {
- mouseUpSelectionReasonFlag = (reason & nsISelectionListener.MOUSEUP_REASON) > 0;
+ mouseUpSelectionReasonFlag = (reason & nsISelectionListener.MOUSEUP_REASON) != 0;
if (
// commited by Dzmitrovich - experimental
// TODO check selection and if are appear errors then
@@ -1217,15 +1217,9 @@
return;
}
try {
-
if (VpeDebug.PRINT_VISUAL_MOUSE_EVENT) {
System.out.println("<<< mouseUp"); //$NON-NLS-1$
}
- if (mouseDownSelectionFlag) {
- mouseEvent.preventDefault();
- mouseEvent.stopPropagation();
- mouseDownSelectionFlag = false;
- }
} finally {
switcher.stopActiveEditor();
}
@@ -1239,12 +1233,13 @@
try {
nsIDOMNode visualNode = VisualDomUtil.getTargetNode(mouseEvent);
if (visualNode != null) {
+ if (VpeDebug.PRINT_VISUAL_MOUSE_EVENT) {
+ System.out.println(MessageFormat.format(
+ "<<< mouseClick visualNode: {0} ({1})", //$NON-NLS-1$
+ visualNode.getNodeName(),
+ visualNode));
+ }
if (!mouseUpSelectionReasonFlag) {
- if (VpeDebug.PRINT_VISUAL_MOUSE_EVENT) {
- System.out
- .println("<<< mouseClick visualNode: " + visualNode.getNodeName() + //$NON-NLS-1$
- " (" + visualNode + ")"); //$NON-NLS-1$ //$NON-NLS-2$
- }
if (visualBuilder.isContentArea(visualNode)) {
// selectionBuilder.setClickContentAreaSelection();
}
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24999 - in trunk/jsf/tests/org.jboss.tools.jsf.test: projects and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2010-09-17 13:02:00 -0400 (Fri, 17 Sep 2010)
New Revision: 24999
Added:
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.classpath
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.project
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.jdt.core.prefs
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.jst.common.project.facet.core.prefs
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.component
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/JavaSource/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/JavaSource/demo/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/JavaSource/resources.properties
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-api.jar
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-impl.jar
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/web.xml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/greeting.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/templates/
trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/templates/common.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide1704Test.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide1717Test.java
trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfCATests.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
Log:
JBIDE-6529 : jsf test failures
Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-09-17 16:32:31 UTC (rev 24998)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-09-17 17:02:00 UTC (rev 24999)
@@ -13,8 +13,10 @@
org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.core.resources,
+ org.eclipse.jface.text,
org.jboss.tools.tests,
org.jboss.tools.common.test,
+ org.jboss.tools.jst.jsp.test,
org.jboss.tools.common.model,
org.jboss.tools.jsf,
org.jboss.tools.jsf.ui,
@@ -23,8 +25,10 @@
org.eclipse.ui.ide,
org.eclipse.ltk.core.refactoring,
org.eclipse.wst.validation,
- org.jboss.tools.common.el.core;bundle-version="3.2.0"
+ org.jboss.tools.common.el.core;bundle-version="3.2.0",
+ org.jboss.tools.jst.jsp;bundle-version="3.2.0"
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Import-Package: org.jboss.tools.jst.jsp.contentassist
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.classpath
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.classpath (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.classpath 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.project
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.project (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.project 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>JsfJbide1704Test</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ </natures>
+</projectDescription>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.jdt.core.prefs 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,7 @@
+#Wed Jan 30 17:08:49 MSK 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.jst.common.project.facet.core.prefs
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.jst.common.project.facet.core.prefs (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.jst.common.project.facet.core.prefs 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,4 @@
+#Wed Jan 30 17:08:50 MSK 2008
+classpath.helper/org.eclipse.jdt.launching.JRE_CONTAINER\:\:org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType\:\:jdk1.5.0_07/owners=jst.java\:5.0
+classpath.helper/org.jboss.ide.eclipse.as.classpath.core.runtime.ProjectRuntimeInitializer\:\:JBoss\ 4.2\ Runtime/owners=jst.web\:2.4
+eclipse.preferences.version=1
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.component 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="JsfJbide1704Test">
+<wb-resource deploy-path="/" source-path="/WebContent"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/>
+<property name="context-root" value="JsfJbide1704Test"/>
+<property name="java-output-path" value="build/classes"/>
+</wb-module>
+</project-modules>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 4.2 Runtime"/>
+ <fixed facet="jst.java"/>
+ <fixed facet="jst.web"/>
+ <installed facet="jst.java" version="5.0"/>
+ <installed facet="jst.web" version="2.4"/>
+</faceted-project>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/.settings/org.jboss.tools.jst.web.xml 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<file-systems VERSION="2.0.0" application-name="JsfJbide1704Test"
+ model-entity="FileSystems" workspace-home="./WebContent/WEB-INF">
+ <file-system NAME="WEB-INF" location="%workspace.home%" model-entity="FileSystemFolder"/>
+ <file-system NAME="WEB-ROOT" info="Content-Type=Web"
+ location="%workspace.home%/.." model-entity="FileSystemFolder"/>
+ <file-system NAME="src" location="%workspace.home%/../../JavaSource" model-entity="FileSystemFolder"/>
+ <file-system NAME="lib" location="%workspace.home%/lib" model-entity="FileSystemFolder"/>
+ <file-system NAME="classes" location="%workspace.home%/classes" model-entity="FileSystemFolder"/>
+ <file-system NAME="lib-commons-beanutils.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-beanutils.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-collections.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-collections.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-digester.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-digester.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-commons-logging.jar" info="hidden=yes"
+ location="%workspace.home%/lib/commons-logging.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jstl.jar" info="hidden=yes"
+ location="%workspace.home%/lib/jstl.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-standard.jar" info="hidden=yes"
+ location="%workspace.home%/lib/standard.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jsf-facelets.jar"
+ location="%workspace.home%/lib/jsf-facelets.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="flet001" location="%eclipse.project%" model-entity="FileSystemFolder"/>
+ <file-system NAME="lib-common-annotations.jar" info="hidden=yes"
+ location="%workspace.home%/lib/common-annotations.jar" model-entity="FileSystemJar"/>
+ <file-system NAME="lib-jsf-tlds.jar" info="hidden=yes"
+ location="%workspace.home%/lib/jsf-tlds.jar" model-entity="FileSystemJar"/>
+ <web SERVLET_VERSION="2.5" model-entity="JstWeb" model-path="/web.xml">
+ <module URI="/WEB-INF/faces-config.xml" model-entity="WebJSFModule"
+ model-path="/faces-config.xml" root="WEB-ROOT" src="src"/>
+ </web>
+</file-systems>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/JavaSource/demo/Person.java 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package demo;
+
+/**
+ * Created by JBoss Developer Studio
+*
+ */
+public class Person {
+ private String name;
+
+ public Person() {
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/JavaSource/resources.properties
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/JavaSource/resources.properties (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/JavaSource/resources.properties 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,2 @@
+prompt=Your Name\:
+greeting=Hello
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/faces-config.xml 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+ <managed-bean>
+ <managed-bean-name>person</managed-bean-name>
+ <managed-bean-class>demo.Person</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>name</property-name>
+ <value/>
+ </managed-property>
+ </managed-bean>
+ <navigation-rule>
+ <from-view-id>/pages/greeting.jsp</from-view-id>
+ <navigation-case>
+ <from-outcome>greeting</from-outcome>
+ <to-view-id>/pages/greeting.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <application>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ </application>
+</faces-config>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-api.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-api.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-impl.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/lib/jsf-impl.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/WEB-INF/web.xml 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <description>Facelets StarterKit</description>
+ <display-name>JsfJbide1704Test</display-name>
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.REFRESH_PERIOD</param-name>
+ <param-value>2</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>client</param-value>
+ </context-param>
+ <context-param>
+ <param-name>com.sun.faces.validateXml</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>com.sun.faces.verifyObjects</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
+</web-app>
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/greeting.jsp 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,20 @@
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+
+<html>
+<head>
+ <title>Facelets Greeting Page</title>
+</head>
+<body>
+ <f:view>
+ <f:loadBundle basename="resources" var="msg" />
+
+ <strong>
+ <h:outputText value="#{msg.greeting}" />
+
+ <h:outputText value="#{person.name}" />
+ <h:outputText value="!" />
+ </strong>
+ </f:view>
+</body>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/greeting.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/greeting.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/greeting.xhtml 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+ <ui:composition template="/templates/common.xhtml">
+ <ui:define name="pageTitle">Greeting to User</ui:define>
+ <ui:define name="pageHeader">Facelets Greeting Page</ui:define>
+ <ui:define name="body">
+ <h:outputText value="#{msg.greeting}" />
+ #{msg.greeting} #{person.name}!
+ </ui:define>
+ </ui:composition>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/pages/greeting1.xhtml 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,16 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+ <ui:composition template="/templates/common.xhtml">
+ <ui:define name="pageTitle">Greeting to User</ui:define>
+ <ui:define name="pageHeader">Facelets Greeting Page</ui:define>
+ <ui:define name="body">
+ <h:outputText value="#{msg.greeting}" />
+ #{msg.greeting} #{person.name}!
+ </ui:define>
+ </ui:composition>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/templates/common.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/templates/common.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/projects/JsfJbide1704Test/WebContent/templates/common.xhtml 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+ <head>
+ <title><ui:insert name="pageTitle">Page Title</ui:insert></title>
+ <style type="text/css">
+ body {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
+ h1 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 16px;
+ }
+ </style>
+ </head>
+
+ <body>
+ <h1><ui:insert name="pageHeader">Page Header</ui:insert></h1>
+ <p><ui:insert name="body">Page Body</ui:insert></p>
+ </body>
+</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide1704Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide1704Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide1704Test.java 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,115 @@
+package org.jboss.tools.jsf.ca.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IRegion;
+import org.eclipse.jface.text.contentassist.ContentAssistant;
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
+import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal;
+import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+public class JsfJspJbide1704Test extends ContentAssistantTestCase {
+ TestProjectProvider provider = null;
+
+ boolean makeCopy = false;
+ private static final String PROJECT_NAME = "JsfJbide1704Test";
+ private static final String PAGE_NAME = "/WebContent/pages/greeting";
+
+ public static Test suite() {
+ return new TestSuite(JsfJspJbide1704Test.class);
+ }
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, PROJECT_NAME, makeCopy);
+ project = provider.getProject();
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ public void testJspJbide1704 () {
+ assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
+ doTestJsfJspJbide1704(PAGE_NAME + ".jsp");
+ }
+
+ public void testXhtmlJbide1704 () {
+ assertTrue("Test project \"" + PROJECT_NAME + "\" is not loaded", (project != null));
+ doTestJsfJspJbide1704(PAGE_NAME + ".xhtml");
+ }
+
+ private static final String TEST_RESOURCES_VALUE = "\"resources\"";
+
+ private void doTestJsfJspJbide1704(String pageName) {
+
+ openEditor(pageName);
+
+ try {
+
+ final IRegion reg = new FindReplaceDocumentAdapter(document).find(0,
+ " var=\"msg\"", true, true, false, false);
+ String text = document.get();
+ String errorMessage = null;
+
+ List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, reg.getOffset());
+
+ assertTrue("Content Assist returned no proposals: ", (res != null && res.size() > 0));
+
+ for (ICompletionProposal proposal : res) {
+ // There should not be a proposal of type AutoContentAssistantProposal in the result
+ // (the only exclusion is EL-proposals)
+
+ if (proposal instanceof AutoContentAssistantProposal) {
+ if(((AutoContentAssistantProposal)proposal).getReplacementString().startsWith("#{")) {
+ // The only EL template proposal is allowed to be shown here
+ continue;
+ }
+ }
+
+
+ if (proposal instanceof CustomCompletionProposal) {
+ // There are two cases are allowed to be shown
+ // AutoContentAssistantProposal which returns the "resources" string as replacement
+ // CustomCompletionProposal which returns the current value string as replacement
+
+ if (!(proposal instanceof AutoContentAssistantProposal)) {
+ int equalSignIndex = text.lastIndexOf('=', reg.getOffset());
+ if (equalSignIndex != -1) {
+ String prevAttrValue = text.substring(equalSignIndex+1, reg.getOffset()).trim();
+ if (((CustomCompletionProposal)proposal).getReplacementString().equals(prevAttrValue)){
+ // The old value for the attribute is allowed to be shown here
+ continue;
+ }
+ }
+ } else {
+ if (((CustomCompletionProposal)proposal).getReplacementString().equals(TEST_RESOURCES_VALUE)){
+ // The old value for the attribute is allowed to be shown here
+ continue;
+ }
+
+ }
+ }
+
+ assertFalse("Content Assistant peturned proposals of type (" + proposal.getClass().getName() + ").", (proposal instanceof AutoContentAssistantProposal));
+ }
+
+ } catch (BadLocationException e) {
+ fail(e.getMessage());
+ }
+
+ closeEditor();
+ }
+
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide1717Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide1717Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/JsfJspJbide1717Test.java 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,117 @@
+package org.jboss.tools.jsf.ca.test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.eclipse.jface.text.contentassist.ICompletionProposal;
+import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
+import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
+import org.jboss.tools.jst.jsp.test.TestUtil;
+import org.jboss.tools.jst.jsp.test.ca.ContentAssistantTestCase;
+import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.TestProjectProvider;
+
+
+public class JsfJspJbide1717Test extends ContentAssistantTestCase {
+ TestProjectProvider provider = null;
+ boolean makeCopy = false;
+ private static final String PROJECT_NAME = "JsfJbide1704Test";
+ private static final String PAGE_NAME = "/WebContent/pages/greeting.jsp";
+ private static final String INSERT_BEFORE_STRING = "<h:outputText";
+ private static final String INSERTION_BEGIN_STRING = "<h:outputText value=\"";
+ private static final String INSERTION_END_STRING = "\" />";
+ private static final String JSF_EXPR_STRING = "#{msg.greeting}";
+
+ public static Test suite() {
+ return new TestSuite(JsfJspJbide1717Test.class);
+ }
+
+ public void setUp() throws Exception {
+ provider = new TestProjectProvider("org.jboss.tools.jsf.test", null, PROJECT_NAME, makeCopy);
+ project = provider.getProject();
+ }
+
+ protected void tearDown() throws Exception {
+ if(provider != null) {
+ provider.dispose();
+ }
+ }
+
+ public void testJstJspJbide1717() {
+ openEditor(PAGE_NAME);
+
+ // Find start of <h:outputText> tag
+ String documentContent = document.get();
+ int start = (documentContent == null ? -1 : documentContent.indexOf(INSERT_BEFORE_STRING));
+
+ assertTrue("Cannot find the starting point in the test file \"" + PAGE_NAME + "\"", (start != -1));
+
+ // First of all perform the test on a region placed in one space behind empty-valued attribute -
+ // this is to return normal list of attribute names proposal list
+
+ String documentContentModified = documentContent.substring(0, start) +
+ INSERTION_BEGIN_STRING + INSERTION_END_STRING + documentContent.substring(start);
+
+ int offsetToTest = start + INSERTION_BEGIN_STRING.length() + 2;
+
+ jspTextEditor.setText(documentContentModified);
+
+ String errorMessage = null;
+
+ List<ICompletionProposal> res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest);
+
+ List<String> customCompletionProposals = new ArrayList<String>();
+
+ if (res != null) {
+ for (ICompletionProposal proposal : res) {
+ // There should be at least one proposal of type CustomCompletionProposal in the result
+ if (proposal instanceof CustomCompletionProposal) {
+ customCompletionProposals.add(((CustomCompletionProposal)proposal).getReplacementString());
+ }
+ }
+ }
+ assertFalse("Content Assistant returned no proposals of type CustomCompletionProposal.",customCompletionProposals.isEmpty());
+
+ try {
+ JobUtils.waitForIdle();
+ } catch (Exception e) {
+ e.printStackTrace();
+ assertTrue("Waiting for the jobs to complete has failed.", false);
+ }
+
+ // Next perform the test on a region placed in one space behind an attribute those value is a container
+ // (contains JSF expression) - this has to return the same normal list of attribute names proposal list as
+ // we got at the first step (because the tag is the same, but only the attribute value is changed)
+
+ documentContentModified = documentContent.substring(0, start) +
+ INSERTION_BEGIN_STRING + JSF_EXPR_STRING + INSERTION_END_STRING + documentContent.substring(start);
+
+ offsetToTest = start + INSERTION_BEGIN_STRING.length() + JSF_EXPR_STRING.length() + 2;
+
+ String visualizeCursorPosition = documentContentModified.substring(0, offsetToTest) +
+ "|" + documentContentModified.substring(offsetToTest);
+
+ jspTextEditor.setText(documentContentModified);
+
+ res = TestUtil.collectProposals(contentAssistant, viewer, offsetToTest);
+
+ if (res != null) {
+ for (ICompletionProposal proposal : res) {
+ // There should be the same proposals as in the saved result
+ if (proposal instanceof CustomCompletionProposal) {
+ assertTrue("Content Assistant returned additional proposal (proposal returned doesn't exist in the saved list).",
+ customCompletionProposals.contains(((CustomCompletionProposal)proposal).getReplacementString()));
+ customCompletionProposals.remove(((CustomCompletionProposal)proposal).getReplacementString());
+ }
+ }
+ }
+ assertTrue("Content Assistant didn't returned some proposals.",customCompletionProposals.isEmpty());
+
+ closeEditor();
+ }
+
+
+}
Added: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfCATests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfCATests.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfCATests.java 2010-09-17 17:02:00 UTC (rev 24999)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.test;
+
+import org.jboss.tools.jsf.ca.test.JsfJspJbide1704Test;
+import org.jboss.tools.jsf.ca.test.JsfJspJbide1717Test;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class JsfCATests {
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for org.jboss.tools.jsf.test");
+
+ suite.addTestSuite(JsfJspJbide1704Test.class);
+ suite.addTestSuite(JsfJspJbide1717Test.class);
+
+ return suite;
+ }
+}
Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfCATests.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24998 - trunk/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-09-17 12:32:31 -0400 (Fri, 17 Sep 2010)
New Revision: 24998
Added:
trunk/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/IGWTDesignerConstants.java
Modified:
trunk/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/GWTInstallFacetDelegate.java
Log:
[JBIDE-7092] the wizard now adds GWT Designer nature and facet if the GWT Designer plugin's present
Modified: trunk/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/GWTInstallFacetDelegate.java
===================================================================
--- trunk/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/GWTInstallFacetDelegate.java 2010-09-17 15:59:22 UTC (rev 24997)
+++ trunk/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/GWTInstallFacetDelegate.java 2010-09-17 16:32:31 UTC (rev 24998)
@@ -17,6 +17,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.text.MessageFormat;
+import java.util.ArrayList;
import java.util.List;
import java.util.zip.ZipInputStream;
@@ -58,6 +59,7 @@
import org.jboss.tools.gwt.core.util.ProjectUtils;
import org.jboss.tools.gwt.core.util.ResourceUtils;
import org.jboss.tools.gwt.core.util.ZipUtils;
+import org.jboss.tools.usage.util.BundleUtils;
import org.jboss.tools.usage.util.StatusUtils;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
@@ -88,9 +90,31 @@
List<IPath> srcFolderPaths = ProjectUtils.getSourceFolders(javaProject);
createSample(srcFolderPaths, webContentPath, javaProject, monitor);
}
+
configureWebXml(project, monitor);
+
+ addGWTDesignerNatureAndBuilder(project, monitor);
}
+ private void addGWTDesignerNatureAndBuilder(IProject project, IProgressMonitor monitor) throws CoreException {
+ if (isGWTDesignerInstalled(GWTCoreActivator.getDefault().getBundle().getBundleContext())) {
+
+ monitor.subTask("Adding GWT Designer nature");
+ EclipseUtil.addNatureToProject(project.getProject(), IGWTDesignerConstants.GWTDESIGNER_NATURE);
+
+ monitor.subTask("Adding GWT Designer builder");
+ EclipseUtil.addBuilderToProject(project.getProject(), IGWTDesignerConstants.GWTDESIGNER_BUILDER);
+ }
+
+ }
+
+ private boolean isGWTDesignerInstalled(BundleContext bundleContext) {
+ ArrayList<Bundle> gwtDesignerBundles = new ArrayList<Bundle>();
+ BundleUtils.getBundles(
+ new BundleUtils.BundleSymbolicNameFilter(IGWTDesignerConstants.GWTDESIGNER_PLUGIN_REGEXP), gwtDesignerBundles, bundleContext.getBundles());
+ return gwtDesignerBundles.size() > 0;
+ }
+
private IPath getWebContentFolder(IProject project, IProgressMonitor monitor) throws CoreException {
IPath webContentPath = ProjectHome.getFirstWebContentPath(project);
Assert.isTrue(webContentPath != null && !webContentPath.isEmpty(),
Added: trunk/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/IGWTDesignerConstants.java
===================================================================
--- trunk/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/IGWTDesignerConstants.java (rev 0)
+++ trunk/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/IGWTDesignerConstants.java 2010-09-17 16:32:31 UTC (rev 24998)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.gwt.core;
+
+/**
+ * A class that holds various constants that are used to handle GWT Designer
+ * plugin specific functionalities.
+ *
+ * @author adietish
+ */
+public class IGWTDesignerConstants {
+
+ public static final String GWTDESIGNER_NATURE = "com.instantiations.designer.gwt.GWTNature"; //$NON-NLS-1$
+
+ public static final String GWTDESIGNER_BUILDER = "com.instantiations.designer.gwt.GWTBuilder"; //$NON-NLS-1$
+
+ /** the plugin that contributes GWT Designer nature and builder */
+ public static final String GWTDESIGNER_PLUGIN_REGEXP = "com\\.instantiations\\.designer\\.gwt";
+
+}
Property changes on: trunk/gwt/plugins/org.jboss.tools.gwt.core/src/org/jboss/tools/gwt/core/IGWTDesignerConstants.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24997 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-09-17 11:59:22 -0400 (Fri, 17 Sep 2010)
New Revision: 24997
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
Log:
Fixed compilation errors
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2010-09-17 15:58:30 UTC (rev 24996)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/JSPMultiPageEditorPart.java 2010-09-17 15:59:22 UTC (rev 24997)
@@ -347,18 +347,15 @@
protected void setPageText(int pageIndex, String text) {
getItem(pageIndex).setText(text);
}
-
- @Override
+
public void showSelectionBar() {
selectionBar.setVisible(true);
}
- @Override
public void hideSelectionBar() {
selectionBar.setVisible(false);
}
- @Override
public boolean isSelectionBarAvailable() {
return selectionBar.isVisible();
}
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24996 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2010-09-17 11:58:30 -0400 (Fri, 17 Sep 2010)
New Revision: 24996
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
Log:
Fixed compilation errors
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2010-09-17 15:35:09 UTC (rev 24995)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/selection/bar/SelectionBar.java 2010-09-17 15:58:30 UTC (rev 24996)
@@ -681,7 +681,6 @@
}
}
- @Override
public void selectionChanged(SelectionChangedEvent event) {
updateNodes(true);
}
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24995 - in trunk/jst/tests/org.jboss.tools.jst.web.kb.test: src/org/jboss/tools/jst/web/kb/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-17 11:35:09 -0400 (Fri, 17 Sep 2010)
New Revision: 24995
Removed:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/common-annotations.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-beanutils.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-collections.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-digester.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-logging.jar
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-api-2.0.1.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-impl-2.0.1.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java
Log:
JBIDE-7086
https://jira.jboss.org/browse/JBIDE-7086
Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/common-annotations.jar
===================================================================
(Binary files differ)
Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-beanutils.jar
===================================================================
(Binary files differ)
Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-collections.jar
===================================================================
(Binary files differ)
Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-digester.jar
===================================================================
(Binary files differ)
Deleted: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-logging.jar
===================================================================
(Binary files differ)
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-api-2.0.1.jar
===================================================================
(Binary files differ)
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-impl-2.0.1.jar
===================================================================
(Binary files differ)
Modified: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java 2010-09-17 15:15:32 UTC (rev 24994)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java 2010-09-17 15:35:09 UTC (rev 24995)
@@ -16,6 +16,7 @@
import org.eclipse.core.resources.ResourcesPlugin;
import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.jst.web.kb.internal.taglib.myfaces.MyFacesTagLibrary;
+import org.jboss.tools.jst.web.kb.taglib.IComponent;
import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
import org.jboss.tools.test.util.JUnitUtils;
@@ -59,12 +60,22 @@
MyFacesTagLibrary coreTagLib = null;
ls = kbProject.getTagLibraries("http://java.sun.com/jsf/core");
for (int i = 0; i < ls.length; i++) {
- if(ls[i] instanceof MyFacesTagLibrary) coreTagLib = (MyFacesTagLibrary)ls[i];
+ if(ls[i] instanceof MyFacesTagLibrary) {
+ coreTagLib = (MyFacesTagLibrary)ls[i];
+ }
}
assertNotNull(coreTagLib);
String[] coreTags = {"event", "metadata"};
for (String tag: coreTags) {
- assertNotNull(coreTagLib.getComponent(tag));
+ IComponent component = null;
+ for (int i = 0; i < ls.length; i++) {
+ if(ls[i] instanceof MyFacesTagLibrary) {
+ coreTagLib = (MyFacesTagLibrary)ls[i];
+ component = coreTagLib.getComponent(tag);
+ }
+ if(component != null) break;
+ }
+ assertNotNull("Cannot find tag '" + tag + "'", component);
}
assertEquals(2, coreTagLib.getComponent("event").getAttributes().length);
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24994 - in trunk/jst/tests/org.jboss.tools.jst.web.kb.test: projects/MyFaces and 11 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-17 11:15:32 -0400 (Fri, 17 Sep 2010)
New Revision: 24994
Added:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.classpath
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.project
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/.jsdtscope
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.jdt.core.prefs
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.common.component
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.common.project.facet.core.xml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.jsdt.ui.superType.container
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.jsdt.ui.superType.name
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/JavaSource/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/JavaSource/demo/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/JavaSource/demo/Person.java
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/JavaSource/resources.properties
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/META-INF/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/META-INF/MANIFEST.MF
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/classes/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/faces-config.xml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/common-annotations.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-beanutils.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-collections.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-digester.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-logging.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-api-2.0.1.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-impl-2.0.1.jar
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/web.xml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/index.jsp
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/pages/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/pages/greeting.xhtml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/pages/inputname.xhtml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/templates/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/templates/common.xhtml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/ant/
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/ant/build.properties
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/ant/build.xml
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java
Modified:
trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java
Log:
JBIDE-7086
https://jira.jboss.org/browse/JBIDE-7086
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.classpath
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.classpath (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.classpath 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="JavaSource"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
+</classpath>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.project
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.project (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.project 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>MyFaces</name>
+ <comment></comment>
+ <projects>
+ </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>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.jboss.tools.jst.web.kb.kbbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.jboss.tools.jsf.jsfnature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.jboss.tools.jst.web.kb.kbnature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/.jsdtscope
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/.jsdtscope (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/.jsdtscope 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.jdt.core.prefs 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,8 @@
+#Fri Sep 17 11:19:38 MSD 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.jdt.core.prefs
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.common.component
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.common.component (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.common.component 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+<wb-module deploy-name="MyFaces">
+<wb-resource deploy-path="/" source-path="/WebContent"/>
+<wb-resource deploy-path="/WEB-INF/classes" source-path="/JavaSource"/>
+<property name="context-root" value="MyFaces"/>
+<property name="java-output-path" value="/MyFaces/WebContent/WEB-INF/classes"/>
+</wb-module>
+</project-modules>
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <fixed facet="wst.jsdt.web"/>
+ <installed facet="java" version="1.5"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.common.project.facet.core.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/JavaSource/demo/Person.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/JavaSource/demo/Person.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/JavaSource/demo/Person.java 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package demo;
+
+/**
+ * Created by JBoss Tools
+ */
+public class Person {
+ private String name;
+
+ public Person() {
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/JavaSource/demo/Person.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/JavaSource/resources.properties
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/JavaSource/resources.properties (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/JavaSource/resources.properties 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,2 @@
+prompt=Your Name\:
+greeting=Hello
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/JavaSource/resources.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/META-INF/MANIFEST.MF (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/META-INF/MANIFEST.MF 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/faces-config.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/faces-config.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/faces-config.xml 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faces-config version="1.2" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
+ <managed-bean>
+ <managed-bean-name>person</managed-bean-name>
+ <managed-bean-class>demo.Person</managed-bean-class>
+ <managed-bean-scope>request</managed-bean-scope>
+ <managed-property>
+ <property-name>name</property-name>
+ <value/>
+ </managed-property>
+ </managed-bean>
+ <navigation-rule>
+ <from-view-id>/pages/inputname.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>greeting</from-outcome>
+ <to-view-id>/pages/greeting.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+ <application>
+ <view-handler>com.sun.facelets.FaceletViewHandler</view-handler>
+ <locale-config/>
+ </application>
+ <factory/>
+ <lifecycle/>
+</faces-config>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/faces-config.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/common-annotations.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/common-annotations.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-beanutils.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-beanutils.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-collections.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-collections.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-digester.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-digester.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-logging.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/commons-logging.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-api-2.0.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-api-2.0.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-impl-2.0.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/lib/myfaces-impl-2.0.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/web.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/web.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/web.xml 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <description>Facelets StarterKit</description>
+ <display-name>MyFaces</display-name>
+ <context-param>
+ <param-name>com.sun.faces.validateXml</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>com.sun.faces.verifyObjects</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>true</param-value>
+ </context-param>
+ <context-param>
+ <param-name>facelets.REFRESH_PERIOD</param-name>
+ <param-value>2</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>javax.faces.STATE_SAVING_METHOD</param-name>
+ <param-value>client</param-value>
+ </context-param>
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.jsf</url-pattern>
+ </servlet-mapping>
+</web-app>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/WEB-INF/web.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/index.jsp
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/index.jsp (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/index.jsp 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,7 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head></head>
+ <body>
+ <jsp:forward page="pages/inputname.jsf" />
+ </body>
+</html>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/index.jsp
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/pages/greeting.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/pages/greeting.xhtml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/pages/greeting.xhtml 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,15 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+ <ui:composition template="/templates/common.xhtml">
+ <ui:define name="pageTitle">Greeting to User</ui:define>
+ <ui:define name="pageHeader">Greeting Page</ui:define>
+ <ui:define name="body">
+ #{msg.greeting} #{person.name}!
+ </ui:define>
+ </ui:composition>
+</html>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/pages/greeting.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/pages/inputname.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/pages/inputname.xhtml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/pages/inputname.xhtml 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:c="http://java.sun.com/jstl/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+ <f:event ></f:event>
+ <h:outputText />
+ <ui:composition template="/templates/common.xhtml">
+
+ <ui:define name="pageTitle">Input User Name</ui:define>
+
+ <ui:define name="pageHeader">Facelets Hello Application</ui:define>
+
+ <ui:define name="body">
+ <h:message showSummary="true" showDetail="false" style="color: red; font-weight: bold;" for="name" />
+ <form jsfc="h:form" id="helloForm">
+ ${msg.prompt}
+ <input label="Name" jsfc="h:inputText" required="true" id="name" value="#{person.name}" />
+ <input type="submit" jsfc="h:commandButton" id="submit"
+ action="greeting" value="Say Hello" />
+ </form>
+
+ </ui:define>
+ </ui:composition>
+</html>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/pages/inputname.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/templates/common.xhtml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/templates/common.xhtml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/templates/common.xhtml 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,65 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+
+ <f:loadBundle basename="resources" var="msg" />
+ <head>
+ <title><ui:insert name="pageTitle">Page Title</ui:insert></title>
+ <style type="text/css">
+ body {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 14px;
+ }
+ .header {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 18px;
+ }
+ .bottom {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 9px;
+ text-align: center;
+ vertical-align: middle;
+ color: #8E969D;
+ }
+ </style>
+ </head>
+
+<body bgcolor="#ffffff">
+<table style="border:1px solid #CAD6E0" align="center" cellpadding="0" cellspacing="0" border="0" width="400">
+<tbody>
+
+ <tr>
+ <td class="header" height="42" align="center" valign="middle" width="100%" bgcolor="#E4EBEB">
+ <ui:insert name="pageHeader">Page Header</ui:insert>
+ </td>
+ </tr>
+ <tr>
+ <td height="1" width="100%" bgcolor="#CAD6E0"></td>
+ </tr>
+
+ <tr>
+ <td width="100%" colspan="2">
+ <table width="100%" style="height:150px" align="left" cellpadding="0" cellspacing="0" border="0">
+ <tbody>
+ <tr>
+ <td align="center" width="100%" valign="middle">
+
+ <ui:insert name="body">Page Body</ui:insert>
+
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2" valign="bottom" height="1" width="100%" bgcolor="#CAD6E0"></td>
+ </tr>
+</tbody>
+</table>
+</body>
+
+</html>
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/WebContent/templates/common.xhtml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/ant/build.properties
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/ant/build.properties (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/ant/build.properties 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,3 @@
+#
+#Fri Sep 17 11:19:37 MSD 2010
+classpath.external=
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/ant/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/ant/build.xml
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/ant/build.xml (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/ant/build.xml 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,87 @@
+<project name="MyFaces" basedir="../" default="deploy">
+
+ <!-- Project settings -->
+ <property name="project.distname" value="MyFaces"/>
+
+ <!-- Local system paths -->
+ <property file="${basedir}/ant/build.properties"/>
+ <property name="webroot.dir" value="${basedir}/WebContent"/>
+ <property name="webinf.dir" value="${webroot.dir}/WEB-INF"/>
+ <property name="build.dir" value="build"/>
+
+
+ <!-- classpath for JSF 1.0 -->
+ <path id="compile.classpath">
+ <pathelement path ="${webinf.dir}/lib/commons-beanutils.jar"/>
+ <pathelement path ="${webinf.dir}/lib/commons-collections.jar"/>
+ <pathelement path ="${webinf.dir}/lib/commons-digester.jar"/>
+ <pathelement path ="${webinf.dir}/lib/commons-logging.jar"/>
+ <pathelement path ="${webinf.dir}/lib/jsf-api.jar"/>
+ <pathelement path ="${webinf.dir}/lib/jsf-impl.jar"/>
+ <pathelement path ="${webinf.dir}/lib/jstl.jar"/>
+ <pathelement path ="${webinf.dir}/lib/standard.jar"/>
+ <pathelement path ="${webinf.dir}/classes"/>
+ <pathelement path ="${classpath.external}"/>
+ <pathelement path ="${classpath}"/>
+ </path>
+
+ <!-- define your folder for deployment -->
+ <property name="deploy.dir" value="deploy"/>
+
+ <!-- Check timestamp on files -->
+ <target name="prepare">
+ <tstamp/>
+ </target>
+
+ <!-- Copy any resource or configuration files -->
+ <target name="resources">
+ <copy todir="${webinf.dir}/classes" includeEmptyDirs="no">
+ <fileset dir="JavaSource">
+ <patternset>
+ <include name="**/*.conf"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.xml"/>
+ </patternset>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- Normal build of application -->
+ <target name="compile" depends="prepare,resources">
+ <javac srcdir="JavaSource" destdir="${webinf.dir}/classes">
+ <classpath refid="compile.classpath"/>
+ </javac>
+ </target>
+
+ <!-- Remove classes directory for clean build -->
+ <target name="clean"
+ description="Prepare for clean build">
+ <delete dir="${webinf.dir}/classes"/>
+ <mkdir dir="${webinf.dir}/classes"/>
+ </target>
+
+ <!-- Build entire project -->
+ <target name="build" depends="prepare,compile"/>
+ <target name="rebuild" depends="clean,prepare,compile"/>
+
+ <!-- Create binary distribution -->
+ <target name="war" depends="build">
+ <mkdir dir="${build.dir}"/>
+ <war
+ basedir="${webroot.dir}"
+ warfile="${build.dir}/${project.distname}.war"
+ webxml="${webinf.dir}/web.xml">
+ <exclude name="WEB-INF/${build.dir}/**"/>
+ <exclude name="WEB-INF/src/**"/>
+ <exclude name="WEB-INF/web.xml"/>
+ </war>
+
+ </target>
+
+ <target name="deploy" depends="war">
+ <delete file="${deploy.dir}/${project.distname}.war"/>
+ <delete dir="${deploy.dir}/${project.distname}"/>
+ <copy file="${build.dir}/${project.distname}.war" todir="${deploy.dir}"/>
+ </target>
+
+</project>
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/projects/MyFaces/ant/build.xml
___________________________________________________________________
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-09-17 15:11:17 UTC (rev 24993)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/JstWebKbAllTests.java 2010-09-17 15:15:32 UTC (rev 24994)
@@ -24,11 +24,12 @@
public static Test suite() {
TestSuite suite = new TestSuite(JstWebKbAllTests.class.getName());
suite.addTestSuite(KbModelTest.class);
+ suite.addTestSuite(MyFacesKbModelTest.class);
suite.addTestSuite(WebKbTest.class);
ProjectImportTestSetup testSetup = new XProjectImportTestSetUp(suite,
"org.jboss.tools.jst.web.kb.test",
- new String[]{"projects/TestKbModel"},
- new String[]{"TestKbModel"});
+ new String[]{"projects/TestKbModel", "projects/MyFaces"},
+ new String[]{"TestKbModel", "MyFaces"});
return testSetup;
}
}
\ No newline at end of file
Added: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java (rev 0)
+++ trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java 2010-09-17 15:15:32 UTC (rev 24994)
@@ -0,0 +1,73 @@
+/*******************************************************************************
+ * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Exadel, Inc. and Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jst.web.kb.test;
+
+import junit.framework.TestCase;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.jboss.tools.jst.web.kb.IKbProject;
+import org.jboss.tools.jst.web.kb.internal.taglib.myfaces.MyFacesTagLibrary;
+import org.jboss.tools.jst.web.kb.taglib.ITagLibrary;
+import org.jboss.tools.test.util.JUnitUtils;
+
+public class MyFacesKbModelTest extends TestCase {
+
+ IProject project = null;
+ boolean makeCopy = true;
+
+ public MyFacesKbModelTest() {
+ super("MyFaces Kb Model Test");
+ }
+
+ public void setUp() throws Exception {
+ project = ResourcesPlugin.getWorkspace().getRoot().getProject("MyFaces");
+ assertNotNull("Can't load TestKbModel", project); //$NON-NLS-1$
+ }
+
+ private IKbProject getKbProject() {
+ IKbProject kbProject = null;
+ try {
+ kbProject = (IKbProject)project.getNature(IKbProject.NATURE_ID);
+ } catch (Exception e) {
+ JUnitUtils.fail("Cannot get seam nature.",e);
+ }
+ return kbProject;
+ }
+
+ public void testKbProjectObjects() {
+ IKbProject kbProject = getKbProject();
+ assertNotNull(kbProject);
+
+ ITagLibrary[] ls = kbProject.getTagLibraries("http://java.sun.com/jsf/facelets");
+ assertEquals(1, ls.length);
+ assertTrue(ls[0] instanceof MyFacesTagLibrary);
+ MyFacesTagLibrary faceletsTagLib = (MyFacesTagLibrary)ls[0];
+ String[] faceletTags = {"component", "fragment", "composition", "decorate", "define", "include", "insert", "param"};
+ for (String tag: faceletTags) {
+ assertNotNull(faceletsTagLib.getComponent(tag));
+ }
+
+ MyFacesTagLibrary coreTagLib = null;
+ ls = kbProject.getTagLibraries("http://java.sun.com/jsf/core");
+ for (int i = 0; i < ls.length; i++) {
+ if(ls[i] instanceof MyFacesTagLibrary) coreTagLib = (MyFacesTagLibrary)ls[i];
+ }
+ assertNotNull(coreTagLib);
+ String[] coreTags = {"event", "metadata"};
+ for (String tag: coreTags) {
+ assertNotNull(coreTagLib.getComponent(tag));
+ }
+ assertEquals(2, coreTagLib.getComponent("event").getAttributes().length);
+
+ }
+
+}
\ No newline at end of file
Property changes on: trunk/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/MyFacesKbModelTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
15 years, 7 months
- 1
- 0
JBoss Tools SVN: r24993 - trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-09-17 11:11:17 -0400 (Fri, 17 Sep 2010)
New Revision: 24993
Modified:
trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/MyFacesScanner.java
Log:
JBIDE-7086
https://jira.jboss.org/browse/JBIDE-7086
Modified: trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/MyFacesScanner.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/MyFacesScanner.java 2010-09-17 14:51:48 UTC (rev 24992)
+++ trunk/jst/plugins/org.jboss.tools.jst.web.kb/src/org/jboss/tools/jst/web/kb/internal/scanner/MyFacesScanner.java 2010-09-17 15:11:17 UTC (rev 24993)
@@ -49,7 +49,8 @@
static String UI_URI = "http://java.sun.com/jsf/facelets"; //$NON-NLS-1$
static String C_PREFIX = "c"; //$NON-NLS-1$
- static String C_URI = "http://java.sun.com/jsp/jstl/core"; //$NON-NLS-1$
+ static String C_URI = "http://java.sun.com/jstl/core"; //$NON-NLS-1$
+// static String C_URI = "http://java.sun.com/jsp/jstl/core"; //$NON-NLS-1$
static String COMPOSITE_PREFIX = "composite"; //$NON-NLS-1$
static String COMPOSITE_URI = "http://java.sun.com/jsf/composite"; //$NON-NLS-1$
15 years, 7 months
- 1
- 0